Rename PackPrototypeID to Pack in both components.

space-wizards · Mar 25, 2024 · cf563c5 · cf563c5
1 parent d825df0
commit cf563c5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
@@ -28,8 +28,8 @@ public sealed partial class AdvertiseComponent : Component
     /// <summary>
     /// The identifier for the advertisements pack prototype.
     /// </summary>
-    [DataField("pack", required: true)]
-    public ProtoId<MessagePackPrototype> PackPrototypeId { get; private set; }
+    [DataField(required: true)]
+    public ProtoId<MessagePackPrototype> Pack { get; private set; }
 
     /// <summary>
     /// The next time an advertisement will be said.

diff --git a/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs b/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
@@ -13,8 +13,8 @@ public sealed partial class SpeakOnUIClosedComponent : Component
     /// <summary>
     /// The identifier for the message pack prototype containing messages to be spoken by this entity.
     /// </summary>
-    [DataField("pack", required: true)]
-    public ProtoId<MessagePackPrototype> PackPrototypeId { get; private set; }
+    [DataField(required: true)]
+    public ProtoId<MessagePackPrototype> Pack { get; private set; }
 
     /// <summary>
     /// Is this component active? If false, no messages will be spoken.

diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
@@ -70,7 +70,7 @@ public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advertise = null
         if (!Resolve(uid, ref advertise))
             return;
 
-        if (_prototypeManager.TryIndex(advertise.PackPrototypeId, out var advertisements))
+        if (_prototypeManager.TryIndex(advertise.Pack, out var advertisements))
             _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Messages)), InGameICChatType.Speak, hideChat: true);
     }
 

diff --git a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
@@ -38,7 +38,7 @@ public bool TrySpeak(Entity<SpeakOnUIClosedComponent?> entity)
         if (!entity.Comp.Enabled)
             return false;
 
-        if (!_prototypeManager.TryIndex(entity.Comp.PackPrototypeId, out MessagePackPrototype? messagePack))
+        if (!_prototypeManager.TryIndex(entity.Comp.Pack, out MessagePackPrototype? messagePack))
             return false;
 
         var message = Loc.GetString(_random.Pick(messagePack.Messages), ("name", Name(entity)));