Cleanups PolymorphSystem/Components/Prototypes (space-wizards#23721)

* Cleanups PolymorphSystem

* forgot this

* Nah

* Fix test

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Author: AJCM-git

Content.Server/Administration/Commands/AddPolymorphActionCommand.cs

@@ -32,7 +32,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
 
         var polySystem = _entityManager.EntitySysManager.GetEntitySystem<PolymorphSystem>();
 
-        _entityManager.EnsureComponent<PolymorphableComponent>(entityUid.Value);
-        polySystem.CreatePolymorphAction(args[1], entityUid.Value);
+        var polymorphable = _entityManager.EnsureComponent<PolymorphableComponent>(entityUid.Value);
+        polySystem.CreatePolymorphAction(args[1], (entityUid.Value, polymorphable));
     }
 }

Content.Server/Chemistry/ReagentEffects/Polymorph.cs

@@ -18,7 +18,7 @@ public sealed partial class Polymorph : ReagentEffect
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
     => Loc.GetString("reagent-effect-guidebook-make-polymorph",
             ("chance", Probability), ("entityname",
-                prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Entity).Name));
+                prototype.Index<EntityPrototype>(prototype.Index<PolymorphPrototype>(PolymorphPrototype).Configuration.Entity).Name));
 
     public override void Effect(ReagentEffectArgs args)
     {

Content.Server/Polymorph/Components/PolymorphOnCollideComponent.cs

@@ -1,21 +1,24 @@
+using Content.Server.Polymorph.Systems;
 using Content.Shared.Polymorph;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Polymorph.Components;
 
 [RegisterComponent]
+[Access(typeof(PolymorphSystem))]
 public sealed partial class PolymorphOnCollideComponent : Component
 {
-    [DataField("polymorph", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<PolymorphPrototype>))]
-    public string Polymorph = default!;
+    [DataField(required: true)]
+    public ProtoId<PolymorphPrototype> Polymorph;
 
-    [DataField("whitelist", required: true)]
+    [DataField(required: true)]
     public EntityWhitelist Whitelist = default!;
 
-    [DataField("blacklist")]
+    [DataField]
     public EntityWhitelist? Blacklist;
 
+    [DataField]
     public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Magic/forcewall.ogg");
 }

Content.Server/Polymorph/Components/PolymorphableComponent.cs

@@ -1,27 +1,28 @@
+using Content.Server.Polymorph.Systems;
 using Content.Shared.Polymorph;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Polymorph.Components
+namespace Content.Server.Polymorph.Components;
+
+[RegisterComponent]
+[Access(typeof(PolymorphSystem))]
+public sealed partial class PolymorphableComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class PolymorphableComponent : Component
-    {
-        /// <summary>
-        /// A list of all the polymorphs that the entity has.
-        /// Used to manage them and remove them if needed.
-        /// </summary>
-        public Dictionary<string, EntityUid>? PolymorphActions = null;
+    /// <summary>
+    /// A list of all the polymorphs that the entity has.
+    /// Used to manage them and remove them if needed.
+    /// </summary>
+    public Dictionary<ProtoId<PolymorphPrototype>, EntityUid>? PolymorphActions = null;
 
-        /// <summary>
-        /// Timestamp for when the most recent polymorph ended.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadOnly)]
-        public TimeSpan? LastPolymorphEnd = null;
+    /// <summary>
+    /// Timestamp for when the most recent polymorph ended.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public TimeSpan? LastPolymorphEnd = null;
 
         /// <summary>
-        /// The polymorphs that the entity starts out being able to do.
-        /// </summary>
-        [DataField("innatePolymorphs", customTypeSerializer : typeof(PrototypeIdListSerializer<PolymorphPrototype>))]
-        public List<string>? InnatePolymorphs;
-    }
+    /// The polymorphs that the entity starts out being able to do.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<PolymorphPrototype>>? InnatePolymorphs;
 }

Content.Server/Polymorph/Components/PolymorphedEntityComponent.cs

@@ -1,31 +1,32 @@
+using Content.Server.Polymorph.Systems;
 using Content.Shared.Polymorph;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Polymorph.Components
+namespace Content.Server.Polymorph.Components;
+
+[RegisterComponent]
+[Access(typeof(PolymorphSystem))]
+public sealed partial class PolymorphedEntityComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class PolymorphedEntityComponent : Component
-    {
-        /// <summary>
-        /// The polymorph prototype, used to track various information
-        /// about the polymorph
-        /// </summary>
-        [DataField("prototype", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<PolymorphPrototype>))]
-        public string Prototype = string.Empty;
+    /// <summary>
+    /// The polymorph prototype, used to track various information
+    /// about the polymorph
+    /// </summary>
+    [DataField(required: true)]
+    public PolymorphConfiguration Configuration = new();
 
-        /// <summary>
-        /// The original entity that the player will revert back into
-        /// </summary>
-        [DataField("parent", required: true)]
-        public EntityUid Parent;
+    /// <summary>
+    /// The original entity that the player will revert back into
+    /// </summary>
+    [DataField(required: true)]
+    public EntityUid Parent;
 
-        /// <summary>
-        /// The amount of time that has passed since the entity was created
-        /// used for tracking the duration
-        /// </summary>
-        [DataField("time")]
-        public float Time;
+    /// <summary>
+    /// The amount of time that has passed since the entity was created
+    /// used for tracking the duration
+    /// </summary>
+    [DataField]
+    public float Time;
 
-        [DataField] public EntityUid? Action;
-    }
+    [DataField]
+    public EntityUid? Action;
 }

Content.Server/Polymorph/Systems/PolymorphSystem.Collide.cs

@@ -1,16 +1,25 @@
 using Content.Server.Polymorph.Components;
+using Content.Shared.Polymorph;
 using Content.Shared.Projectiles;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Events;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Polymorph.Systems;
 
 public partial class PolymorphSystem
 {
-    // Need to do this so we don't get a collection enumeration error in physics by polymorphing
-    // an entity we're colliding with
+    /// <summary>
+    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
+    /// an entity we're colliding with
+    /// </summary>
     private Queue<PolymorphQueuedData> _queuedPolymorphUpdates = new();
 
+    private void InitializeCollide()
+    {
+        SubscribeLocalEvent<PolymorphOnCollideComponent, StartCollideEvent>(OnPolymorphCollide);
+    }
+
     public void UpdateCollide()
     {
         while (_queuedPolymorphUpdates.TryDequeue(out var data))
@@ -20,25 +29,18 @@ public void UpdateCollide()
 
             var ent = PolymorphEntity(data.Ent, data.Polymorph);
             if (ent != null)
-            {
                 _audio.PlayPvs(data.Sound, ent.Value);
-            }
         }
     }
 
-    private void InitializeCollide()
-    {
-        SubscribeLocalEvent<PolymorphOnCollideComponent, StartCollideEvent>(OnPolymorphCollide);
-    }
-
     private void OnPolymorphCollide(EntityUid uid, PolymorphOnCollideComponent component, ref StartCollideEvent args)
     {
         if (args.OurFixtureId != SharedProjectileSystem.ProjectileFixture)
             return;
 
         var other = args.OtherEntity;
-        if (!component.Whitelist.IsValid(other)
-            || component.Blacklist != null && component.Blacklist.IsValid(other))
+        if (!component.Whitelist.IsValid(other, EntityManager)
+            || component.Blacklist != null && component.Blacklist.IsValid(other, EntityManager))
             return;
 
         _queuedPolymorphUpdates.Enqueue(new (other, component.Sound, component.Polymorph));
@@ -49,9 +51,9 @@ public struct PolymorphQueuedData
 {
     public EntityUid Ent;
     public SoundSpecifier Sound;
-    public string Polymorph;
+    public ProtoId<PolymorphPrototype> Polymorph;
 
-    public PolymorphQueuedData(EntityUid ent, SoundSpecifier sound, string polymorph)
+    public PolymorphQueuedData(EntityUid ent, SoundSpecifier sound, ProtoId<PolymorphPrototype> polymorph)
     {
         Ent = ent;
         Sound = sound;

Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs

@@ -1,39 +1,38 @@
 using Content.Shared.GameTicking;
 
-namespace Content.Server.Polymorph.Systems
+namespace Content.Server.Polymorph.Systems;
+
+public sealed partial class PolymorphSystem
 {
-    public sealed partial class PolymorphSystem
-    {
-        public EntityUid? PausedMap { get; private set; }
+    public EntityUid? PausedMap { get; private set; }
 
-        /// <summary>
-        /// Used to subscribe to the round restart event
-        /// </summary>
-        private void InitializeMap()
-        {
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
-        }
+    /// <summary>
+    /// Used to subscribe to the round restart event
+    /// </summary>
+    private void InitializeMap()
+    {
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
+    }
 
-        private void OnRoundRestart(RoundRestartCleanupEvent _)
-        {
-            if (PausedMap == null || !Exists(PausedMap))
-                return;
+    private void OnRoundRestart(RoundRestartCleanupEvent _)
+    {
+        if (PausedMap == null || !Exists(PausedMap))
+            return;
 
-            EntityManager.DeleteEntity(PausedMap.Value);
-        }
+        Del(PausedMap.Value);
+    }
 
-        /// <summary>
-        /// Used internally to ensure a paused map that is
-        /// stores polymorphed entities.
-        /// </summary>
-        private void EnsurePausesdMap()
-        {
-            if (PausedMap != null && Exists(PausedMap))
-                return;
+    /// <summary>
+    /// Used internally to ensure a paused map that is
+    /// stores polymorphed entities.
+    /// </summary>
+    private void EnsurePausedMap()
+    {
+        if (PausedMap != null && Exists(PausedMap))
+            return;
 
-            var newmap = _mapManager.CreateMap();
-            _mapManager.SetMapPaused(newmap, true);
-            PausedMap = _mapManager.GetMapEntityId(newmap);
-        }
+        var newmap = _mapManager.CreateMap();
+        _mapManager.SetMapPaused(newmap, true);
+        PausedMap = _mapManager.GetMapEntityId(newmap);
     }
 }