fix: Codegens suits and adds StaffRobe to replace the others (#1468)

Projects/UOContent/Commands/ResetStaffDress.cs

@@ -1,24 +1,11 @@
-using System;
 using Server.Items;
 using Server.Mobiles;
 using Server.Network;
-using Server.Utilities;
 
 namespace Server.Commands;
 
 public static class StaffDress
 {
-    private static readonly Type[] _staffRobeTypes =
-    {
-        null,
-        typeof(CounselorRobe),
-        typeof(GMRobe),
-        typeof(SeerRobe),
-        typeof(AdminRobe),
-        typeof(AdminRobe),
-        typeof(AdminRobe)
-    };
-
     public static void Initialize()
     {
         CommandSystem.Register("ResetStaffDress", AccessLevel.Counselor, StaffDress_OnCommand);
@@ -75,6 +62,9 @@ public static class StaffDress
             }
         }
 
-        pm.AddItem(_staffRobeTypes[(int)pm.AccessLevel].CreateInstance<BaseSuit>());
+        if (pm.AccessLevel > AccessLevel.Player)
+        {
+            pm.AddItem(new StaffRobe(pm.AccessLevel));
+        }
     }
 }

Projects/UOContent/Items/Suits/AdminRobe.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial  class AdminRobe : BaseSuit
 {
-    public class AdminRobe : BaseSuit
+    // [Constructible] // Deprecated, use StaffRobe
+    public AdminRobe() : base(AccessLevel.Administrator, 0x0, 0x204F) // Blank hue
     {
-        [Constructible]
-        public AdminRobe() : base(AccessLevel.Administrator, 0x0, 0x204F) // Blank hue
-        {
-        }
-
-        public AdminRobe(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/BaseSuit.cs

@@ -1,87 +1,82 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(1, false)]
+public abstract partial class BaseSuit : Item
 {
-    public abstract class BaseSuit : Item
+    public BaseSuit(AccessLevel level, int hue, int itemID) : base(itemID)
     {
-        public BaseSuit(AccessLevel level, int hue, int itemID) : base(itemID)
-        {
-            Hue = hue;
-            Weight = 1.0;
-            Movable = false;
-            LootType = LootType.Newbied;
-            Layer = Layer.OuterTorso;
+        Hue = hue;
+        Weight = 1.0;
+        Movable = false;
+        LootType = LootType.Newbied;
+        Layer = Layer.OuterTorso;
 
-            AccessLevel = level;
+        _accessLevel = level;
+    }
+
+    [SerializableProperty(0)]
+    public AccessLevel AccessLevel
+    {
+        get => _accessLevel;
+        set
+        {
+            var oldAccessLevel = _accessLevel;
+            _accessLevel = value;
+            InvalidateProperties();
+            this.MarkDirty();
+
+            OnAccessLevelChanged(oldAccessLevel, _accessLevel);
+        }
+    }
+
+    public virtual void OnAccessLevelChanged(AccessLevel oldAccessLevel, AccessLevel accessLevel)
+    {
+    }
+
+    private void Deserialize(IGenericReader reader, int version)
+    {
+        AccessLevel = (AccessLevel)reader.ReadInt();
+    }
+
+    public bool Validate()
+    {
+        if (RootParent is not Mobile mobile || mobile.AccessLevel >= AccessLevel)
+        {
+            return true;
         }
 
-        public BaseSuit(Serial serial) : base(serial)
+        Delete();
+        return false;
+    }
+
+    public override void OnSingleClick(Mobile from)
+    {
+        if (Validate())
         {
+            base.OnSingleClick(from);
         }
+    }
 
-        [CommandProperty(AccessLevel.Administrator)]
-        public AccessLevel AccessLevel { get; set; }
-
-        public override void Serialize(IGenericWriter writer)
+    public override void OnDoubleClick(Mobile from)
+    {
+        if (Validate())
         {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-
-            writer.Write((int)AccessLevel);
+            base.OnDoubleClick(from);
         }
+    }
 
-        public override void Deserialize(IGenericReader reader)
+    public override bool VerifyMove(Mobile from) => from.AccessLevel >= AccessLevel;
+
+    public override bool OnEquip(Mobile from)
+    {
+        if (from.AccessLevel < AccessLevel)
         {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-
-            switch (version)
-            {
-                case 0:
-                    {
-                        AccessLevel = (AccessLevel)reader.ReadInt();
-                        break;
-                    }
-            }
-        }
-
-        public bool Validate()
-        {
-            if (RootParent is not Mobile mobile || mobile.AccessLevel >= AccessLevel)
-            {
-                return true;
-            }
-
-            Delete();
+            from.SendMessage("You may not wear this.");
             return false;
         }
 
-        public override void OnSingleClick(Mobile from)
-        {
-            if (Validate())
-            {
-                base.OnSingleClick(from);
-            }
-        }
-
-        public override void OnDoubleClick(Mobile from)
-        {
-            if (Validate())
-            {
-                base.OnDoubleClick(from);
-            }
-        }
-
-        public override bool VerifyMove(Mobile from) => from.AccessLevel >= AccessLevel;
-
-        public override bool OnEquip(Mobile from)
-        {
-            if (from.AccessLevel < AccessLevel)
-            {
-                from.SendMessage("You may not wear this.");
-            }
-
-            return from.AccessLevel >= AccessLevel;
-        }
+        return true;
     }
 }

Projects/UOContent/Items/Suits/CounselorRobe.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial class CounselorRobe : BaseSuit
 {
-    public class CounselorRobe : BaseSuit
+    // [Constructible] // Deprecated, use StaffRobe
+    public CounselorRobe() : base(AccessLevel.Counselor, 0x3, 0x204F)
     {
-        [Constructible]
-        public CounselorRobe() : base(AccessLevel.Counselor, 0x3, 0x204F)
-        {
-        }
-
-        public CounselorRobe(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/DeathShroud.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial class DeathShroud : BaseSuit
 {
-    public class DeathShroud : BaseSuit
+    [Constructible]
+    public DeathShroud() : base(AccessLevel.GameMaster, 0x0, 0x204E)
     {
-        [Constructible]
-        public DeathShroud() : base(AccessLevel.GameMaster, 0x0, 0x204E)
-        {
-        }
-
-        public DeathShroud(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/DupreSuit.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial class DupreSuit : BaseSuit
 {
-    public class DupreSuit : BaseSuit
+    [Constructible]
+    public DupreSuit() : base(AccessLevel.GameMaster, 0x0, 0x2050)
     {
-        [Constructible]
-        public DupreSuit() : base(AccessLevel.GameMaster, 0x0, 0x2050)
-        {
-        }
-
-        public DupreSuit(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/GMRobe.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial class GMRobe : BaseSuit
 {
-    public class GMRobe : BaseSuit
+    // [Constructible] // Deprecated, use StaffRobe
+    public GMRobe() : base(AccessLevel.GameMaster, 0x26, 0x204F)
     {
-        [Constructible]
-        public GMRobe() : base(AccessLevel.GameMaster, 0x26, 0x204F)
-        {
-        }
-
-        public GMRobe(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/LordBlackthorneSuit.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial class LordBlackthorneSuit : BaseSuit
 {
-    public class LordBlackthorneSuit : BaseSuit
+    [Constructible]
+    public LordBlackthorneSuit() : base(AccessLevel.GameMaster, 0x0, 0x2043)
     {
-        [Constructible]
-        public LordBlackthorneSuit() : base(AccessLevel.GameMaster, 0x0, 0x2043)
-        {
-        }
-
-        public LordBlackthorneSuit(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/LordBritishSuit.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial class LordBritishSuit : BaseSuit
 {
-    public class LordBritishSuit : BaseSuit
+    [Constructible]
+    public LordBritishSuit() : base(AccessLevel.GameMaster, 0x0, 0x2042)
     {
-        [Constructible]
-        public LordBritishSuit() : base(AccessLevel.GameMaster, 0x0, 0x2042)
-        {
-        }
-
-        public LordBritishSuit(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/SeerRobe.cs

@@ -1,28 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0, false)]
+public partial class SeerRobe : BaseSuit
 {
-    public class SeerRobe : BaseSuit
+    // [Constructible] // Deprecated, use StaffRobe
+    public SeerRobe() : base(AccessLevel.Seer, 0x1D3, 0x204F)
     {
-        [Constructible]
-        public SeerRobe() : base(AccessLevel.Seer, 0x1D3, 0x204F)
-        {
-        }
-
-        public SeerRobe(Serial serial) : base(serial)
-        {
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-        }
     }
 }

Projects/UOContent/Items/Suits/StaffRobe.cs

@@ -0,0 +1,34 @@
+using ModernUO.Serialization;
+
+namespace Server.Items;
+
+[SerializationGenerator(0)]
+public partial class StaffRobe : BaseSuit
+{
+    public static int GetStaffRobeHue(AccessLevel accessLevel)
+    {
+        return accessLevel switch
+        {
+            AccessLevel.Counselor     => 0x3,
+            AccessLevel.GameMaster    => 0x26,
+            AccessLevel.Seer          => 0x1D3,
+            AccessLevel.Administrator => 0x488,
+            AccessLevel.Developer     => 11,
+            AccessLevel.Owner         => 0x496,
+        };
+    }
+
+    public StaffRobe(AccessLevel level) : base(level, GetStaffRobeHue(level), 0x204F)
+    {
+    }
+
+    public override void OnAccessLevelChanged(AccessLevel oldAccessLevel, AccessLevel accessLevel)
+    {
+        var oldHue = GetStaffRobeHue(oldAccessLevel);
+
+        if (oldHue == Hue)
+        {
+            Hue = GetStaffRobeHue(accessLevel);
+        }
+    }
+}

Projects/UOContent/Migrations/Server.Items.AdminRobe.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.AdminRobe"
+}

Projects/UOContent/Migrations/Server.Items.BaseSuit.v1.json

@@ -0,0 +1,11 @@
+{
+  "version": 1,
+  "type": "Server.Items.BaseSuit",
+  "properties": [
+    {
+      "name": "AccessLevel",
+      "type": "Server.AccessLevel",
+      "rule": "EnumMigrationRule"
+    }
+  ]
+}

Projects/UOContent/Migrations/Server.Items.CounselorRobe.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.CounselorRobe"
+}

Projects/UOContent/Migrations/Server.Items.DeathShroud.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.DeathShroud"
+}

Projects/UOContent/Migrations/Server.Items.DupreSuit.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.DupreSuit"
+}

Projects/UOContent/Migrations/Server.Items.GMRobe.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.GMRobe"
+}

Projects/UOContent/Migrations/Server.Items.LordBlackthorneSuit.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.LordBlackthorneSuit"
+}

Projects/UOContent/Migrations/Server.Items.LordBritishSuit.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.LordBritishSuit"
+}

Projects/UOContent/Migrations/Server.Items.SeerRobe.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.SeerRobe"
+}

Projects/UOContent/Migrations/Server.Items.StaffRobe.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Items.StaffRobe"
+}