diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs b/Projects/UOContent/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs index e1edd6e05..4ea4e1800 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs @@ -1,11 +1,10 @@ -// using System.Collections.Generic; - -namespace Server.Items.Holiday +namespace Server.Items.Holiday { + [Serializable(0, false)] [TypeAlias("Server.Items.ClownMask", "Server.Items.DaemonMask", "Server.Items.PlagueMask")] - public class BasePaintedMask : Item + public partial class BasePaintedMask : Item { - private static readonly string[] m_Staffers = + private static readonly string[] Staffers = { "Owyn", "Luthius", @@ -14,46 +13,19 @@ namespace Server.Items.Holiday "Vorspire" }; - // Todo: Requires private-only modifiers - private string m_Staffer; + [InternString] + [SerializableField(0, setter: "private")] + private string _staffer; - public BasePaintedMask(int itemid) : this(m_Staffers.RandomElement(), itemid) + public BasePaintedMask(int itemid) : this(Staffers.RandomElement(), itemid) { } - public BasePaintedMask(string staffer, int itemid) : base(itemid + Utility.Random(2)) - { - m_Staffer = staffer; + public BasePaintedMask(string staffer, int itemid) : base(itemid + Utility.Random(2)) => + _staffer = Utility.Intern(staffer); - Utility.Intern(m_Staffer); - } - - public BasePaintedMask(Serial serial) : base(serial) - { - } - - public override string DefaultName => m_Staffer != null ? $"{MaskName} hand painted by {m_Staffer}" : MaskName; + public override string DefaultName => _staffer != null ? $"{MaskName} hand painted by {_staffer}" : MaskName; public virtual string MaskName => "A Mask"; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); // version - writer.Write(m_Staffer); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version == 1) - { - m_Staffer = Utility.Intern(reader.ReadString()); - } - } } } diff --git a/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs b/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs index 42ef293f5..1bc77cf3b 100644 --- a/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs +++ b/Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs @@ -141,7 +141,8 @@ namespace Server.Engines.Events } } - public class PlayerBones : BaseContainer + [Serializable(0, false)] + public partial class PlayerBones : BaseContainer { [Constructible] public PlayerBones(string name) @@ -157,23 +158,6 @@ namespace Server.Engines.Events _ => Hue }; } - - public PlayerBones(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } [Serializable(0, false)] diff --git a/Projects/UOContent/Items/Armor/Glasses/FoldedSteelGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/FoldedSteelGlasses.cs index 1d4fbc6f1..52ad9a712 100644 --- a/Projects/UOContent/Items/Armor/Glasses/FoldedSteelGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/FoldedSteelGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class FoldedSteelGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class FoldedSteelGlasses : ElvenGlasses { [Constructible] public FoldedSteelGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x47E; } - public FoldedSteelGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073380; // Folded Steel Reading Glasses public override int BasePhysicalResistance => 20; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x47E; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/LightOfWayGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/LightOfWayGlasses.cs index 9e4c30ded..bc41b7a3f 100644 --- a/Projects/UOContent/Items/Armor/Glasses/LightOfWayGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/LightOfWayGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class LightOfWayGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class LightOfWayGlasses : ElvenGlasses { [Constructible] public LightOfWayGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x256; } - public LightOfWayGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073378; // Light Of Way Reading Glasses public override int BasePhysicalResistance => 10; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x256; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/LyricalGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/LyricalGlasses.cs index 0c1f11a2d..4a83f3d33 100644 --- a/Projects/UOContent/Items/Armor/Glasses/LyricalGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/LyricalGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class LyricalGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class LyricalGlasses : ElvenGlasses { [Constructible] public LyricalGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x47F; } - public LyricalGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073382; // Lyrical Reading Glasses public override int BasePhysicalResistance => 10; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x47F; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/MaceShieldGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/MaceShieldGlasses.cs index c8523927e..2a71e599f 100644 --- a/Projects/UOContent/Items/Armor/Glasses/MaceShieldGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/MaceShieldGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class MaceShieldGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class MaceShieldGlasses : ElvenGlasses { [Constructible] public MaceShieldGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x1DD; } - public MaceShieldGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073381; // Mace And Shield Reading Glasses public override int BasePhysicalResistance => 25; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x1DD; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/MaritimeGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/MaritimeGlasses.cs index 263b27584..7afdc60d6 100644 --- a/Projects/UOContent/Items/Armor/Glasses/MaritimeGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/MaritimeGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class MaritimeGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class MaritimeGlasses : ElvenGlasses { [Constructible] public MaritimeGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x581; } - public MaritimeGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073364; // Maritime Reading Glasses public override int BasePhysicalResistance => 3; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x581; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/NecromanticGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/NecromanticGlasses.cs index 673c9ceb8..334cb7469 100644 --- a/Projects/UOContent/Items/Armor/Glasses/NecromanticGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/NecromanticGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class NecromanticGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class NecromanticGlasses : ElvenGlasses { [Constructible] public NecromanticGlasses() @@ -11,10 +12,6 @@ namespace Server.Items Hue = 0x22D; } - public NecromanticGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073377; // Necromantic Reading Glasses public override int BasePhysicalResistance => 0; @@ -25,22 +22,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x22D; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/PoisonedGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/PoisonedGlasses.cs index 8dcfafa7a..e96c2e41c 100644 --- a/Projects/UOContent/Items/Armor/Glasses/PoisonedGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/PoisonedGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class PoisonedGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class PoisonedGlasses : ElvenGlasses { [Constructible] public PoisonedGlasses() @@ -11,10 +12,6 @@ namespace Server.Items Hue = 0x113; } - public PoisonedGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073376; // Poisoned Reading Glasses public override int BasePhysicalResistance => 10; @@ -25,22 +22,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x113; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/TradeGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/TradeGlasses.cs index 156f484c7..7bfd740a9 100644 --- a/Projects/UOContent/Items/Armor/Glasses/TradeGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/TradeGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class TradeGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class TradeGlasses : ElvenGlasses { [Constructible] public TradeGlasses() @@ -9,10 +10,6 @@ namespace Server.Items Attributes.BonusInt = 10; } - public TradeGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073362; // Reading Glasses of the Trades public override int BasePhysicalResistance => 10; @@ -23,17 +20,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/TreasureTrinketGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/TreasureTrinketGlasses.cs index 6b9770581..a4e4df3be 100644 --- a/Projects/UOContent/Items/Armor/Glasses/TreasureTrinketGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/TreasureTrinketGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class TreasureTrinketGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class TreasureTrinketGlasses : ElvenGlasses { [Constructible] public TreasureTrinketGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x1C2; } - public TreasureTrinketGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073373; // Treasures and Trinkets Reading Glasses public override int BasePhysicalResistance => 10; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x1C2; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/WizardsGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/WizardsGlasses.cs index 6d491d2a1..1f9f93573 100644 --- a/Projects/UOContent/Items/Armor/Glasses/WizardsGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/WizardsGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class WizardsGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class WizardsGlasses : ElvenGlasses { [Constructible] public WizardsGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x2B0; } - public WizardsGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073374; // Wizard's Crystal Reading Glasses public override int BasePhysicalResistance => 5; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x2B0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/Bascinet.cs b/Projects/UOContent/Items/Armor/Helmets/Bascinet.cs index 1411f64bc..a4f7b9f23 100644 --- a/Projects/UOContent/Items/Armor/Helmets/Bascinet.cs +++ b/Projects/UOContent/Items/Armor/Helmets/Bascinet.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class Bascinet : BaseArmor + [Serializable(0, false)] + public partial class Bascinet : BaseArmor { [Constructible] public Bascinet() : base(0x140C) => Weight = 5.0; - public Bascinet(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 7; public override int BaseFireResistance => 2; public override int BaseColdResistance => 2; @@ -24,22 +21,5 @@ namespace Server.Items public override int ArmorBase => 18; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/BoneHelm.cs b/Projects/UOContent/Items/Armor/Helmets/BoneHelm.cs index 5afb8b76d..e6d891e3d 100644 --- a/Projects/UOContent/Items/Armor/Helmets/BoneHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/BoneHelm.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1451, 0x1456)] - public class BoneHelm : BaseArmor + public partial class BoneHelm : BaseArmor { [Constructible] public BoneHelm() : base(0x1451) => Weight = 3.0; - public BoneHelm(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 4; @@ -25,22 +22,5 @@ namespace Server.Items public override int ArmorBase => 30; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - - if (Weight == 1.0) - { - Weight = 3.0; - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs b/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs index 67259c3c4..6db814674 100644 --- a/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs +++ b/Projects/UOContent/Items/Armor/Helmets/ChainCoif.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13BB, 0x13C0)] - public class ChainCoif : BaseArmor + public partial class ChainCoif : BaseArmor { [Constructible] public ChainCoif() : base(0x13BB) => Weight = 1.0; - public ChainCoif(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 4; public override int BaseFireResistance => 4; public override int BaseColdResistance => 4; @@ -25,17 +22,5 @@ namespace Server.Items public override int ArmorBase => 28; public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/Circlet.cs b/Projects/UOContent/Items/Armor/Helmets/Circlet.cs index 3dbe25289..e35f8909e 100644 --- a/Projects/UOContent/Items/Armor/Helmets/Circlet.cs +++ b/Projects/UOContent/Items/Armor/Helmets/Circlet.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x2B6E, 0x3165)] - public class Circlet : BaseArmor + public partial class Circlet : BaseArmor { [Constructible] public Circlet() : base(0x2B6E) => Weight = 2.0; - public Circlet(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 1; public override int BaseFireResistance => 5; public override int BaseColdResistance => 2; @@ -29,19 +26,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override Race RequiredRace => Race.Elf; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/CloseHelm.cs b/Projects/UOContent/Items/Armor/Helmets/CloseHelm.cs index 6d08d8337..0de794c6b 100644 --- a/Projects/UOContent/Items/Armor/Helmets/CloseHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/CloseHelm.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class CloseHelm : BaseArmor + [Serializable(0, false)] + public partial class CloseHelm : BaseArmor { [Constructible] public CloseHelm() : base(0x1408) => Weight = 5.0; - public CloseHelm(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -24,22 +21,5 @@ namespace Server.Items public override int ArmorBase => 30; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/DaemonHelm.cs b/Projects/UOContent/Items/Armor/Helmets/DaemonHelm.cs index 111b7579b..81fb497da 100644 --- a/Projects/UOContent/Items/Armor/Helmets/DaemonHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/DaemonHelm.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1451, 0x1456)] - public class DaemonHelm : BaseArmor + public partial class DaemonHelm : BaseArmor { [Constructible] public DaemonHelm() : base(0x1451) @@ -12,10 +13,6 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } - public DaemonHelm(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; public override int BaseFireResistance => 6; public override int BaseColdResistance => 7; @@ -34,29 +31,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041374; // daemon bone helmet - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 3.0; - } - - if (ArmorAttributes.SelfRepair == 0) - { - ArmorAttributes.SelfRepair = 1; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs b/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs index 141f3d76e..fa918315c 100644 --- a/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs +++ b/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs @@ -1,15 +1,12 @@ namespace Server.Items { [Flippable(0x2B70, 0x3167)] - public class GemmedCirclet : BaseArmor + [Serializable(0, false)] + public partial class GemmedCirclet : BaseArmor { [Constructible] public GemmedCirclet() : base(0x2B70) => Weight = 2.0; - public GemmedCirclet(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 1; @@ -29,19 +26,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/Helmet.cs b/Projects/UOContent/Items/Armor/Helmets/Helmet.cs index 17c9b3d9e..9dd8a7a15 100644 --- a/Projects/UOContent/Items/Armor/Helmets/Helmet.cs +++ b/Projects/UOContent/Items/Armor/Helmets/Helmet.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class Helmet : BaseArmor + [Serializable(0, false)] + public partial class Helmet : BaseArmor { [Constructible] public Helmet() : base(0x140A) => Weight = 5.0; - public Helmet(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 4; @@ -24,22 +21,5 @@ namespace Server.Items public override int ArmorBase => 30; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/LeatherCap.cs b/Projects/UOContent/Items/Armor/Helmets/LeatherCap.cs index 7d0b895b4..455bc4550 100644 --- a/Projects/UOContent/Items/Armor/Helmets/LeatherCap.cs +++ b/Projects/UOContent/Items/Armor/Helmets/LeatherCap.cs @@ -1,15 +1,12 @@ namespace Server.Items { [Flippable(0x1db9, 0x1dba)] - public class LeatherCap : BaseArmor + [Serializable(0, false)] + public partial class LeatherCap : BaseArmor { [Constructible] public LeatherCap() : base(0x1DB9) => Weight = 2.0; - public LeatherCap(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 2.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/NorseHelm.cs b/Projects/UOContent/Items/Armor/Helmets/NorseHelm.cs index 3cfd0af47..5278c1437 100644 --- a/Projects/UOContent/Items/Armor/Helmets/NorseHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/NorseHelm.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class NorseHelm : BaseArmor + [Serializable(0, false)] + public partial class NorseHelm : BaseArmor { [Constructible] public NorseHelm() : base(0x140E) => Weight = 5.0; - public NorseHelm(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 4; public override int BaseFireResistance => 1; public override int BaseColdResistance => 4; @@ -24,22 +21,5 @@ namespace Server.Items public override int ArmorBase => 30; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/OrcHelm.cs b/Projects/UOContent/Items/Armor/Helmets/OrcHelm.cs index 4c74a64b3..263922d7b 100644 --- a/Projects/UOContent/Items/Armor/Helmets/OrcHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/OrcHelm.cs @@ -1,16 +1,13 @@ namespace Server.Items { - public class OrcHelm : BaseArmor + [Serializable(0, false)] + public partial class OrcHelm : BaseArmor { [Constructible] public OrcHelm() : base(0x1F0B) { } - public OrcHelm(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 1; public override int BaseColdResistance => 3; @@ -31,22 +28,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.None; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && (Weight == 1 || Weight == 5)) - { - Weight = -1; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/PlateHelm.cs b/Projects/UOContent/Items/Armor/Helmets/PlateHelm.cs index 46ac753db..a9401e970 100644 --- a/Projects/UOContent/Items/Armor/Helmets/PlateHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/PlateHelm.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateHelm : BaseArmor + [Serializable(0, false)] + public partial class PlateHelm : BaseArmor { [Constructible] public PlateHelm() : base(0x1412) => Weight = 5.0; - public PlateHelm(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -26,22 +23,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/RavenHelm.cs b/Projects/UOContent/Items/Armor/Helmets/RavenHelm.cs index 6fe8593e1..56c9feeda 100644 --- a/Projects/UOContent/Items/Armor/Helmets/RavenHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/RavenHelm.cs @@ -1,15 +1,12 @@ namespace Server.Items { [Flippable(0x2B71, 0x3168)] - public class RavenHelm : BaseArmor + [Serializable(0)] + public partial class RavenHelm : BaseArmor { [Constructible] public RavenHelm() : base(0x2B71) => Weight = 5.0; - public RavenHelm(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 5; @@ -27,19 +24,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/RoyalCirclet.cs b/Projects/UOContent/Items/Armor/Helmets/RoyalCirclet.cs index 710199d98..2a3c33b0e 100644 --- a/Projects/UOContent/Items/Armor/Helmets/RoyalCirclet.cs +++ b/Projects/UOContent/Items/Armor/Helmets/RoyalCirclet.cs @@ -1,15 +1,12 @@ namespace Server.Items { [Flippable(0x2B6F, 0x3166)] - public class RoyalCirclet : BaseArmor + [Serializable(0)] + public partial class RoyalCirclet : BaseArmor { [Constructible] public RoyalCirclet() : base(0x2B6F) => Weight = 2.0; - public RoyalCirclet(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 1; @@ -29,19 +26,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/VultureHelm.cs b/Projects/UOContent/Items/Armor/Helmets/VultureHelm.cs index 36cb7fbe1..a9aa4a0b2 100644 --- a/Projects/UOContent/Items/Armor/Helmets/VultureHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/VultureHelm.cs @@ -1,15 +1,12 @@ namespace Server.Items { [Flippable(0x2B72, 0x3169)] - public class VultureHelm : BaseArmor + [Serializable(0)] + public partial class VultureHelm : BaseArmor { [Constructible] public VultureHelm() : base(0x2B72) => Weight = 5.0; - public VultureHelm(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 5; @@ -27,19 +24,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Helmets/WingedHelm.cs b/Projects/UOContent/Items/Armor/Helmets/WingedHelm.cs index bb534b181..5826215ad 100644 --- a/Projects/UOContent/Items/Armor/Helmets/WingedHelm.cs +++ b/Projects/UOContent/Items/Armor/Helmets/WingedHelm.cs @@ -1,15 +1,12 @@ namespace Server.Items { [Flippable(0x2B73, 0x316A)] - public class WingedHelm : BaseArmor + [Serializable(0)] + public partial class WingedHelm : BaseArmor { [Constructible] public WingedHelm() : base(0x2B73) => Weight = 5.0; - public WingedHelm(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 5; @@ -27,19 +24,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/FemaleLeafChest.cs b/Projects/UOContent/Items/Armor/Leather/FemaleLeafChest.cs index 54f9bfa9e..e46b414b6 100644 --- a/Projects/UOContent/Items/Armor/Leather/FemaleLeafChest.cs +++ b/Projects/UOContent/Items/Armor/Leather/FemaleLeafChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2FCB, 0x3181)] - public class FemaleLeafChest : BaseArmor + public partial class FemaleLeafChest : BaseArmor { [Constructible] public FemaleLeafChest() : base(0x2FCB) => Weight = 2.0; - public FemaleLeafChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -30,19 +27,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs b/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs index 89caf82b1..30e3edd50 100644 --- a/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs +++ b/Projects/UOContent/Items/Armor/Leather/FemaleLeatherChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1c06, 0x1c07)] - public class FemaleLeatherChest : BaseArmor + public partial class FemaleLeatherChest : BaseArmor { [Constructible] public FemaleLeatherChest() : base(0x1C06) => Weight = 1.0; - public FemaleLeatherChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -30,17 +27,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType1.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType1.cs index 9e12f3ba8..7ec8f927f 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType1.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType1.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishLeatherArms")] - public class GargishLeatherArmsType1 : BaseArmor + public partial class GargishLeatherArmsType1 : BaseArmor { [Constructible] public GargishLeatherArmsType1() : base(0x301) => Weight = 4.0; - public GargishLeatherArmsType1(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -28,16 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType2.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType2.cs index 9ccd12bfb..5c0d0c9c2 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType2.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherArmsType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishLeatherArms")] - public class GargishLeatherArmsType2 : BaseArmor + public partial class GargishLeatherArmsType2 : BaseArmor { [Constructible] public GargishLeatherArmsType2() : base(0x302) => Weight = 4.0; - public GargishLeatherArmsType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -27,16 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType1.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType1.cs index c1413db28..8384eeec4 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType1.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType1.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishLeatherChest")] - public class GargishLeatherChestType1 : BaseArmor + public partial class GargishLeatherChestType1 : BaseArmor { [Constructible] public GargishLeatherChestType1() : base(0x0304) => Weight = 4.0; - public GargishLeatherChestType1(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -27,15 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType2.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType2.cs index ce9c09f4a..b2bfa5721 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType2.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherChestType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishLeatherChest")] - public class GargishLeatherChestType2 : BaseArmor + public partial class GargishLeatherChestType2 : BaseArmor { [Constructible] public GargishLeatherChestType2() : base(0x303) => Weight = 4.0; - public GargishLeatherChestType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -28,16 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType1.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType1.cs index e9871e146..b49f38925 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType1.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType1.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishLeatherKilt")] - public class GargishLeatherKiltType1 : BaseArmor + public partial class GargishLeatherKiltType1 : BaseArmor { [Constructible] public GargishLeatherKiltType1() : base(0x311) => Weight = 4.0; - public GargishLeatherKiltType1(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -27,15 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType2.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType2.cs index d01242917..836b56587 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType2.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherKiltType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishLeatherKilt")] - public class GargishLeatherKiltType2 : BaseArmor + public partial class GargishLeatherKiltType2 : BaseArmor { [Constructible] public GargishLeatherKiltType2() : base(0x310) => Weight = 4.0; - public GargishLeatherKiltType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -27,16 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType1.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType1.cs index 2352f6782..b506b842d 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType1.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType1.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishLeatherLegs")] - public class GargishLeatherLegsType1 : BaseArmor + public partial class GargishLeatherLegsType1 : BaseArmor { [Constructible] public GargishLeatherLegsType1() : base(0x305) => Weight = 4.0; - public GargishLeatherLegsType1(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -27,16 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); // version - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType2.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType2.cs index 63ac21789..6c4d0116f 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType2.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherLegsType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishLeatherLegs")] - public class GargishLeatherLegsType2 : BaseArmor + public partial class GargishLeatherLegsType2 : BaseArmor { [Constructible] public GargishLeatherLegsType2() : base(0x306) => Weight = 4.0; - public GargishLeatherLegsType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 5; @@ -27,16 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); // version - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/GargishLeatherWingArmor.cs b/Projects/UOContent/Items/Armor/Leather/GargishLeatherWingArmor.cs index e907f1da6..ad3b252f3 100644 --- a/Projects/UOContent/Items/Armor/Leather/GargishLeatherWingArmor.cs +++ b/Projects/UOContent/Items/Armor/Leather/GargishLeatherWingArmor.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x457E, 0x457F)] - public class GargishLeatherWingArmor : BaseArmor + public partial class GargishLeatherWingArmor : BaseArmor { [Constructible] public GargishLeatherWingArmor() : base(0x457E) => Weight = 2.0; - public GargishLeatherWingArmor(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int PhysicalResistance => 0; @@ -24,16 +22,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeafArms.cs b/Projects/UOContent/Items/Armor/Leather/LeafArms.cs index b1ad1de2a..77c996287 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeafArms.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeafArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2FC8, 0x317E)] - public class LeafArms : BaseArmor + public partial class LeafArms : BaseArmor { [Constructible] public LeafArms() : base(0x2FC8) => Weight = 2.0; - public LeafArms(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 3; @@ -29,19 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeafChest.cs b/Projects/UOContent/Items/Armor/Leather/LeafChest.cs index a16636b9d..eba7e6f62 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeafChest.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeafChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2FC5, 0x317B)] - public class LeafChest : BaseArmor + public partial class LeafChest : BaseArmor { [Constructible] public LeafChest() : base(0x2FC5) => Weight = 2.0; - public LeafChest(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 3; @@ -29,19 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs b/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs index 02176f88b..f56df993c 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeafGloves.cs @@ -1,17 +1,15 @@ namespace Server.Items { [Flippable] - public class LeafGloves : BaseArmor, IArcaneEquip + [Serializable(1)] + public partial class LeafGloves : BaseArmor, IArcaneEquip { - private int m_MaxArcaneCharges, m_CurArcaneCharges; + private int _maxArcaneCharges; + private int _curArcaneCharges; [Constructible] public LeafGloves() : base(0x2FC6) => Weight = 2.0; - public LeafGloves(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 3; @@ -32,74 +30,43 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; + [EncodedInt] + [SerializableField(1)] [CommandProperty(AccessLevel.GameMaster)] public int MaxArcaneCharges { - get => m_MaxArcaneCharges; + get => _maxArcaneCharges; set { - m_MaxArcaneCharges = value; + _maxArcaneCharges = value; InvalidateProperties(); Update(); } } + [EncodedInt] + [SerializableField(0)] [CommandProperty(AccessLevel.GameMaster)] public int CurArcaneCharges { - get => m_CurArcaneCharges; + get => _curArcaneCharges; set { - m_CurArcaneCharges = value; + _curArcaneCharges = value; InvalidateProperties(); Update(); } } [CommandProperty(AccessLevel.GameMaster)] - public bool IsArcane => m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0; + public bool IsArcane => _maxArcaneCharges > 0 && _curArcaneCharges >= 0; - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - - if (IsArcane) + if (reader.ReadBool()) { - writer.Write(true); - writer.Write(m_CurArcaneCharges); - writer.Write(m_MaxArcaneCharges); - } - else - { - writer.Write(false); - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - - switch (version) - { - case 0: - { - if (reader.ReadBool()) - { - m_CurArcaneCharges = reader.ReadInt(); - m_MaxArcaneCharges = reader.ReadInt(); - - if (Hue == 2118) - { - Hue = ArcaneGem.DefaultArcaneHue; - } - } - - break; - } + _curArcaneCharges = reader.ReadInt(); + _maxArcaneCharges = reader.ReadInt(); } } @@ -126,7 +93,7 @@ namespace Server.Items if (IsArcane) { - list.Add(1061837, "{0}\t{1}", m_CurArcaneCharges, m_MaxArcaneCharges); // arcane charges: ~1_val~ / ~2_val~ + list.Add(1061837, "{0}\t{1}", _curArcaneCharges, _maxArcaneCharges); // arcane charges: ~1_val~ / ~2_val~ } } @@ -136,20 +103,18 @@ namespace Server.Items if (IsArcane) { - LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); + LabelTo(from, 1061837, $"{_curArcaneCharges}\t{_maxArcaneCharges}"); } } public void Flip() { - if (ItemID == 0x2FC6) + ItemID = ItemID switch { - ItemID = 0x317C; - } - else if (ItemID == 0x317C) - { - ItemID = 0x2FC6; - } + 0x2FC6 => 0x317C, + 0x317C => 0x2FC6, + _ => ItemID + }; } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeafGorget.cs b/Projects/UOContent/Items/Armor/Leather/LeafGorget.cs index afdf2f290..f7537675a 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeafGorget.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeafGorget.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeafGorget : BaseArmor + [Serializable(0)] + public partial class LeafGorget : BaseArmor { [Constructible] public LeafGorget() : base(0x2FC7) => Weight = 2.0; - public LeafGorget(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 3; @@ -28,19 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeafLegs.cs b/Projects/UOContent/Items/Armor/Leather/LeafLegs.cs index b370ad320..8fb72e89d 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeafLegs.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeafLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2FC9, 0x317F)] - public class LeafLegs : BaseArmor + public partial class LeafLegs : BaseArmor { [Constructible] public LeafLegs() : base(0x2FC9) => Weight = 2.0; - public LeafLegs(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 2; @@ -30,19 +27,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeafTonlet.cs b/Projects/UOContent/Items/Armor/Leather/LeafTonlet.cs index 81a1fdf72..e12536e09 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeafTonlet.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeafTonlet.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2FCA, 0x3180)] - public class LeafTonlet : BaseArmor + public partial class LeafTonlet : BaseArmor { [Constructible] public LeafTonlet() : base(0x2FCA) => Weight = 2.0; - public LeafTonlet(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 3; @@ -29,19 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherArms.cs b/Projects/UOContent/Items/Armor/Leather/LeatherArms.cs index 8ca4c88fb..d2b399f33 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherArms.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13cd, 0x13c5)] - public class LeatherArms : BaseArmor + public partial class LeatherArms : BaseArmor { [Constructible] public LeatherArms() : base(0x13CD) => Weight = 2.0; - public LeatherArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 2.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs b/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs index a69dd4d4d..e480f1753 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherBustierArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1c0a, 0x1c0b)] - public class LeatherBustierArms : BaseArmor + public partial class LeatherBustierArms : BaseArmor { [Constructible] public LeatherBustierArms() : base(0x1C0A) => Weight = 1.0; - public LeatherBustierArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -30,17 +27,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherChest.cs b/Projects/UOContent/Items/Armor/Leather/LeatherChest.cs index 88087a407..7bf28c097 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherChest.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13cc, 0x13d3)] - public class LeatherChest : BaseArmor + public partial class LeatherChest : BaseArmor { [Constructible] public LeatherChest() : base(0x13CC) => Weight = 6.0; - public LeatherChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 6.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherDo.cs b/Projects/UOContent/Items/Armor/Leather/LeatherDo.cs index 8ce578792..0b389285c 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherDo.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherDo.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherDo : BaseArmor + [Serializable(0, false)] + public partial class LeatherDo : BaseArmor { [Constructible] public LeatherDo() : base(0x27C6) => Weight = 6.0; - public LeatherDo(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs b/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs index 76796808d..9fd5a4cf1 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherGloves.cs @@ -1,17 +1,15 @@ namespace Server.Items { [Flippable] - public class LeatherGloves : BaseArmor, IArcaneEquip + [Serializable(0, false)] + public partial class LeatherGloves : BaseArmor, IArcaneEquip { - private int m_MaxArcaneCharges, m_CurArcaneCharges; + private int _maxArcaneCharges; + private int _curArcaneCharges; [Constructible] public LeatherGloves() : base(0x13C6) => Weight = 1.0; - public LeatherGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -31,74 +29,43 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - [CommandProperty(AccessLevel.GameMaster)] - public int MaxArcaneCharges - { - get => m_MaxArcaneCharges; - set - { - m_MaxArcaneCharges = value; - InvalidateProperties(); - Update(); - } - } - + [EncodedInt] + [SerializableField(0)] [CommandProperty(AccessLevel.GameMaster)] public int CurArcaneCharges { - get => m_CurArcaneCharges; + get => _curArcaneCharges; set { - m_CurArcaneCharges = value; + _curArcaneCharges = value; + InvalidateProperties(); + Update(); + } + } + + [EncodedInt] + [SerializableField(1)] + [CommandProperty(AccessLevel.GameMaster)] + public int MaxArcaneCharges + { + get => _maxArcaneCharges; + set + { + _maxArcaneCharges = value; InvalidateProperties(); Update(); } } [CommandProperty(AccessLevel.GameMaster)] - public bool IsArcane => m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0; + public bool IsArcane => _maxArcaneCharges > 0 && _curArcaneCharges >= 0; - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - if (IsArcane) + if (reader.ReadBool()) { - writer.Write(true); - writer.Write(m_CurArcaneCharges); - writer.Write(m_MaxArcaneCharges); - } - else - { - writer.Write(false); - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) - { - case 1: - { - if (reader.ReadBool()) - { - m_CurArcaneCharges = reader.ReadInt(); - m_MaxArcaneCharges = reader.ReadInt(); - - if (Hue == 2118) - { - Hue = ArcaneGem.DefaultArcaneHue; - } - } - - break; - } + _curArcaneCharges = reader.ReadInt(); + _maxArcaneCharges = reader.ReadInt(); } } @@ -125,7 +92,7 @@ namespace Server.Items if (IsArcane) { - list.Add(1061837, "{0}\t{1}", m_CurArcaneCharges, m_MaxArcaneCharges); // arcane charges: ~1_val~ / ~2_val~ + list.Add(1061837, "{0}\t{1}", _curArcaneCharges, _maxArcaneCharges); // arcane charges: ~1_val~ / ~2_val~ } } @@ -135,20 +102,18 @@ namespace Server.Items if (IsArcane) { - LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}"); + LabelTo(from, 1061837, $"{_curArcaneCharges}\t{_maxArcaneCharges}"); } } public void Flip() { - if (ItemID == 0x13C6) + ItemID = ItemID switch { - ItemID = 0x13CE; - } - else if (ItemID == 0x13CE) - { - ItemID = 0x13C6; - } + 0x13C6 => 0x13CE, + 0x13CE => 0x13C6, + _ => ItemID + }; } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs b/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs index 9a7cb87a7..07b8baf08 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherGorget.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherGorget : BaseArmor + [Serializable(0, false)] + public partial class LeatherGorget : BaseArmor { [Constructible] public LeatherGorget() : base(0x13C7) => Weight = 1.0; - public LeatherGorget(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherHaidate.cs b/Projects/UOContent/Items/Armor/Leather/LeatherHaidate.cs index 0ff994345..5a267ff4d 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherHaidate.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherHaidate.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherHaidate : BaseArmor + [Serializable(0, false)] + public partial class LeatherHaidate : BaseArmor { [Constructible] public LeatherHaidate() : base(0x278A) => Weight = 4.0; - public LeatherHaidate(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs b/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs index 4b117a004..107940e01 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherHiroSode.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherHiroSode : BaseArmor + [Serializable(0, false)] + public partial class LeatherHiroSode : BaseArmor { [Constructible] public LeatherHiroSode() : base(0x277E) => Weight = 1.0; - public LeatherHiroSode(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherJingasa.cs b/Projects/UOContent/Items/Armor/Leather/LeatherJingasa.cs index b8d19eb49..d26cd8793 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherJingasa.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherJingasa.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherJingasa : BaseArmor + [Serializable(0, false)] + public partial class LeatherJingasa : BaseArmor { [Constructible] public LeatherJingasa() : base(0x2776) => Weight = 3.0; - public LeatherJingasa(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 4; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherLegs.cs b/Projects/UOContent/Items/Armor/Leather/LeatherLegs.cs index 7834f02ca..9c3d88b98 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherLegs.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13cb, 0x13d2)] - public class LeatherLegs : BaseArmor + public partial class LeatherLegs : BaseArmor { [Constructible] public LeatherLegs() : base(0x13CB) => Weight = 4.0; - public LeatherLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,17 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherMempo.cs b/Projects/UOContent/Items/Armor/Leather/LeatherMempo.cs index 246c5af69..4fda47995 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherMempo.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherMempo.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherMempo : BaseArmor + [Serializable(0, false)] + public partial class LeatherMempo : BaseArmor { [Constructible] public LeatherMempo() : base(0x277A) => Weight = 2.0; - public LeatherMempo(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaHood.cs b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaHood.cs index c9c6f407a..b0c09710b 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaHood.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaHood.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherNinjaHood : BaseArmor + [Serializable(0, false)] + public partial class LeatherNinjaHood : BaseArmor { [Constructible] public LeatherNinjaHood() : base(0x278E) => Weight = 2.0; - public LeatherNinjaHood(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaJacket.cs b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaJacket.cs index 180bc88ed..05c5ab220 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaJacket.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaJacket.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherNinjaJacket : BaseArmor + [Serializable(0, false)] + public partial class LeatherNinjaJacket : BaseArmor { [Constructible] public LeatherNinjaJacket() : base(0x2793) => Weight = 5.0; - public LeatherNinjaJacket(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaMitts.cs b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaMitts.cs index e556eceec..3e3586bfc 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaMitts.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaMitts.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherNinjaMitts : BaseArmor + [Serializable(0, false)] + public partial class LeatherNinjaMitts : BaseArmor { [Constructible] public LeatherNinjaMitts() : base(0x2792) => Weight = 2.0; - public LeatherNinjaMitts(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,34 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(2); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - switch (version) - { - case 1: - { - if (reader.ReadBool()) - { - reader.ReadInt(); - reader.ReadInt(); - } - - Weight = 2.0; - ItemID = 0x2792; - - break; - } - } - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaPants.cs b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaPants.cs index 5fa20672e..c7fbd22e6 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherNinjaPants.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherNinjaPants.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherNinjaPants : BaseArmor + [Serializable(0, false)] + public partial class LeatherNinjaPants : BaseArmor { [Constructible] public LeatherNinjaPants() : base(0x2791) => Weight = 3.0; - public LeatherNinjaPants(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherShorts.cs b/Projects/UOContent/Items/Armor/Leather/LeatherShorts.cs index 27ed05b53..08cadaf62 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherShorts.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherShorts.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1c00, 0x1c01)] - public class LeatherShorts : BaseArmor + public partial class LeatherShorts : BaseArmor { [Constructible] public LeatherShorts() : base(0x1C00) => Weight = 3.0; - public LeatherShorts(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -30,17 +27,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs b/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs index 17b0d2cef..6c351757c 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherSkirt.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1c08, 0x1c09)] - public class LeatherSkirt : BaseArmor + public partial class LeatherSkirt : BaseArmor { [Constructible] public LeatherSkirt() : base(0x1C08) => Weight = 1.0; - public LeatherSkirt(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -30,22 +27,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - - if (Weight == 3.0) - { - Weight = 1.0; - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Leather/LeatherSuneate.cs b/Projects/UOContent/Items/Armor/Leather/LeatherSuneate.cs index 233a0f260..6262a83dc 100644 --- a/Projects/UOContent/Items/Armor/Leather/LeatherSuneate.cs +++ b/Projects/UOContent/Items/Armor/Leather/LeatherSuneate.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LeatherSuneate : BaseArmor + [Serializable(0, false)] + public partial class LeatherSuneate : BaseArmor { [Constructible] public LeatherSuneate() : base(0x2786) => Weight = 4.0; - public LeatherSuneate(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,17 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Misc/ArcaneGem.cs b/Projects/UOContent/Items/Misc/ArcaneGem.cs index eb179aa15..5da64655f 100644 --- a/Projects/UOContent/Items/Misc/ArcaneGem.cs +++ b/Projects/UOContent/Items/Misc/ArcaneGem.cs @@ -36,17 +36,12 @@ namespace Server.Items { var v = (int)(m.Skills.Tailoring.Value / 5); - if (v < 16) + return v switch { - return 16; - } - - if (v > 24) - { - return 24; - } - - return v; + < 16 => 16, + > 24 => 24, + _ => v + }; } public void OnTarget(Mobile from, object obj) diff --git a/Projects/UOContent/Migrations/Server.Engines.Events.PlayerBones.v0.json b/Projects/UOContent/Migrations/Server.Engines.Events.PlayerBones.v0.json new file mode 100644 index 000000000..364c4e802 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Engines.Events.PlayerBones.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Engines.Events.PlayerBones" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Bascinet.v0.json b/Projects/UOContent/Migrations/Server.Items.Bascinet.v0.json new file mode 100644 index 000000000..7509f3df7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Bascinet.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Bascinet" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BoneHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.BoneHelm.v0.json new file mode 100644 index 000000000..c70b580d7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BoneHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.BoneHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ChainCoif.v0.json b/Projects/UOContent/Migrations/Server.Items.ChainCoif.v0.json new file mode 100644 index 000000000..5d048a51e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ChainCoif.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.ChainCoif" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Circlet.v0.json b/Projects/UOContent/Migrations/Server.Items.Circlet.v0.json new file mode 100644 index 000000000..da0f73a6e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Circlet.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Circlet" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.CloseHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.CloseHelm.v0.json new file mode 100644 index 000000000..331820e5a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.CloseHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.CloseHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DaemonHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.DaemonHelm.v0.json new file mode 100644 index 000000000..e433eaa0b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DaemonHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.DaemonHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FemaleLeafChest.v0.json b/Projects/UOContent/Migrations/Server.Items.FemaleLeafChest.v0.json new file mode 100644 index 000000000..37d06daf5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FemaleLeafChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.FemaleLeafChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FemaleLeatherChest.v0.json b/Projects/UOContent/Migrations/Server.Items.FemaleLeatherChest.v0.json new file mode 100644 index 000000000..6e7ad7c93 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FemaleLeatherChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.FemaleLeatherChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FoldedSteelGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.FoldedSteelGlasses.v0.json new file mode 100644 index 000000000..9387f94d0 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FoldedSteelGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.FoldedSteelGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherArmsType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherArmsType1.v0.json new file mode 100644 index 000000000..eb21dc9f0 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherArmsType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherArmsType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherArmsType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherArmsType2.v0.json new file mode 100644 index 000000000..7cde65b7e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherArmsType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherArmsType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherChestType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherChestType1.v0.json new file mode 100644 index 000000000..f87e59635 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherChestType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherChestType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherChestType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherChestType2.v0.json new file mode 100644 index 000000000..3b1a21537 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherChestType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherChestType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherKiltType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherKiltType1.v0.json new file mode 100644 index 000000000..f555f9230 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherKiltType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherKiltType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherKiltType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherKiltType2.v0.json new file mode 100644 index 000000000..c822eed5b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherKiltType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherKiltType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherLegsType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherLegsType1.v0.json new file mode 100644 index 000000000..f9fb60333 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherLegsType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherLegsType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherLegsType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherLegsType2.v0.json new file mode 100644 index 000000000..7cce95a7d --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherLegsType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherLegsType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishLeatherWingArmor.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishLeatherWingArmor.v0.json new file mode 100644 index 000000000..55ae5d2b6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishLeatherWingArmor.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishLeatherWingArmor" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GemmedCirclet.v0.json b/Projects/UOContent/Migrations/Server.Items.GemmedCirclet.v0.json new file mode 100644 index 000000000..b745c5d9b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GemmedCirclet.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GemmedCirclet" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Helmet.v0.json b/Projects/UOContent/Migrations/Server.Items.Helmet.v0.json new file mode 100644 index 000000000..dd0ab3840 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Helmet.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Helmet" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Holiday.BasePaintedMask.v0.json b/Projects/UOContent/Migrations/Server.Items.Holiday.BasePaintedMask.v0.json new file mode 100644 index 000000000..26abcf873 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Holiday.BasePaintedMask.v0.json @@ -0,0 +1,14 @@ +{ + "version": 0, + "type": "Server.Items.Holiday.BasePaintedMask", + "properties": [ + { + "name": "Staffer", + "type": "string", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "InternString" + ] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeafArms.v0.json b/Projects/UOContent/Migrations/Server.Items.LeafArms.v0.json new file mode 100644 index 000000000..ef3b0dc0e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeafArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeafArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeafChest.v0.json b/Projects/UOContent/Migrations/Server.Items.LeafChest.v0.json new file mode 100644 index 000000000..d9f311626 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeafChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeafChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeafGloves.v1.json b/Projects/UOContent/Migrations/Server.Items.LeafGloves.v1.json new file mode 100644 index 000000000..1c7bcd3af --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeafGloves.v1.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "type": "Server.Items.LeafGloves", + "properties": [ + { + "name": "CurArcaneCharges", + "type": "int", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "EncodedInt" + ] + }, + { + "name": "MaxArcaneCharges", + "type": "int", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "EncodedInt" + ] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeafGorget.v0.json b/Projects/UOContent/Migrations/Server.Items.LeafGorget.v0.json new file mode 100644 index 000000000..b0d90e3ca --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeafGorget.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeafGorget" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeafLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.LeafLegs.v0.json new file mode 100644 index 000000000..8ed15a7b7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeafLegs.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeafLegs" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeafTonlet.v0.json b/Projects/UOContent/Migrations/Server.Items.LeafTonlet.v0.json new file mode 100644 index 000000000..ac5440098 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeafTonlet.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeafTonlet" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherArms.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherArms.v0.json new file mode 100644 index 000000000..aa474c35d --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherBustierArms.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherBustierArms.v0.json new file mode 100644 index 000000000..d9fe19abb --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherBustierArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherBustierArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherCap.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherCap.v0.json new file mode 100644 index 000000000..c51eb334f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherCap.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherCap" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherChest.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherChest.v0.json new file mode 100644 index 000000000..9054ccdfd --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherDo.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherDo.v0.json new file mode 100644 index 000000000..b8b3b192e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherDo.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherDo" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherGloves.v0.json new file mode 100644 index 000000000..541bd62bb --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherGloves.v0.json @@ -0,0 +1,22 @@ +{ + "version": 0, + "type": "Server.Items.LeatherGloves", + "properties": [ + { + "name": "CurArcaneCharges", + "type": "int", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "EncodedInt" + ] + }, + { + "name": "MaxArcaneCharges", + "type": "int", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "EncodedInt" + ] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherGorget.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherGorget.v0.json new file mode 100644 index 000000000..cfc757531 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherGorget.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherGorget" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherHaidate.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherHaidate.v0.json new file mode 100644 index 000000000..208ad8c10 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherHaidate.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherHaidate" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherHiroSode.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherHiroSode.v0.json new file mode 100644 index 000000000..3dea70581 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherHiroSode.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherHiroSode" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherJingasa.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherJingasa.v0.json new file mode 100644 index 000000000..476fb60e0 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherJingasa.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherJingasa" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherLegs.v0.json new file mode 100644 index 000000000..1b6189d41 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherLegs.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherLegs" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherMempo.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherMempo.v0.json new file mode 100644 index 000000000..b33eaf790 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherMempo.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherMempo" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherNinjaHood.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaHood.v0.json new file mode 100644 index 000000000..a70e8f588 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaHood.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherNinjaHood" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherNinjaJacket.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaJacket.v0.json new file mode 100644 index 000000000..936e5fda9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaJacket.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherNinjaJacket" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherNinjaMitts.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaMitts.v0.json new file mode 100644 index 000000000..c7ac574dc --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaMitts.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherNinjaMitts" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherNinjaPants.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaPants.v0.json new file mode 100644 index 000000000..dc0156b82 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherNinjaPants.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherNinjaPants" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherShorts.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherShorts.v0.json new file mode 100644 index 000000000..d3e26f2b4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherShorts.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherShorts" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherSkirt.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherSkirt.v0.json new file mode 100644 index 000000000..6a7d5f522 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherSkirt.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherSkirt" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherSuneate.v0.json b/Projects/UOContent/Migrations/Server.Items.LeatherSuneate.v0.json new file mode 100644 index 000000000..66556a94d --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherSuneate.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LeatherSuneate" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LightOfWayGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.LightOfWayGlasses.v0.json new file mode 100644 index 000000000..52d64e914 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LightOfWayGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LightOfWayGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LyricalGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.LyricalGlasses.v0.json new file mode 100644 index 000000000..ba8bb5437 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LyricalGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LyricalGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.MaceShieldGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.MaceShieldGlasses.v0.json new file mode 100644 index 000000000..7fc767f89 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.MaceShieldGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.MaceShieldGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.MaritimeGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.MaritimeGlasses.v0.json new file mode 100644 index 000000000..199bf44e2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.MaritimeGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.MaritimeGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.NecromanticGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.NecromanticGlasses.v0.json new file mode 100644 index 000000000..049a67ec8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.NecromanticGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.NecromanticGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.NorseHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.NorseHelm.v0.json new file mode 100644 index 000000000..f7333a459 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.NorseHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.NorseHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.OrcHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.OrcHelm.v0.json new file mode 100644 index 000000000..640f08d83 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.OrcHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.OrcHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateHelm.v0.json new file mode 100644 index 000000000..50f781f09 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PoisonedGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.PoisonedGlasses.v0.json new file mode 100644 index 000000000..edb6cb0d1 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PoisonedGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PoisonedGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RavenHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.RavenHelm.v0.json new file mode 100644 index 000000000..8e5ce5049 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RavenHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RavenHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RoyalCirclet.v0.json b/Projects/UOContent/Migrations/Server.Items.RoyalCirclet.v0.json new file mode 100644 index 000000000..7c620af5b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RoyalCirclet.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RoyalCirclet" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TradeGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.TradeGlasses.v0.json new file mode 100644 index 000000000..0c9831770 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TradeGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.TradeGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TreasureTrinketGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.TreasureTrinketGlasses.v0.json new file mode 100644 index 000000000..069d0321a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TreasureTrinketGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.TreasureTrinketGlasses" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.VultureHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.VultureHelm.v0.json new file mode 100644 index 000000000..1a55ae147 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.VultureHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.VultureHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WingedHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.WingedHelm.v0.json new file mode 100644 index 000000000..deb6c1662 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WingedHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WingedHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WizardsGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.WizardsGlasses.v0.json new file mode 100644 index 000000000..2096dc52f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WizardsGlasses.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WizardsGlasses" +} \ No newline at end of file