fix: Codegens guards (#1474)

Projects/UOContent/Migrations/Server.Mobiles.ArcherGuard.v0.json

@@ -0,0 +1,11 @@
+{
+  "version": 0,
+  "type": "Server.Mobiles.ArcherGuard",
+  "properties": [
+    {
+      "name": "Focus",
+      "type": "Server.Mobile",
+      "rule": "SerializableInterfaceMigrationRule"
+    }
+  ]
+}

Projects/UOContent/Migrations/Server.Mobiles.BaseGuard.v0.json

@@ -0,0 +1,4 @@
+{
+  "version": 0,
+  "type": "Server.Mobiles.BaseGuard"
+}

Projects/UOContent/Migrations/Server.Mobiles.WarriorGuard.v0.json

@@ -0,0 +1,11 @@
+{
+  "version": 0,
+  "type": "Server.Mobiles.WarriorGuard",
+  "properties": [
+    {
+      "name": "Focus",
+      "type": "Server.Mobile",
+      "rule": "SerializableInterfaceMigrationRule"
+    }
+  ]
+}

Projects/UOContent/Mobiles/Guards/ArcherGuard.cs

@@ -1,415 +1,388 @@
 using System;
+using ModernUO.Serialization;
 using Server.Items;
 
-namespace Server.Mobiles
+namespace Server.Mobiles;
+
+[SerializationGenerator(0, false)]
+public partial class ArcherGuard : BaseGuard
 {
-    public class ArcherGuard : BaseGuard
+    private Timer _attackTimer;
+    private Timer _idleTimer;
+
+    [Constructible]
+    public ArcherGuard(Mobile target = null) : base(target)
     {
-        private Timer m_AttackTimer, m_IdleTimer;
+        InitStats(100, 125, 25);
+        Title = "the guard";
 
-        private Mobile m_Focus;
+        SpeechHue = Utility.RandomDyedHue();
 
-        [Constructible]
+        Hue = Race.Human.RandomSkinHue();
-        public ArcherGuard(Mobile target = null) : base(target)
+
+        if (Female = Utility.RandomBool())
         {
-            InitStats(100, 125, 25);
+            Body = 0x191;
-            Title = "the guard";
+            Name = NameList.RandomName("female");
+        }
+        else
+        {
+            Body = 0x190;
+            Name = NameList.RandomName("male");
+        }
 
-            SpeechHue = Utility.RandomDyedHue();
+        new Horse().Rider = this;
 
-            Hue = Race.Human.RandomSkinHue();
+        AddItem(new StuddedChest());
+        AddItem(new StuddedArms());
+        AddItem(new StuddedGloves());
+        AddItem(new StuddedGorget());
+        AddItem(new StuddedLegs());
+        AddItem(new Boots());
+        AddItem(new SkullCap());
 
-            if (Female = Utility.RandomBool())
+        var bow = new Bow();
+
+        bow.Movable = false;
+        bow.Crafter = this;
+        bow.Quality = WeaponQuality.Exceptional;
+
+        AddItem(bow);
+
+        Container pack = new Backpack();
+
+        pack.Movable = false;
+
+        var arrows = new Arrow(250);
+
+        arrows.LootType = LootType.Newbied;
+
+        pack.DropItem(arrows);
+        pack.DropItem(new Gold(10, 25));
+
+        AddItem(pack);
+
+        Skills.Anatomy.Base = 120.0;
+        Skills.Tactics.Base = 120.0;
+        Skills.Archery.Base = 120.0;
+        Skills.MagicResist.Base = 120.0;
+        Skills.DetectHidden.Base = 100.0;
+
+        NextCombatTime = Core.TickCount + 500;
+        Focus = target;
+    }
+
+    [SerializableProperty(0)]
+    [CommandProperty(AccessLevel.GameMaster)]
+    public override Mobile Focus
+    {
+        get => _focus;
+        set
+        {
+            if (Deleted)
             {
-                Body = 0x191;
+                return;
-                Name = NameList.RandomName("female");
+            }
+
+            var oldFocus = _focus;
+
+            if (oldFocus != value)
+            {
+                _focus = value;
+
+                if (value != null)
+                {
+                    AggressiveAction(value);
+                }
+
+                Combatant = value;
+
+                if (oldFocus?.Alive == false)
+                {
+                    Say("Thou hast suffered thy punishment, scoundrel.");
+                }
+
+                if (value != null)
+                {
+                    Say(500131); // Thou wilt regret thine actions, swine!
+                }
+
+                if (_attackTimer != null)
+                {
+                    _attackTimer.Stop();
+                    _attackTimer = null;
+                }
+
+                if (_idleTimer != null)
+                {
+                    _idleTimer.Stop();
+                    _idleTimer = null;
+                }
+
+                if (_focus != null)
+                {
+                    _attackTimer = new AttackTimer(this);
+                    _attackTimer.Start();
+                    ((AttackTimer)_attackTimer).DoOnTick();
+                }
+                else
+                {
+                    _idleTimer = new IdleTimer(this);
+                    _idleTimer.Start();
+                }
+            }
+            else if (_focus == null && _idleTimer == null)
+            {
+                _idleTimer = new IdleTimer(this);
+                _idleTimer.Start();
+            }
+
+            this.MarkDirty();
+        }
+    }
+
+    public override bool OnBeforeDeath()
+    {
+        if (_focus?.Alive == true)
+        {
+            new AvengeTimer(_focus).Start(); // If a guard dies, three more guards will spawn
+        }
+
+        return base.OnBeforeDeath();
+    }
+
+    [AfterDeserialization]
+    private void AfterDeserialization()
+    {
+        if (_focus != null)
+        {
+            _attackTimer = new AttackTimer(this);
+            _attackTimer.Start();
+        }
+        else
+        {
+            _idleTimer = new IdleTimer(this);
+            _idleTimer.Start();
+        }
+    }
+
+    public override void OnAfterDelete()
+    {
+        if (_attackTimer != null)
+        {
+            _attackTimer.Stop();
+            _attackTimer = null;
+        }
+
+        if (_idleTimer != null)
+        {
+            _idleTimer.Stop();
+            _idleTimer = null;
+        }
+
+        base.OnAfterDelete();
+    }
+
+    private class AvengeTimer : Timer
+    {
+        private readonly Mobile m_Focus;
+
+        // After 2.5 seconds, one guard will spawn every 1.0 second, three times
+        public AvengeTimer(Mobile focus) : base(TimeSpan.FromSeconds(2.5), TimeSpan.FromSeconds(1.0), 3) =>
+            m_Focus = focus;
+
+        protected override void OnTick()
+        {
+            Spawn(m_Focus, m_Focus, 1, true);
+        }
+    }
+
+    private class AttackTimer : Timer
+    {
+        private readonly ArcherGuard m_Owner;
+        // private bool m_Shooting;
+
+        public AttackTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1)) =>
+            m_Owner = owner;
+
+        public void DoOnTick()
+        {
+            OnTick();
+        }
+
+        protected override void OnTick()
+        {
+            if (m_Owner.Deleted)
+            {
+                Stop();
+                return;
+            }
+
+            m_Owner.Criminal = false;
+            m_Owner.Kills = 0;
+            m_Owner.Stam = m_Owner.StamMax;
+
+            var target = m_Owner.Focus;
+
+            if (target != null && (target.Deleted || !target.Alive || !m_Owner.CanBeHarmful(target)))
+            {
+                m_Owner.Focus = null;
+                Stop();
+                return;
+            }
+
+            if (m_Owner.Weapon is Fists)
+            {
+                m_Owner.Kill();
+                Stop();
+                return;
+            }
+
+            if (target != null && m_Owner.Combatant != target)
+            {
+                m_Owner.Combatant = target;
+            }
+
+            if (target == null)
+            {
+                Stop();
             }
             else
             {
-                Body = 0x190;
+                // <instakill>
-                Name = NameList.RandomName("male");
+                TeleportTo(target);
-            }
+                target.BoltEffect(0);
 
-            new Horse().Rider = this;
+                if (target is BaseCreature creature)
+                {
+                    creature.NoKillAwards = true;
+                }
 
-            AddItem(new StuddedChest());
+                target.Damage(target.HitsMax, m_Owner);
-            AddItem(new StuddedArms());
+                target.Kill(); // just in case, maybe Damage is overridden on some shard
-            AddItem(new StuddedGloves());
-            AddItem(new StuddedGorget());
-            AddItem(new StuddedLegs());
-            AddItem(new Boots());
-            AddItem(new SkullCap());
 
-            var bow = new Bow();
+                if (target.Corpse != null && !target.Player)
+                {
+                    target.Corpse.Delete();
+                }
 
-            bow.Movable = false;
+                m_Owner.Focus = null;
-            bow.Crafter = this;
+                Stop();
-            bow.Quality = WeaponQuality.Exceptional;
+            } // </instakill>
 
-            AddItem(bow);
+            /*else if (!m_Owner.InRange( target, 20 ))
-
-            Container pack = new Backpack();
-
-            pack.Movable = false;
-
-            var arrows = new Arrow(250);
-
-            arrows.LootType = LootType.Newbied;
-
-            pack.DropItem(arrows);
-            pack.DropItem(new Gold(10, 25));
-
-            AddItem(pack);
-
-            Skills.Anatomy.Base = 120.0;
-            Skills.Tactics.Base = 120.0;
-            Skills.Archery.Base = 120.0;
-            Skills.MagicResist.Base = 120.0;
-            Skills.DetectHidden.Base = 100.0;
-
-            NextCombatTime = Core.TickCount + 500;
-            Focus = target;
-        }
-
-        public ArcherGuard(Serial serial) : base(serial)
-        {
-        }
-
-        [CommandProperty(AccessLevel.GameMaster)]
-        public override Mobile Focus
-        {
-            get => m_Focus;
-            set
             {
-                if (Deleted)
+              m_Shooting = false;
-                {
+              m_Owner.Focus = null;
-                    return;
-                }
-
-                var oldFocus = m_Focus;
-
-                if (oldFocus != value)
-                {
-                    m_Focus = value;
-
-                    if (value != null)
-                    {
-                        AggressiveAction(value);
-                    }
-
-                    Combatant = value;
-
-                    if (oldFocus?.Alive == false)
-                    {
-                        Say("Thou hast suffered thy punishment, scoundrel.");
-                    }
-
-                    if (value != null)
-                    {
-                        Say(500131); // Thou wilt regret thine actions, swine!
-                    }
-
-                    if (m_AttackTimer != null)
-                    {
-                        m_AttackTimer.Stop();
-                        m_AttackTimer = null;
-                    }
-
-                    if (m_IdleTimer != null)
-                    {
-                        m_IdleTimer.Stop();
-                        m_IdleTimer = null;
-                    }
-
-                    if (m_Focus != null)
-                    {
-                        m_AttackTimer = new AttackTimer(this);
-                        m_AttackTimer.Start();
-                        ((AttackTimer)m_AttackTimer).DoOnTick();
-                    }
-                    else
-                    {
-                        m_IdleTimer = new IdleTimer(this);
-                        m_IdleTimer.Start();
-                    }
-                }
-                else if (m_Focus == null && m_IdleTimer == null)
-                {
-                    m_IdleTimer = new IdleTimer(this);
-                    m_IdleTimer.Start();
-                }
             }
-        }
+            else if (!m_Owner.InLOS( target ))
-
-        public override bool OnBeforeDeath()
-        {
-            if (m_Focus?.Alive == true)
             {
-                new AvengeTimer(m_Focus).Start(); // If a guard dies, three more guards will spawn
+              m_Shooting = false;
+              TeleportTo( target );
             }
-
+            else if (!m_Owner.CanSee( target ))
-            return base.OnBeforeDeath();
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-
-            writer.Write(m_Focus);
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-
-            switch (version)
             {
-                case 0:
+              m_Shooting = false;
-                    {
-                        m_Focus = reader.ReadEntity<Mobile>();
 
-                        if (m_Focus != null)
+              if (!m_Owner.InRange( target, 2 ))
-                        {
+              {
-                            m_AttackTimer = new AttackTimer(this);
+                if (!m_Owner.Move( m_Owner.GetDirectionTo( target ) | Direction.Running ) && OutOfMaxDistance( target ))
-                            m_AttackTimer.Start();
-                        }
-                        else
-                        {
-                            m_IdleTimer = new IdleTimer(this);
-                            m_IdleTimer.Start();
-                        }
-
-                        break;
-                    }
-            }
-        }
-
-        public override void OnAfterDelete()
-        {
-            if (m_AttackTimer != null)
-            {
-                m_AttackTimer.Stop();
-                m_AttackTimer = null;
-            }
-
-            if (m_IdleTimer != null)
-            {
-                m_IdleTimer.Stop();
-                m_IdleTimer = null;
-            }
-
-            base.OnAfterDelete();
-        }
-
-        private class AvengeTimer : Timer
-        {
-            private readonly Mobile m_Focus;
-
-            public AvengeTimer(Mobile focus) : base(
-                TimeSpan.FromSeconds(2.5),
-                TimeSpan.FromSeconds(1.0),
-                3
-            ) // After 2.5 seconds, one guard will spawn every 1.0 second, three times
-                =>
-                    m_Focus = focus;
-
-            protected override void OnTick()
-            {
-                Spawn(m_Focus, m_Focus, 1, true);
-            }
-        }
-
-        private class AttackTimer : Timer
-        {
-            private readonly ArcherGuard m_Owner;
-            // private bool m_Shooting;
-
-            public AttackTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1)) =>
-                m_Owner = owner;
-
-            public void DoOnTick()
-            {
-                OnTick();
-            }
-
-            protected override void OnTick()
-            {
-                if (m_Owner.Deleted)
-                {
-                    Stop();
-                    return;
-                }
-
-                m_Owner.Criminal = false;
-                m_Owner.Kills = 0;
-                m_Owner.Stam = m_Owner.StamMax;
-
-                var target = m_Owner.Focus;
-
-                if (target != null && (target.Deleted || !target.Alive || !m_Owner.CanBeHarmful(target)))
-                {
-                    m_Owner.Focus = null;
-                    Stop();
-                    return;
-                }
-
-                if (m_Owner.Weapon is Fists)
-                {
-                    m_Owner.Kill();
-                    Stop();
-                    return;
-                }
-
-                if (target != null && m_Owner.Combatant != target)
-                {
-                    m_Owner.Combatant = target;
-                }
-
-                if (target == null)
-                {
-                    Stop();
-                }
-                else
-                {
-                    // <instakill>
-                    TeleportTo(target);
-                    target.BoltEffect(0);
-
-                    if (target is BaseCreature creature)
-                    {
-                        creature.NoKillAwards = true;
-                    }
-
-                    target.Damage(target.HitsMax, m_Owner);
-                    target.Kill(); // just in case, maybe Damage is overridden on some shard
-
-                    if (target.Corpse != null && !target.Player)
-                    {
-                        target.Corpse.Delete();
-                    }
-
-                    m_Owner.Focus = null;
-                    Stop();
-                } // </instakill>
-
-                /*else if (!m_Owner.InRange( target, 20 ))
-                {
-                  m_Shooting = false;
-                  m_Owner.Focus = null;
-                }
-                else if (!m_Owner.InLOS( target ))
-                {
-                  m_Shooting = false;
                   TeleportTo( target );
-                }
+              }
-                else if (!m_Owner.CanSee( target ))
+              else
-                {
+              {
-                  m_Shooting = false;
+                if (!m_Owner.UseSkill( SkillName.DetectHidden ) && Utility.Random( 50 ) == 0)
+                  m_Owner.Say( "Reveal!" );
+              }
+            }
+            else
+            {
+              if (m_Shooting && (TimeToSpare() || OutOfMaxDistance( target )))
+                m_Shooting = false;
+              else if (!m_Shooting && InMinDistance( target ))
+                m_Shooting = true;
 
-                  if (!m_Owner.InRange( target, 2 ))
+              if (!m_Shooting)
-                  {
+              {
-                    if (!m_Owner.Move( m_Owner.GetDirectionTo( target ) | Direction.Running ) && OutOfMaxDistance( target ))
+                if (m_Owner.InRange( target, 1 ))
-                      TeleportTo( target );
-                  }
-                  else
-                  {
-                    if (!m_Owner.UseSkill( SkillName.DetectHidden ) && Utility.Random( 50 ) == 0)
-                      m_Owner.Say( "Reveal!" );
-                  }
-                }
-                else
                 {
-                  if (m_Shooting && (TimeToSpare() || OutOfMaxDistance( target )))
+                  if (!m_Owner.Move( (Direction)(m_Owner.GetDirectionTo( target ) - 4) | Direction.Running ) && OutOfMaxDistance( target ))
-                    m_Shooting = false;
+                    TeleportTo( target ); // Too close, move away
-                  else if (!m_Shooting && InMinDistance( target ))
+                }
-                    m_Shooting = true;
+                else if (!m_Owner.InRange( target, 2 ))
+                {
+                  if (!m_Owner.Move( m_Owner.GetDirectionTo( target ) | Direction.Running ) && OutOfMaxDistance( target ))
+                    TeleportTo( target );
+                }
+              }
+            }*/
+        }
 
-                  if (!m_Shooting)
+        private bool TimeToSpare() => m_Owner.NextCombatTime - Core.TickCount > 1000;
-                  {
+
-                    if (m_Owner.InRange( target, 1 ))
+        private bool OutOfMaxDistance(IPoint2D target) => !m_Owner.InRange(target, m_Owner.Weapon.MaxRange);
-                    {
+
-                      if (!m_Owner.Move( (Direction)(m_Owner.GetDirectionTo( target ) - 4) | Direction.Running ) && OutOfMaxDistance( target ))
+        private bool InMinDistance(IPoint2D target) => m_Owner.InRange(target, 4);
-                        TeleportTo( target ); // Too close, move away
+
-                    }
+        private void TeleportTo(IEntity target)
-                    else if (!m_Owner.InRange( target, 2 ))
+        {
-                    {
+            var from = m_Owner.Location;
-                      if (!m_Owner.Move( m_Owner.GetDirectionTo( target ) | Direction.Running ) && OutOfMaxDistance( target ))
+            var to = target.Location;
-                        TeleportTo( target );
+
-                    }
+            m_Owner.Location = to;
-                  }
+
-                }*/
+            Effects.SendLocationParticles(
+                EffectItem.Create(from, m_Owner.Map, EffectItem.DefaultDuration),
+                0x3728,
+                10,
+                10,
+                2023
+            );
+            Effects.SendLocationParticles(
+                EffectItem.Create(to, m_Owner.Map, EffectItem.DefaultDuration),
+                0x3728,
+                10,
+                10,
+                5023
+            );
+
+            m_Owner.PlaySound(0x1FE);
+        }
+    }
+
+    private class IdleTimer : Timer
+    {
+        private readonly ArcherGuard m_Owner;
+        private int m_Stage;
+
+        public IdleTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5)) =>
+            m_Owner = owner;
+
+        protected override void OnTick()
+        {
+            if (m_Owner.Deleted)
+            {
+                Stop();
+                return;
             }
 
-            private bool TimeToSpare() => m_Owner.NextCombatTime - Core.TickCount > 1000;
+            if (m_Stage++ % 4 == 0 || !m_Owner.Move(m_Owner.Direction))
-
-            private bool OutOfMaxDistance(IPoint2D target) => !m_Owner.InRange(target, m_Owner.Weapon.MaxRange);
-
-            private bool InMinDistance(IPoint2D target) => m_Owner.InRange(target, 4);
-
-            private void TeleportTo(IEntity target)
             {
-                var from = m_Owner.Location;
+                m_Owner.Direction = (Direction)Utility.Random(8);
-                var to = target.Location;
+            }
-
-                m_Owner.Location = to;
 
+            if (m_Stage > 16)
+            {
                 Effects.SendLocationParticles(
-                    EffectItem.Create(from, m_Owner.Map, EffectItem.DefaultDuration),
+                    EffectItem.Create(m_Owner.Location, m_Owner.Map, EffectItem.DefaultDuration),
                     0x3728,
                     10,
                     10,
                     2023
                 );
-                Effects.SendLocationParticles(
-                    EffectItem.Create(to, m_Owner.Map, EffectItem.DefaultDuration),
-                    0x3728,
-                    10,
-                    10,
-                    5023
-                );
-
                 m_Owner.PlaySound(0x1FE);
-            }
-        }
 
-        private class IdleTimer : Timer
+                m_Owner.Delete();
-        {
-            private readonly ArcherGuard m_Owner;
-            private int m_Stage;
-
-            public IdleTimer(ArcherGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5)) =>
-                m_Owner = owner;
-
-            protected override void OnTick()
-            {
-                if (m_Owner.Deleted)
-                {
-                    Stop();
-                    return;
-                }
-
-                if (m_Stage++ % 4 == 0 || !m_Owner.Move(m_Owner.Direction))
-                {
-                    m_Owner.Direction = (Direction)Utility.Random(8);
-                }
-
-                if (m_Stage > 16)
-                {
-                    Effects.SendLocationParticles(
-                        EffectItem.Create(m_Owner.Location, m_Owner.Map, EffectItem.DefaultDuration),
-                        0x3728,
-                        10,
-                        10,
-                        2023
-                    );
-                    m_Owner.PlaySound(0x1FE);
-
-                    m_Owner.Delete();
-                }
             }
         }
     }

Projects/UOContent/Mobiles/Guards/BaseGuard.cs

@@ -1,91 +1,74 @@
+using ModernUO.Serialization;
 using Server.Items;
 
-namespace Server.Mobiles
+namespace Server.Mobiles;
+
+[SerializationGenerator(0)]
+public abstract partial class BaseGuard : Mobile
 {
-    public abstract class BaseGuard : Mobile
+    public BaseGuard(Mobile target)
     {
-        public BaseGuard(Mobile target)
+        if (target != null)
         {
-            if (target != null)
+            Location = target.Location;
-            {
+            Map = target.Map;
-                Location = target.Location;
-                Map = target.Map;
 
-                Effects.SendLocationParticles(
-                    EffectItem.Create(Location, Map, EffectItem.DefaultDuration),
-                    0x3728,
-                    10,
-                    10,
-                    5023
-                );
-            }
-        }
-
-        public BaseGuard(Serial serial) : base(serial)
-        {
-        }
-
-        public abstract Mobile Focus { get; set; }
-
-        public static void Spawn(Mobile caller, Mobile target, int amount = 1, bool onlyAdditional = false)
-        {
-            if (target?.Deleted != false)
-            {
-                return;
-            }
-
-            foreach (var m in target.GetMobilesInRange(15))
-            {
-                if (m is BaseGuard g)
-                {
-                    if (g.Focus == null) // idling
-                    {
-                        g.Focus = target;
-
-                        --amount;
-                    }
-                    else if (g.Focus == target && !onlyAdditional)
-                    {
-                        --amount;
-                    }
-                }
-            }
-
-            while (amount-- > 0)
-            {
-                caller.Region.MakeGuard(target);
-            }
-        }
-
-        public override bool OnBeforeDeath()
-        {
             Effects.SendLocationParticles(
                 EffectItem.Create(Location, Map, EffectItem.DefaultDuration),
                 0x3728,
                 10,
                 10,
-                2023
+                5023
             );
-
-            PlaySound(0x1FE);
-
-            Delete();
-
-            return false;
-        }
-
-        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();
         }
     }
+
+    public abstract Mobile Focus { get; set; }
+
+    public static void Spawn(Mobile caller, Mobile target, int amount = 1, bool onlyAdditional = false)
+    {
+        if (target?.Deleted != false)
+        {
+            return;
+        }
+
+        foreach (var m in target.GetMobilesInRange(15))
+        {
+            if (m is BaseGuard g)
+            {
+                if (g.Focus == null) // idling
+                {
+                    g.Focus = target;
+
+                    --amount;
+                }
+                else if (g.Focus == target && !onlyAdditional)
+                {
+                    --amount;
+                }
+            }
+        }
+
+        while (amount-- > 0)
+        {
+            caller.Region.MakeGuard(target);
+        }
+    }
+
+    public override bool OnBeforeDeath()
+    {
+        Effects.SendLocationParticles(
+            EffectItem.Create(Location, Map, EffectItem.DefaultDuration),
+            0x3728,
+            10,
+            10,
+            2023
+        );
+
+        PlaySound(0x1FE);
+
+        Delete();
+
+        return false;
+    }
 }

Projects/UOContent/Mobiles/Guards/WarriorGuard.cs

@@ -1,393 +1,371 @@
 using System;
+using ModernUO.Serialization;
 using Server.Items;
 
-namespace Server.Mobiles
+namespace Server.Mobiles;
+
+[SerializationGenerator(0, false)]
+public partial class WarriorGuard : BaseGuard
 {
-    public class WarriorGuard : BaseGuard
+    private Timer _attackTimer;
+    private Timer _idleTimer;
+
+    [Constructible]
+    public WarriorGuard(Mobile target = null) : base(target)
     {
-        private Timer m_AttackTimer, m_IdleTimer;
+        InitStats(1000, 1000, 1000);
+        Title = "the guard";
 
-        private Mobile m_Focus;
+        SpeechHue = Utility.RandomDyedHue();
 
-        [Constructible]
+        Hue = Race.Human.RandomSkinHue();
-        public WarriorGuard(Mobile target = null) : base(target)
+
+        if (Female = Utility.RandomBool())
         {
-            InitStats(1000, 1000, 1000);
+            Body = 0x191;
-            Title = "the guard";
+            Name = NameList.RandomName("female");
 
-            SpeechHue = Utility.RandomDyedHue();
+            AddItem(Utility.RandomBool() ? new LeatherSkirt() : new LeatherShorts());
 
-            Hue = Race.Human.RandomSkinHue();
+            AddItem(
-
+                Utility.Random(5) switch
-            if (Female = Utility.RandomBool())
-            {
-                Body = 0x191;
-                Name = NameList.RandomName("female");
-
-                AddItem(Utility.RandomBool() ? new LeatherSkirt() : new LeatherShorts());
-
-                AddItem(
-                    Utility.Random(5) switch
-                    {
-                        0 => new FemaleLeatherChest(),
-                        1 => new FemaleStuddedChest(),
-                        2 => new LeatherBustierArms(),
-                        3 => new StuddedBustierArms(),
-                        _ => new FemalePlateChest() // 4
-                    }
-                );
-            }
-            else
-            {
-                Body = 0x190;
-                Name = NameList.RandomName("male");
-
-                AddItem(new PlateChest());
-                AddItem(new PlateArms());
-                AddItem(new PlateLegs());
-
-                AddItem(
-                    Utility.Random(3) switch
-                    {
-                        0 => new Doublet(Utility.RandomNondyedHue()),
-                        1 => new Tunic(Utility.RandomNondyedHue()),
-                        _ => new BodySash(Utility.RandomNondyedHue()) // 3
-                    }
-                );
-            }
-
-            Utility.AssignRandomHair(this);
-
-            if (Utility.RandomBool())
-            {
-                Utility.AssignRandomFacialHair(this, HairHue);
-            }
-
-            var weapon = new Halberd();
-
-            weapon.Movable = false;
-            weapon.Crafter = this;
-            weapon.Quality = WeaponQuality.Exceptional;
-
-            AddItem(weapon);
-
-            Container pack = new Backpack();
-
-            pack.Movable = false;
-
-            pack.DropItem(new Gold(10, 25));
-
-            AddItem(pack);
-
-            Skills.Anatomy.Base = 120.0;
-            Skills.Tactics.Base = 120.0;
-            Skills.Swords.Base = 120.0;
-            Skills.MagicResist.Base = 120.0;
-            Skills.DetectHidden.Base = 100.0;
-
-            NextCombatTime = Core.TickCount + 500;
-            Focus = target;
-        }
-
-        public WarriorGuard(Serial serial) : base(serial)
-        {
-        }
-
-        [CommandProperty(AccessLevel.GameMaster)]
-        public override Mobile Focus
-        {
-            get => m_Focus;
-            set
-            {
-                if (Deleted)
                 {
-                    return;
+                    0 => new FemaleLeatherChest(),
+                    1 => new FemaleStuddedChest(),
+                    2 => new LeatherBustierArms(),
+                    3 => new StuddedBustierArms(),
+                    _ => new FemalePlateChest() // 4
+                }
+            );
+        }
+        else
+        {
+            Body = 0x190;
+            Name = NameList.RandomName("male");
+
+            AddItem(new PlateChest());
+            AddItem(new PlateArms());
+            AddItem(new PlateLegs());
+
+            AddItem(
+                Utility.Random(3) switch
+                {
+                    0 => new Doublet(Utility.RandomNondyedHue()),
+                    1 => new Tunic(Utility.RandomNondyedHue()),
+                    _ => new BodySash(Utility.RandomNondyedHue()) // 3
+                }
+            );
+        }
+
+        Utility.AssignRandomHair(this);
+
+        if (Utility.RandomBool())
+        {
+            Utility.AssignRandomFacialHair(this, HairHue);
+        }
+
+        var weapon = new Halberd
+        {
+            Movable = false,
+            Crafter = this,
+            Quality = WeaponQuality.Exceptional
+        };
+
+        AddItem(weapon);
+
+        Container pack = new Backpack();
+
+        pack.Movable = false;
+
+        pack.DropItem(new Gold(10, 25));
+
+        AddItem(pack);
+
+        Skills.Anatomy.Base = 120.0;
+        Skills.Tactics.Base = 120.0;
+        Skills.Swords.Base = 120.0;
+        Skills.MagicResist.Base = 120.0;
+        Skills.DetectHidden.Base = 100.0;
+
+        NextCombatTime = Core.TickCount + 500;
+        Focus = target;
+    }
+
+    [SerializableProperty(0)]
+    [CommandProperty(AccessLevel.GameMaster)]
+    public override Mobile Focus
+    {
+        get => _focus;
+        set
+        {
+            if (Deleted)
+            {
+                return;
+            }
+
+            var oldFocus = _focus;
+
+            if (oldFocus != value)
+            {
+                _focus = value;
+
+                if (value != null)
+                {
+                    AggressiveAction(value);
                 }
 
-                var oldFocus = m_Focus;
+                Combatant = value;
 
-                if (oldFocus != value)
+                if (oldFocus?.Alive == false)
                 {
-                    m_Focus = value;
+                    Say("Thou hast suffered thy punishment, scoundrel.");
-
-                    if (value != null)
-                    {
-                        AggressiveAction(value);
-                    }
-
-                    Combatant = value;
-
-                    if (oldFocus?.Alive == false)
-                    {
-                        Say("Thou hast suffered thy punishment, scoundrel.");
-                    }
-
-                    if (value != null)
-                    {
-                        Say(500131); // Thou wilt regret thine actions, swine!
-                    }
-
-                    if (m_AttackTimer != null)
-                    {
-                        m_AttackTimer.Stop();
-                        m_AttackTimer = null;
-                    }
-
-                    if (m_IdleTimer != null)
-                    {
-                        m_IdleTimer.Stop();
-                        m_IdleTimer = null;
-                    }
-
-                    if (m_Focus != null)
-                    {
-                        m_AttackTimer = new AttackTimer(this);
-                        m_AttackTimer.Start();
-                        ((AttackTimer)m_AttackTimer).DoOnTick();
-                    }
-                    else
-                    {
-                        m_IdleTimer = new IdleTimer(this);
-                        m_IdleTimer.Start();
-                    }
-                }
-                else if (m_Focus == null && m_IdleTimer == null)
-                {
-                    m_IdleTimer = new IdleTimer(this);
-                    m_IdleTimer.Start();
-                }
-            }
-        }
-
-        public override bool OnBeforeDeath()
-        {
-            if (m_Focus?.Alive == true)
-            {
-                new AvengeTimer(m_Focus).Start(); // If a guard dies, three more guards will spawn
-            }
-
-            return base.OnBeforeDeath();
-        }
-
-        public override void Serialize(IGenericWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(0); // version
-
-            writer.Write(m_Focus);
-        }
-
-        public override void Deserialize(IGenericReader reader)
-        {
-            base.Deserialize(reader);
-
-            var version = reader.ReadInt();
-
-            switch (version)
-            {
-                case 0:
-                    {
-                        m_Focus = reader.ReadEntity<Mobile>();
-
-                        if (m_Focus != null)
-                        {
-                            m_AttackTimer = new AttackTimer(this);
-                            m_AttackTimer.Start();
-                        }
-                        else
-                        {
-                            m_IdleTimer = new IdleTimer(this);
-                            m_IdleTimer.Start();
-                        }
-
-                        break;
-                    }
-            }
-        }
-
-        public override void OnAfterDelete()
-        {
-            if (m_AttackTimer != null)
-            {
-                m_AttackTimer.Stop();
-                m_AttackTimer = null;
-            }
-
-            if (m_IdleTimer != null)
-            {
-                m_IdleTimer.Stop();
-                m_IdleTimer = null;
-            }
-
-            base.OnAfterDelete();
-        }
-
-        private class AvengeTimer : Timer
-        {
-            private readonly Mobile m_Focus;
-
-            public AvengeTimer(Mobile focus) : base(TimeSpan.FromSeconds(2.5), TimeSpan.FromSeconds(1.0), 3) =>
-                m_Focus = focus;
-
-            protected override void OnTick()
-            {
-                Spawn(m_Focus, m_Focus, 1, true);
-            }
-        }
-
-        private class AttackTimer : Timer
-        {
-            private readonly WarriorGuard m_Owner;
-
-            public AttackTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1)) =>
-                m_Owner = owner;
-
-            public void DoOnTick()
-            {
-                OnTick();
-            }
-
-            protected override void OnTick()
-            {
-                if (m_Owner.Deleted)
-                {
-                    Stop();
-                    return;
                 }
 
-                m_Owner.Criminal = false;
+                if (value != null)
-                m_Owner.Kills = 0;
-                m_Owner.Stam = m_Owner.StamMax;
-
-                var target = m_Owner.Focus;
-
-                if (target != null && (target.Deleted || !target.Alive || !m_Owner.CanBeHarmful(target)))
                 {
-                    m_Owner.Focus = null;
+                    Say(500131); // Thou wilt regret thine actions, swine!
-                    Stop();
-                    return;
                 }
 
-                if (m_Owner.Weapon is Fists)
+                if (_attackTimer != null)
                 {
-                    m_Owner.Kill();
+                    _attackTimer.Stop();
-                    Stop();
+                    _attackTimer = null;
-                    return;
                 }
 
-                if (target != null && m_Owner.Combatant != target)
+                if (_idleTimer != null)
                 {
-                    m_Owner.Combatant = target;
+                    _idleTimer.Stop();
+                    _idleTimer = null;
                 }
 
-                if (target == null)
+                if (_focus != null)
                 {
-                    Stop();
+                    _attackTimer = new AttackTimer(this);
+                    _attackTimer.Start();
+                    ((AttackTimer)_attackTimer).DoOnTick();
                 }
                 else
                 {
-                    // <instakill>
+                    _idleTimer = new IdleTimer(this);
-                    TeleportTo(target);
+                    _idleTimer.Start();
-                    target.BoltEffect(0);
-
-                    if (target is BaseCreature creature)
-                    {
-                        creature.NoKillAwards = true;
-                    }
-
-                    target.Damage(target.HitsMax, m_Owner);
-                    target.Kill(); // just in case, maybe Damage is overridden on some shard
-
-                    if (target.Corpse != null && !target.Player)
-                    {
-                        target.Corpse.Delete();
-                    }
-
-                    m_Owner.Focus = null;
-                    Stop();
-                } // </instakill>
-
-                /*else if (!m_Owner.InRange( target, 20 ))
-                {
-                  m_Owner.Focus = null;
                 }
-                else if (!m_Owner.InRange( target, 10 ) || !m_Owner.InLOS( target ))
+            }
-                {
+            else if (_focus == null && _idleTimer == null)
-                  TeleportTo( target );
+            {
-                }
+                _idleTimer = new IdleTimer(this);
-                else if (!m_Owner.InRange( target, 1 ))
+                _idleTimer.Start();
-                {
-                  if (!m_Owner.Move( m_Owner.GetDirectionTo( target ) | Direction.Running ))
-                    TeleportTo( target );
-                }
-                else if (!m_Owner.CanSee( target ))
-                {
-                  if (!m_Owner.UseSkill( SkillName.DetectHidden ) && Utility.Random( 50 ) == 0)
-                    m_Owner.Say( "Reveal!" );
-                }*/
             }
 
-            private void TeleportTo(Mobile target)
+            this.MarkDirty();
+        }
+    }
+
+    public override bool OnBeforeDeath()
+    {
+        if (_focus?.Alive == true)
+        {
+            new AvengeTimer(_focus).Start(); // If a guard dies, three more guards will spawn
+        }
+
+        return base.OnBeforeDeath();
+    }
+
+    [AfterDeserialization]
+    private void AfterDeserialization()
+    {
+        if (_focus != null)
+        {
+            _attackTimer = new AttackTimer(this);
+            _attackTimer.Start();
+        }
+        else
+        {
+            _idleTimer = new IdleTimer(this);
+            _idleTimer.Start();
+        }
+    }
+
+    public override void OnAfterDelete()
+    {
+        if (_attackTimer != null)
+        {
+            _attackTimer.Stop();
+            _attackTimer = null;
+        }
+
+        if (_idleTimer != null)
+        {
+            _idleTimer.Stop();
+            _idleTimer = null;
+        }
+
+        base.OnAfterDelete();
+    }
+
+    private class AvengeTimer : Timer
+    {
+        private readonly Mobile m_Focus;
+
+        public AvengeTimer(Mobile focus) : base(TimeSpan.FromSeconds(2.5), TimeSpan.FromSeconds(1.0), 3) =>
+            m_Focus = focus;
+
+        protected override void OnTick()
+        {
+            Spawn(m_Focus, m_Focus, 1, true);
+        }
+    }
+
+    private class AttackTimer : Timer
+    {
+        private readonly WarriorGuard m_Owner;
+
+        public AttackTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(0.1)) =>
+            m_Owner = owner;
+
+        public void DoOnTick()
+        {
+            OnTick();
+        }
+
+        protected override void OnTick()
+        {
+            if (m_Owner.Deleted)
             {
-                var from = m_Owner.Location;
+                Stop();
-                var to = target.Location;
+                return;
+            }
 
-                m_Owner.Location = to;
+            m_Owner.Criminal = false;
+            m_Owner.Kills = 0;
+            m_Owner.Stam = m_Owner.StamMax;
 
+            var target = m_Owner.Focus;
+
+            if (target != null && (target.Deleted || !target.Alive || !m_Owner.CanBeHarmful(target)))
+            {
+                m_Owner.Focus = null;
+                Stop();
+                return;
+            }
+
+            if (m_Owner.Weapon is Fists)
+            {
+                m_Owner.Kill();
+                Stop();
+                return;
+            }
+
+            if (target != null && m_Owner.Combatant != target)
+            {
+                m_Owner.Combatant = target;
+            }
+
+            if (target == null)
+            {
+                Stop();
+            }
+            else
+            {
+                // <instakill>
+                TeleportTo(target);
+                target.BoltEffect(0);
+
+                if (target is BaseCreature creature)
+                {
+                    creature.NoKillAwards = true;
+                }
+
+                target.Damage(target.HitsMax, m_Owner);
+                target.Kill(); // just in case, maybe Damage is overridden on some shard
+
+                if (target.Corpse != null && !target.Player)
+                {
+                    target.Corpse.Delete();
+                }
+
+                m_Owner.Focus = null;
+                Stop();
+            } // </instakill>
+
+            /*else if (!m_Owner.InRange( target, 20 ))
+            {
+              m_Owner.Focus = null;
+            }
+            else if (!m_Owner.InRange( target, 10 ) || !m_Owner.InLOS( target ))
+            {
+              TeleportTo( target );
+            }
+            else if (!m_Owner.InRange( target, 1 ))
+            {
+              if (!m_Owner.Move( m_Owner.GetDirectionTo( target ) | Direction.Running ))
+                TeleportTo( target );
+            }
+            else if (!m_Owner.CanSee( target ))
+            {
+              if (!m_Owner.UseSkill( SkillName.DetectHidden ) && Utility.Random( 50 ) == 0)
+                m_Owner.Say( "Reveal!" );
+            }*/
+        }
+
+        private void TeleportTo(Mobile target)
+        {
+            var from = m_Owner.Location;
+            var to = target.Location;
+
+            m_Owner.Location = to;
+
+            Effects.SendLocationParticles(
+                EffectItem.Create(from, m_Owner.Map, EffectItem.DefaultDuration),
+                0x3728,
+                10,
+                10,
+                2023
+            );
+            Effects.SendLocationParticles(
+                EffectItem.Create(to, m_Owner.Map, EffectItem.DefaultDuration),
+                0x3728,
+                10,
+                10,
+                5023
+            );
+
+            m_Owner.PlaySound(0x1FE);
+        }
+    }
+
+    private class IdleTimer : Timer
+    {
+        private readonly WarriorGuard m_Owner;
+        private int m_Stage;
+
+        public IdleTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5)) =>
+            m_Owner = owner;
+
+        protected override void OnTick()
+        {
+            if (m_Owner.Deleted)
+            {
+                Stop();
+                return;
+            }
+
+            if (m_Stage++ % 4 == 0 || !m_Owner.Move(m_Owner.Direction))
+            {
+                m_Owner.Direction = (Direction)Utility.Random(8);
+            }
+
+            if (m_Stage > 16)
+            {
                 Effects.SendLocationParticles(
-                    EffectItem.Create(from, m_Owner.Map, EffectItem.DefaultDuration),
+                    EffectItem.Create(m_Owner.Location, m_Owner.Map, EffectItem.DefaultDuration),
                     0x3728,
                     10,
                     10,
                     2023
                 );
-                Effects.SendLocationParticles(
-                    EffectItem.Create(to, m_Owner.Map, EffectItem.DefaultDuration),
-                    0x3728,
-                    10,
-                    10,
-                    5023
-                );
-
                 m_Owner.PlaySound(0x1FE);
-            }
-        }
 
-        private class IdleTimer : Timer
+                m_Owner.Delete();
-        {
-            private readonly WarriorGuard m_Owner;
-            private int m_Stage;
-
-            public IdleTimer(WarriorGuard owner) : base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.5)) =>
-                m_Owner = owner;
-
-            protected override void OnTick()
-            {
-                if (m_Owner.Deleted)
-                {
-                    Stop();
-                    return;
-                }
-
-                if (m_Stage++ % 4 == 0 || !m_Owner.Move(m_Owner.Direction))
-                {
-                    m_Owner.Direction = (Direction)Utility.Random(8);
-                }
-
-                if (m_Stage > 16)
-                {
-                    Effects.SendLocationParticles(
-                        EffectItem.Create(m_Owner.Location, m_Owner.Map, EffectItem.DefaultDuration),
-                        0x3728,
-                        10,
-                        10,
-                        2023
-                    );
-                    m_Owner.PlaySound(0x1FE);
-
-                    m_Owner.Delete();
-                }
             }
         }
     }