diff --git a/Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs b/Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs index 6d4b26976..04921fc64 100644 --- a/Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs +++ b/Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs @@ -945,7 +945,7 @@ namespace Server.Engines.ConPVP ac.Delete(); } - Components.Clear(); + this.Clear(Components); // stairs AddComponent(new AddonComponent(0x74D), -1, +1, -5); diff --git a/Projects/UOContent/Engines/Harvest/Fishing.cs b/Projects/UOContent/Engines/Harvest/Fishing.cs index d9bf10cc2..a4847df90 100644 --- a/Projects/UOContent/Engines/Harvest/Fishing.cs +++ b/Projects/UOContent/Engines/Harvest/Fishing.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using Server.Engines.Quests; using Server.Engines.Quests.Collector; using Server.Items; diff --git a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs index 5b690e8ff..b990c2999 100644 --- a/Projects/UOContent/Items/Addons/AddonContainerComponent.cs +++ b/Projects/UOContent/Items/Addons/AddonContainerComponent.cs @@ -54,7 +54,7 @@ namespace Server.Items public override bool OnDragDrop(Mobile from, Item dropped) => _addon?.OnDragDrop(from, dropped) == true; - public override void OnDoubleClick(Mobile from) => _addon?.OnComponentUsed(this, @from); + public override void OnDoubleClick(Mobile from) => _addon?.OnComponentUsed(this, from); public override void OnLocationChange(Point3D old) { diff --git a/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs b/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs index a57d33ee3..6f417235e 100644 --- a/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs +++ b/Projects/UOContent/Items/Addons/ArcheryButteAddon.cs @@ -91,7 +91,7 @@ namespace Server.Items public void Fire(Mobile from) { - if (@from.Weapon is not BaseRanged bow) + if (from.Weapon is not BaseRanged bow) { SendLocalizedMessageTo(from, 500593); // You must practice with ranged weapons on this. return; diff --git a/Projects/UOContent/Items/Addons/BaseAddon.cs b/Projects/UOContent/Items/Addons/BaseAddon.cs index d5eb50dc0..592e5c012 100644 --- a/Projects/UOContent/Items/Addons/BaseAddon.cs +++ b/Projects/UOContent/Items/Addons/BaseAddon.cs @@ -138,7 +138,7 @@ namespace Server.Items return; } - Components.Add(c); + this.Add(Components, c); c.Addon = this; c.Offset = new Point3D(x, y, z); diff --git a/Projects/UOContent/Items/Addons/BaseAddonContainer.cs b/Projects/UOContent/Items/Addons/BaseAddonContainer.cs index 6c49d6d9a..e22080821 100644 --- a/Projects/UOContent/Items/Addons/BaseAddonContainer.cs +++ b/Projects/UOContent/Items/Addons/BaseAddonContainer.cs @@ -3,8 +3,11 @@ using Server.Multis; namespace Server.Items { - public abstract class BaseAddonContainer : BaseContainer, IChoppable, IAddon + [Serializable(1, false)] + public abstract partial class BaseAddonContainer : BaseContainer, IChoppable, IAddon { + [SerializableField(0, setter: "private")] + private List _components; private CraftResource m_Resource; public BaseAddonContainer(int itemID) : base(itemID) @@ -14,10 +17,6 @@ namespace Server.Items Components = new List(); } - public BaseAddonContainer(Serial serial) : base(serial) - { - } - public override bool DisplayWeight => false; [Hue, CommandProperty(AccessLevel.GameMaster)] @@ -41,6 +40,7 @@ namespace Server.Items } } + [SerializableField(1)] [CommandProperty(AccessLevel.GameMaster)] public CraftResource Resource { @@ -63,8 +63,6 @@ namespace Server.Items public virtual Point3D WallPosition => Point3D.Zero; public virtual BaseAddonContainerDeed Deed => null; - public List Components { get; private set; } - Item IAddon.Deed => Deed; public bool CouldFit(IPoint3D p, Map map) @@ -186,25 +184,16 @@ namespace Server.Items } } - public override void Serialize(IGenericWriter writer) + // Handles v0 with old Enum -> Int casting + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(0); // version - - writer.Write(Components); - writer.Write((int)m_Resource); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - Components = reader.ReadEntityList(); m_Resource = (CraftResource)reader.ReadInt(); + } + [AfterDeserialization] + private void AfterDeserialization() + { AddonComponent.ApplyLightTo(this); } @@ -223,7 +212,7 @@ namespace Server.Items return; } - Components.Add(c); + this.Add(Components, c); c.Addon = this; c.Offset = new Point3D(x, y, z); diff --git a/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs b/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs index 44f87566a..1c754d62e 100644 --- a/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs +++ b/Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs @@ -120,7 +120,7 @@ namespace Server.Items c.Delete(); } - addon.Components.Clear(); + addon.Clear(addon.Components); } else if (item is BaseAddonContainer addonContainer) { @@ -130,7 +130,7 @@ namespace Server.Items c.Delete(); } - addonContainer.Components.Clear(); + addonContainer.Clear(addonContainer.Components); } } } diff --git a/Projects/UOContent/Items/Resources/Blacksmithing/Ingots.cs b/Projects/UOContent/Items/Resources/Blacksmithing/Ingots.cs index 1291c619b..9931c0708 100644 --- a/Projects/UOContent/Items/Resources/Blacksmithing/Ingots.cs +++ b/Projects/UOContent/Items/Resources/Blacksmithing/Ingots.cs @@ -1,8 +1,12 @@ namespace Server.Items { - public abstract class BaseIngot : Item, ICommodity + [Serializable(2, false)] + public abstract partial class BaseIngot : Item, ICommodity { - private CraftResource m_Resource; + [InvalidateProperties] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + [SerializableField(0)] + private CraftResource _resource; public BaseIngot(CraftResource resource, int amount = 1) : base(0x1BF2) { @@ -10,22 +14,7 @@ namespace Server.Items Amount = amount; Hue = CraftResources.GetHue(resource); - m_Resource = resource; - } - - public BaseIngot(Serial serial) : base(serial) - { - } - - [CommandProperty(AccessLevel.GameMaster)] - public CraftResource Resource - { - get => m_Resource; - set - { - m_Resource = value; - InvalidateProperties(); - } + _resource = resource; } public override double DefaultWeight => 0.1; @@ -34,9 +23,9 @@ namespace Server.Items { get { - if (m_Resource >= CraftResource.DullCopper && m_Resource <= CraftResource.Valorite) + if (_resource >= CraftResource.DullCopper && _resource <= CraftResource.Valorite) { - return 1042684 + (m_Resource - CraftResource.DullCopper); + return 1042684 + (_resource - CraftResource.DullCopper); } return 1042692; @@ -46,26 +35,13 @@ namespace Server.Items int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write((int)m_Resource); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - switch (version) { case 1: { - m_Resource = (CraftResource)reader.ReadInt(); + _resource = (CraftResource)reader.ReadInt(); break; } case 0: @@ -84,7 +60,7 @@ namespace Server.Items _ => null }; - m_Resource = CraftResources.GetFromOreInfo(info); + _resource = CraftResources.GetFromOreInfo(info); break; } } @@ -106,9 +82,9 @@ namespace Server.Items { base.GetProperties(list); - if (!CraftResources.IsStandard(m_Resource)) + if (!CraftResources.IsStandard(_resource)) { - var num = CraftResources.GetLocalizationNumber(m_Resource); + var num = CraftResources.GetLocalizationNumber(_resource); if (num > 0) { @@ -116,252 +92,99 @@ namespace Server.Items } else { - list.Add(CraftResources.GetName(m_Resource)); + list.Add(CraftResources.GetName(_resource)); } } } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class IronIngot : BaseIngot + public partial class IronIngot : BaseIngot { [Constructible] public IronIngot(int amount = 1) : base(CraftResource.Iron, amount) { } - - public IronIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class DullCopperIngot : BaseIngot + public partial class DullCopperIngot : BaseIngot { [Constructible] public DullCopperIngot(int amount = 1) : base(CraftResource.DullCopper, amount) { } - - public DullCopperIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class ShadowIronIngot : BaseIngot + public partial class ShadowIronIngot : BaseIngot { [Constructible] public ShadowIronIngot(int amount = 1) : base(CraftResource.ShadowIron, amount) { } - - public ShadowIronIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class CopperIngot : BaseIngot + public partial class CopperIngot : BaseIngot { [Constructible] public CopperIngot(int amount = 1) : base(CraftResource.Copper, amount) { } - - public CopperIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class BronzeIngot : BaseIngot + public partial class BronzeIngot : BaseIngot { [Constructible] public BronzeIngot(int amount = 1) : base(CraftResource.Bronze, amount) { } - - public BronzeIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class GoldIngot : BaseIngot + public partial class GoldIngot : BaseIngot { [Constructible] public GoldIngot(int amount = 1) : base(CraftResource.Gold, amount) { } - - public GoldIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class AgapiteIngot : BaseIngot + public partial class AgapiteIngot : BaseIngot { [Constructible] public AgapiteIngot(int amount = 1) : base(CraftResource.Agapite, amount) { } - - public AgapiteIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class VeriteIngot : BaseIngot + public partial class VeriteIngot : BaseIngot { [Constructible] public VeriteIngot(int amount = 1) : base(CraftResource.Verite, amount) { } - - public VeriteIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1BF2, 0x1BEF)] - public class ValoriteIngot : BaseIngot + public partial class ValoriteIngot : BaseIngot { [Constructible] public ValoriteIngot(int amount = 1) : base(CraftResource.Valorite, amount) { } - - public ValoriteIngot(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs b/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs index 7a05fcc21..cb9729d75 100644 --- a/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs +++ b/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs @@ -4,7 +4,7 @@ using Server.Targeting; namespace Server.Items { - [Serializable(1, false)] + [Serializable(2, false)] public abstract partial class BaseOre : Item { public BaseOre(CraftResource resource, int amount = 1) : base(RandomSize()) @@ -38,21 +38,33 @@ namespace Server.Items private void Deserialize(IGenericReader reader, int version) { - var info = reader.ReadInt() switch + switch (version) { - 0 => OreInfo.Iron, - 1 => OreInfo.DullCopper, - 2 => OreInfo.ShadowIron, - 3 => OreInfo.Copper, - 4 => OreInfo.Bronze, - 5 => OreInfo.Gold, - 6 => OreInfo.Agapite, - 7 => OreInfo.Verite, - 8 => OreInfo.Valorite, - _ => null - }; + case 1: + { + _resource = (CraftResource)reader.ReadInt(); + break; + } + case 0: + { + var info = reader.ReadInt() switch + { + 0 => OreInfo.Iron, + 1 => OreInfo.DullCopper, + 2 => OreInfo.ShadowIron, + 3 => OreInfo.Copper, + 4 => OreInfo.Bronze, + 5 => OreInfo.Gold, + 6 => OreInfo.Agapite, + 7 => OreInfo.Verite, + 8 => OreInfo.Valorite, + _ => null + }; - Resource = CraftResources.GetFromOreInfo(info); + _resource = CraftResources.GetFromOreInfo(info); + break; + } + } } private static int RandomSize() => diff --git a/Projects/UOContent/Items/Resources/Fishing/BigFish.cs b/Projects/UOContent/Items/Resources/Fishing/BigFish.cs index 7ac00c89b..4d0e40ae3 100644 --- a/Projects/UOContent/Items/Resources/Fishing/BigFish.cs +++ b/Projects/UOContent/Items/Resources/Fishing/BigFish.cs @@ -2,35 +2,22 @@ using System; namespace Server.Items { - public class BigFish : Item, ICarvable + [Serializable(1, false)] + public partial class BigFish : Item, ICarvable { - private Mobile m_Fisher; + [InvalidateProperties] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + [SerializableField(0)] + private Mobile _fisher; [Constructible] public BigFish() : base(0x09CC) { - Weight = Utility.RandomMinMax( - 3, - 200 - ); // TODO: Find correct formula. max on OSI currently 200, OSI dev says it's not 200 as max, and ~ 1/1,000,000 chance to get highest + // TODO: Find correct formula. max on OSI currently 200, OSI dev says it's not 200 as max, and ~ 1/1,000,000 chance to get highest + Weight = Utility.RandomMinMax(3, 200); Hue = Utility.RandomBool() ? 0x847 : 0x58C; } - public BigFish(Serial serial) : base(serial) - { - } - - [CommandProperty(AccessLevel.GameMaster)] - public Mobile Fisher - { - get => m_Fisher; - set - { - m_Fisher = value; - InvalidateProperties(); - } - } - public override int LabelNumber => 1041112; // a big fish public void Carve(Mobile from, Item item) @@ -44,43 +31,18 @@ namespace Server.Items if (Weight >= 20) { - if (m_Fisher != null) + if (_fisher != null) { - list.Add(1070857, m_Fisher.Name); // Caught by ~1_fisherman~ + list.Add(1070857, _fisher.Name); // Caught by ~1_fisherman~ } list.Add(1070858, ((int)Weight).ToString()); // ~1_weight~ stones } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write(m_Fisher); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) - { - case 1: - { - m_Fisher = reader.ReadEntity(); - break; - } - case 0: - { - Weight = Utility.RandomMinMax(3, 200); - break; - } - } + Weight = Utility.RandomMinMax(3, 200); } } } diff --git a/Projects/UOContent/Items/Resources/Fishing/Fish.cs b/Projects/UOContent/Items/Resources/Fishing/Fish.cs index ac359bac8..a84a1f002 100644 --- a/Projects/UOContent/Items/Resources/Fishing/Fish.cs +++ b/Projects/UOContent/Items/Resources/Fishing/Fish.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class Fish : Item, ICarvable + [Serializable(0, false)] + public partial class Fish : Item, ICarvable { [Constructible] public Fish(int amount = 1) : base(Utility.Random(0x09CC, 4)) @@ -10,27 +11,9 @@ namespace Server.Items Amount = amount; } - public Fish(Serial serial) : base(serial) - { - } - public void Carve(Mobile from, Item item) { ScissorHelper(from, new RawFishSteak(), 4); } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs b/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs index c8beb3117..e64f6ddc0 100644 --- a/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs +++ b/Projects/UOContent/Items/Resources/Fishing/MagicFish.cs @@ -4,14 +4,11 @@ using Server.Spells; namespace Server.Items { - public abstract class BaseMagicFish : Item + [Serializable(0, false)] + public abstract partial class BaseMagicFish : Item { public BaseMagicFish(int hue) : base(0xDD6) => Hue = hue; - public BaseMagicFish(Serial serial) : base(serial) - { - } - public virtual int Bonus => 0; public virtual StatType Type => StatType.Str; @@ -43,141 +40,58 @@ namespace Server.Items Delete(); } } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class PrizedFish : BaseMagicFish + [Serializable(0, false)] + public partial class PrizedFish : BaseMagicFish { [Constructible] public PrizedFish() : base(51) { } - public PrizedFish(Serial serial) : base(serial) - { - } - public override int Bonus => 5; public override StatType Type => StatType.Int; public override int LabelNumber => 1041073; // prized fish - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (Hue == 151) - { - Hue = 51; - } - } } - public class WondrousFish : BaseMagicFish + [Serializable(0, false)] + public partial class WondrousFish : BaseMagicFish { [Constructible] public WondrousFish() : base(86) { } - public WondrousFish(Serial serial) : base(serial) - { - } - public override int Bonus => 5; public override StatType Type => StatType.Dex; public override int LabelNumber => 1041074; // wondrous fish - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (Hue == 286) - { - Hue = 86; - } - } } - public class TrulyRareFish : BaseMagicFish + [Serializable(0, false)] + public partial class TrulyRareFish : BaseMagicFish { [Constructible] public TrulyRareFish() : base(76) { } - public TrulyRareFish(Serial serial) : base(serial) - { - } - public override int Bonus => 5; public override StatType Type => StatType.Str; public override int LabelNumber => 1041075; // truly rare fish - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (Hue == 376) - { - Hue = 76; - } - } } - public class PeculiarFish : BaseMagicFish + [Serializable(0, false)] + public partial class PeculiarFish : BaseMagicFish { [Constructible] public PeculiarFish() : base(66) { } - public PeculiarFish(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1041076; // highly peculiar fish public override bool Apply(Mobile from) @@ -185,24 +99,5 @@ namespace Server.Items from.Stam += 10; return true; } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (Hue == 266) - { - Hue = 66; - } - } } } diff --git a/Projects/UOContent/Items/Resources/MiscMLResources.cs b/Projects/UOContent/Items/Resources/MiscMLResources.cs index c783a2740..a0c6d30b4 100644 --- a/Projects/UOContent/Items/Resources/MiscMLResources.cs +++ b/Projects/UOContent/Items/Resources/MiscMLResources.cs @@ -1,885 +1,384 @@ namespace Server.Items { - public class Blight : Item + [Serializable(0, false)] + public partial class Blight : Item { [Constructible] - public Blight(int amount = 1) - : base(0x3183) + public Blight(int amount = 1) : base(0x3183) { Stackable = true; Amount = amount; } - - public Blight(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class LuminescentFungi : Item + [Serializable(0, false)] + public partial class LuminescentFungi : Item { [Constructible] - public LuminescentFungi(int amount = 1) - : base(0x3191) + public LuminescentFungi(int amount = 1) : base(0x3191) { Stackable = true; Amount = amount; } - - public LuminescentFungi(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class CapturedEssence : Item + [Serializable(0, false)] + public partial class CapturedEssence : Item { [Constructible] - public CapturedEssence(int amount = 1) - : base(0x318E) + public CapturedEssence(int amount = 1) : base(0x318E) { Stackable = true; Amount = amount; } - - public CapturedEssence(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class EyeOfTheTravesty : Item + [Serializable(0, false)] + public partial class EyeOfTheTravesty : Item { [Constructible] - public EyeOfTheTravesty(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public EyeOfTheTravesty(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public EyeOfTheTravesty(int amount = 1) - : base(0x318D) + public EyeOfTheTravesty(int amount = 1) : base(0x318D) { Stackable = true; Amount = amount; } - - public EyeOfTheTravesty(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class Corruption : Item + [Serializable(0, false)] + public partial class Corruption : Item { [Constructible] - public Corruption(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public Corruption(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public Corruption(int amount = 1) - : base(0x3184) + public Corruption(int amount = 1) : base(0x3184) { Stackable = true; Amount = amount; } - - public Corruption(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class DreadHornMane : Item + [Serializable(0, false)] + public partial class DreadHornMane : Item { [Constructible] - public DreadHornMane(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public DreadHornMane(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public DreadHornMane(int amount = 1) - : base(0x318A) + public DreadHornMane(int amount = 1) : base(0x318A) { Stackable = true; Amount = amount; } - - public DreadHornMane(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class ParasiticPlant : Item + [Serializable(0, false)] + public partial class ParasiticPlant : Item { [Constructible] - public ParasiticPlant(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public ParasiticPlant(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public ParasiticPlant(int amount = 1) - : base(0x3190) + public ParasiticPlant(int amount = 1) : base(0x3190) { Stackable = true; Amount = amount; } - - public ParasiticPlant(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class Muculent : Item + [Serializable(0, false)] + public partial class Muculent : Item { [Constructible] - public Muculent(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public Muculent(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public Muculent(int amount = 1) - : base(0x3188) + public Muculent(int amount = 1) : base(0x3188) { Stackable = true; Amount = amount; } - - public Muculent(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class DiseasedBark : Item + [Serializable(0, false)] + public partial class DiseasedBark : Item { [Constructible] - public DiseasedBark(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public DiseasedBark(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public DiseasedBark(int amount = 1) - : base(0x318B) + public DiseasedBark(int amount = 1) : base(0x318B) { Stackable = true; Amount = amount; } - - public DiseasedBark(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class BarkFragment : Item + [Serializable(0, false)] + public partial class BarkFragment : Item { [Constructible] - public BarkFragment(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public BarkFragment(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public BarkFragment(int amount = 1) - : base(0x318F) + public BarkFragment(int amount = 1) : base(0x318F) { Stackable = true; Amount = amount; } - - public BarkFragment(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class GrizzledBones : Item + [Serializable(0, false)] + public partial class GrizzledBones : Item { [Constructible] - public GrizzledBones(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public GrizzledBones(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public GrizzledBones(int amount = 1) - : base(0x318C) + public GrizzledBones(int amount = 1) : base(0x318C) { Stackable = true; Amount = amount; } - - public GrizzledBones(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version <= 0 && ItemID == 0x318F) - { - ItemID = 0x318C; - } - } } - public class LardOfParoxysmus : Item + [Serializable(0, false)] + public partial class LardOfParoxysmus : Item { [Constructible] - public LardOfParoxysmus(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public LardOfParoxysmus(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public LardOfParoxysmus(int amount = 1) - : base(0x3189) + public LardOfParoxysmus(int amount = 1) : base(0x3189) { Stackable = true; Amount = amount; } - - public LardOfParoxysmus(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class PerfectEmerald : Item + [Serializable(0, false)] + public partial class PerfectEmerald : Item { [Constructible] - public PerfectEmerald(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public PerfectEmerald(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public PerfectEmerald(int amount = 1) - : base(0x3194) + public PerfectEmerald(int amount = 1) : base(0x3194) { Stackable = true; Amount = amount; } - - public PerfectEmerald(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class DarkSapphire : Item + [Serializable(0, false)] + public partial class DarkSapphire : Item { [Constructible] - public DarkSapphire(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public DarkSapphire(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public DarkSapphire(int amount = 1) - : base(0x3192) + public DarkSapphire(int amount = 1) : base(0x3192) { Stackable = true; Amount = amount; } - - public DarkSapphire(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class Turquoise : Item + [Serializable(0, false)] + public partial class Turquoise : Item { [Constructible] - public Turquoise(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public Turquoise(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public Turquoise(int amount = 1) - : base(0x3193) + public Turquoise(int amount = 1) : base(0x3193) { Stackable = true; Amount = amount; } - - public Turquoise(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class EcruCitrine : Item + [Serializable(0, false)] + public partial class EcruCitrine : Item { [Constructible] - public EcruCitrine(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public EcruCitrine(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public EcruCitrine(int amount = 1) - : base(0x3195) + public EcruCitrine(int amount = 1) : base(0x3195) { Stackable = true; Amount = amount; } - - public EcruCitrine(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class WhitePearl : Item + [Serializable(0, false)] + public partial class WhitePearl : Item { [Constructible] - public WhitePearl(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public WhitePearl(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public WhitePearl(int amount = 1) - : base(0x3196) + public WhitePearl(int amount = 1) : base(0x3196) { Stackable = true; Amount = amount; } - - public WhitePearl(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class FireRuby : Item + [Serializable(0, false)] + public partial class FireRuby : Item { [Constructible] - public FireRuby(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public FireRuby(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public FireRuby(int amount = 1) - : base(0x3197) + public FireRuby(int amount = 1) : base(0x3197) { Stackable = true; Amount = amount; } - - public FireRuby(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class BlueDiamond : Item + [Serializable(0, false)] + public partial class BlueDiamond : Item { [Constructible] - public BlueDiamond(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public BlueDiamond(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public BlueDiamond(int amount = 1) - : base(0x3198) + public BlueDiamond(int amount = 1) : base(0x3198) { Stackable = true; Amount = amount; } - - public BlueDiamond(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class BrilliantAmber : Item + [Serializable(0, false)] + public partial class BrilliantAmber : Item { [Constructible] - public BrilliantAmber(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public BrilliantAmber(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public BrilliantAmber(int amount = 1) - : base(0x3199) + public BrilliantAmber(int amount = 1) : base(0x3199) { Stackable = true; Amount = amount; } - - public BrilliantAmber(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class Scourge : Item + [Serializable(0, false)] + public partial class Scourge : Item { [Constructible] - public Scourge(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public Scourge(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public Scourge(int amount = 1) - : base(0x3185) + public Scourge(int amount = 1) : base(0x3185) { Stackable = true; Amount = amount; Hue = 150; } - - public Scourge(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class Putrefication : Item + [Serializable(0, false)] + public partial class Putrefication : Item { [Constructible] - public Putrefication(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public Putrefication(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public Putrefication(int amount = 1) - : base(0x3186) + public Putrefication(int amount = 1) : base(0x3186) { Stackable = true; Amount = amount; Hue = 883; } - - public Putrefication(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class Taint : Item + [Serializable(0, false)] + public partial class Taint : Item { [Constructible] - public Taint(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public Taint(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public Taint(int amount = 1) - : base(0x3187) + public Taint(int amount = 1) : base(0x3187) { Stackable = true; Amount = amount; Hue = 731; } - - public Taint(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x315A, 0x315B)] - public class PristineDreadHorn : Item + public partial class PristineDreadHorn : Item { [Constructible] - public PristineDreadHorn() - : base(0x315A) + public PristineDreadHorn() : base(0x315A) { } - - public PristineDreadHorn(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class SwitchItem : Item + [Serializable(0, false)] + public partial class SwitchItem : Item { [Constructible] - public SwitchItem(int amountFrom, int amountTo) - : this(Utility.RandomMinMax(amountFrom, amountTo)) + public SwitchItem(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo)) { } [Constructible] - public SwitchItem(int amount = 1) - : base(0x2F5F) + public SwitchItem(int amount = 1) : base(0x2F5F) { Stackable = true; Amount = amount; } - - public SwitchItem(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/BaseReagent.cs b/Projects/UOContent/Items/Resources/Reagents/BaseReagent.cs index e858e3532..66c5fb678 100644 --- a/Projects/UOContent/Items/Resources/Reagents/BaseReagent.cs +++ b/Projects/UOContent/Items/Resources/Reagents/BaseReagent.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public abstract class BaseReagent : Item + [Serializable(0, false)] + public abstract partial class BaseReagent : Item { public BaseReagent(int itemID, int amount = 1) : base(itemID) { @@ -8,24 +9,6 @@ namespace Server.Items Amount = amount; } - public BaseReagent(Serial serial) : base(serial) - { - } - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/BatWing.cs b/Projects/UOContent/Items/Resources/Reagents/BatWing.cs index 8b1893d2d..479c9bffb 100644 --- a/Projects/UOContent/Items/Resources/Reagents/BatWing.cs +++ b/Projects/UOContent/Items/Resources/Reagents/BatWing.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class BatWing : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class BatWing : BaseReagent, ICommodity { [Constructible] public BatWing(int amount = 1) : base(0xF78, amount) { } - public BatWing(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/BlackPearl.cs b/Projects/UOContent/Items/Resources/Reagents/BlackPearl.cs index c462c3cf0..7720c2cee 100644 --- a/Projects/UOContent/Items/Resources/Reagents/BlackPearl.cs +++ b/Projects/UOContent/Items/Resources/Reagents/BlackPearl.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class BlackPearl : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class BlackPearl : BaseReagent, ICommodity { [Constructible] public BlackPearl(int amount = 1) : base(0xF7A, amount) { } - public BlackPearl(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/Bloodmoss.cs b/Projects/UOContent/Items/Resources/Reagents/Bloodmoss.cs index 74d3ec81f..e3405f42b 100644 --- a/Projects/UOContent/Items/Resources/Reagents/Bloodmoss.cs +++ b/Projects/UOContent/Items/Resources/Reagents/Bloodmoss.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class Bloodmoss : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class Bloodmoss : BaseReagent, ICommodity { [Constructible] public Bloodmoss(int amount = 1) : base(0xF7B, amount) { } - public Bloodmoss(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/DaemonBlood.cs b/Projects/UOContent/Items/Resources/Reagents/DaemonBlood.cs index 3ccc1d810..6d49f0b42 100644 --- a/Projects/UOContent/Items/Resources/Reagents/DaemonBlood.cs +++ b/Projects/UOContent/Items/Resources/Reagents/DaemonBlood.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class DaemonBlood : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class DaemonBlood : BaseReagent, ICommodity { [Constructible] public DaemonBlood(int amount = 1) : base(0xF7D, amount) { } - public DaemonBlood(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/DaemonBone.cs b/Projects/UOContent/Items/Resources/Reagents/DaemonBone.cs index 614fb4b2d..8c9cc9ce6 100644 --- a/Projects/UOContent/Items/Resources/Reagents/DaemonBone.cs +++ b/Projects/UOContent/Items/Resources/Reagents/DaemonBone.cs @@ -1,31 +1,16 @@ namespace Server.Items { - // TODO: Commodity? - public class DaemonBone : BaseReagent + [Serializable(0, false)] + public partial class DaemonBone : BaseReagent, ICommodity { [Constructible] public DaemonBone(int amount = 1) : base(0xF80, amount) { } - public DaemonBone(Serial serial) : base(serial) - { - } - public override double DefaultWeight => 1.0; - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + int ICommodity.DescriptionNumber => LabelNumber; + bool ICommodity.IsDeedable => Core.ML; } } diff --git a/Projects/UOContent/Items/Resources/Reagents/DeadWood.cs b/Projects/UOContent/Items/Resources/Reagents/DeadWood.cs index c7127bb02..92036861d 100644 --- a/Projects/UOContent/Items/Resources/Reagents/DeadWood.cs +++ b/Projects/UOContent/Items/Resources/Reagents/DeadWood.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class DeadWood : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class DeadWood : BaseReagent, ICommodity { [Constructible] public DeadWood(int amount = 1) : base(0xF90, amount) { } - public DeadWood(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/DragonsBlood.cs b/Projects/UOContent/Items/Resources/Reagents/DragonsBlood.cs index b951df59c..4d07593b0 100644 --- a/Projects/UOContent/Items/Resources/Reagents/DragonsBlood.cs +++ b/Projects/UOContent/Items/Resources/Reagents/DragonsBlood.cs @@ -1,33 +1,14 @@ namespace Server.Items { - public class DragonsBlood : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class DragonsBlood : BaseReagent, ICommodity { [Constructible] - public DragonsBlood(int amount = 1) - : base(0x4077, amount) - { - } - - public DragonsBlood(Serial serial) - : base(serial) + public DragonsBlood(int amount = 1) : base(0x4077, amount) { } int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => Core.ML; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/Garlic.cs b/Projects/UOContent/Items/Resources/Reagents/Garlic.cs index ef91a6d60..35873ab76 100644 --- a/Projects/UOContent/Items/Resources/Reagents/Garlic.cs +++ b/Projects/UOContent/Items/Resources/Reagents/Garlic.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class Garlic : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class Garlic : BaseReagent, ICommodity { [Constructible] public Garlic(int amount = 1) : base(0xF84, amount) { } - public Garlic(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/Ginseng.cs b/Projects/UOContent/Items/Resources/Reagents/Ginseng.cs index d4dc2b09a..7fce79ee5 100644 --- a/Projects/UOContent/Items/Resources/Reagents/Ginseng.cs +++ b/Projects/UOContent/Items/Resources/Reagents/Ginseng.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class Ginseng : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class Ginseng : BaseReagent, ICommodity { [Constructible] public Ginseng(int amount = 1) : base(0xF85, amount) { } - public Ginseng(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/GraveDust.cs b/Projects/UOContent/Items/Resources/Reagents/GraveDust.cs index 814545f96..81a6c4872 100644 --- a/Projects/UOContent/Items/Resources/Reagents/GraveDust.cs +++ b/Projects/UOContent/Items/Resources/Reagents/GraveDust.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class GraveDust : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class GraveDust : BaseReagent, ICommodity { [Constructible] public GraveDust(int amount = 1) : base(0xF8F, amount) { } - public GraveDust(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/MandrakeRoot.cs b/Projects/UOContent/Items/Resources/Reagents/MandrakeRoot.cs index d4ce9fdff..4ad411c42 100644 --- a/Projects/UOContent/Items/Resources/Reagents/MandrakeRoot.cs +++ b/Projects/UOContent/Items/Resources/Reagents/MandrakeRoot.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class MandrakeRoot : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class MandrakeRoot : BaseReagent, ICommodity { [Constructible] public MandrakeRoot(int amount = 1) : base(0xF86, amount) { } - public MandrakeRoot(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/Nightshade.cs b/Projects/UOContent/Items/Resources/Reagents/Nightshade.cs index 55990693b..e5e5c8a28 100644 --- a/Projects/UOContent/Items/Resources/Reagents/Nightshade.cs +++ b/Projects/UOContent/Items/Resources/Reagents/Nightshade.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class Nightshade : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class Nightshade : BaseReagent, ICommodity { [Constructible] public Nightshade(int amount = 1) : base(0xF88, amount) { } - public Nightshade(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/NoxCrystal.cs b/Projects/UOContent/Items/Resources/Reagents/NoxCrystal.cs index 5a948d2d4..8cd02c9e9 100644 --- a/Projects/UOContent/Items/Resources/Reagents/NoxCrystal.cs +++ b/Projects/UOContent/Items/Resources/Reagents/NoxCrystal.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class NoxCrystal : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class NoxCrystal : BaseReagent, ICommodity { [Constructible] public NoxCrystal(int amount = 1) : base(0xF8E, amount) { } - public NoxCrystal(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/PigIron.cs b/Projects/UOContent/Items/Resources/Reagents/PigIron.cs index f5e570e99..46d818737 100644 --- a/Projects/UOContent/Items/Resources/Reagents/PigIron.cs +++ b/Projects/UOContent/Items/Resources/Reagents/PigIron.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class PigIron : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class PigIron : BaseReagent, ICommodity { [Constructible] public PigIron(int amount = 1) : base(0xF8A, amount) { } - public PigIron(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/SpidersSilk.cs b/Projects/UOContent/Items/Resources/Reagents/SpidersSilk.cs index c4dd8ea4b..d4b7754d2 100644 --- a/Projects/UOContent/Items/Resources/Reagents/SpidersSilk.cs +++ b/Projects/UOContent/Items/Resources/Reagents/SpidersSilk.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class SpidersSilk : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class SpidersSilk : BaseReagent, ICommodity { [Constructible] public SpidersSilk(int amount = 1) : base(0xF8D, amount) { } - public SpidersSilk(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Reagents/SulfurousAsh.cs b/Projects/UOContent/Items/Resources/Reagents/SulfurousAsh.cs index 4cceb2a87..34b178ebd 100644 --- a/Projects/UOContent/Items/Resources/Reagents/SulfurousAsh.cs +++ b/Projects/UOContent/Items/Resources/Reagents/SulfurousAsh.cs @@ -1,31 +1,14 @@ namespace Server.Items { - public class SulfurousAsh : BaseReagent, ICommodity + [Serializable(0, false)] + public partial class SulfurousAsh : BaseReagent, ICommodity { [Constructible] public SulfurousAsh(int amount = 1) : base(0xF8C, amount) { } - public SulfurousAsh(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Tailor/BoltOfCloth.cs b/Projects/UOContent/Items/Resources/Tailor/BoltOfCloth.cs index 3363c4741..857a8c7a0 100644 --- a/Projects/UOContent/Items/Resources/Tailor/BoltOfCloth.cs +++ b/Projects/UOContent/Items/Resources/Tailor/BoltOfCloth.cs @@ -2,8 +2,9 @@ using Server.Network; namespace Server.Items { + [Serializable(0, false)] [Flippable(0xF95, 0xF96, 0xF97, 0xF98, 0xF99, 0xF9A, 0xF9B, 0xF9C)] - public class BoltOfCloth : Item, IScissorable, IDyable, ICommodity + public partial class BoltOfCloth : Item, IScissorable, IDyable, ICommodity { [Constructible] public BoltOfCloth(int amount = 1) : base(0xF95) @@ -13,10 +14,6 @@ namespace Server.Items Amount = amount; } - public BoltOfCloth(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; @@ -44,20 +41,6 @@ namespace Server.Items return true; } - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnSingleClick(Mobile from) { var number = Amount == 1 ? 1049122 : 1049121; diff --git a/Projects/UOContent/Items/Resources/Tailor/Bone.cs b/Projects/UOContent/Items/Resources/Tailor/Bone.cs index 7abd07173..374aa0d66 100644 --- a/Projects/UOContent/Items/Resources/Tailor/Bone.cs +++ b/Projects/UOContent/Items/Resources/Tailor/Bone.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class Bone : Item, ICommodity + [Serializable(0, false)] + public partial class Bone : Item, ICommodity { [Constructible] public Bone(int amount = 1) : base(0xf7e) @@ -10,25 +11,7 @@ namespace Server.Items Weight = 1.0; } - public Bone(Serial serial) : base(serial) - { - } - int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Tailor/Cloth.cs b/Projects/UOContent/Items/Resources/Tailor/Cloth.cs index 998c7d3fb..d66970c29 100644 --- a/Projects/UOContent/Items/Resources/Tailor/Cloth.cs +++ b/Projects/UOContent/Items/Resources/Tailor/Cloth.cs @@ -2,8 +2,9 @@ using Server.Network; namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1766, 0x1768)] - public class Cloth : Item, IScissorable, IDyable, ICommodity + public partial class Cloth : Item, IScissorable, IDyable, ICommodity { [Constructible] public Cloth(int amount = 1) : base(0x1766) @@ -12,10 +13,6 @@ namespace Server.Items Amount = amount; } - public Cloth(Serial serial) : base(serial) - { - } - public override double DefaultWeight => 0.1; int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; @@ -44,20 +41,6 @@ namespace Server.Items return true; } - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnSingleClick(Mobile from) { var number = Amount == 1 ? 1049124 : 1049123; diff --git a/Projects/UOContent/Items/Resources/Tailor/Cotton.cs b/Projects/UOContent/Items/Resources/Tailor/Cotton.cs index 67f56ec98..886f1f3e3 100644 --- a/Projects/UOContent/Items/Resources/Tailor/Cotton.cs +++ b/Projects/UOContent/Items/Resources/Tailor/Cotton.cs @@ -2,7 +2,8 @@ using Server.Targeting; namespace Server.Items { - public class Cotton : Item, IDyable + [Serializable(0, false)] + public partial class Cotton : Item, IDyable { [Constructible] public Cotton(int amount = 1) : base(0xDF9) @@ -12,10 +13,6 @@ namespace Server.Items Amount = amount; } - public Cotton(Serial serial) : base(serial) - { - } - public bool Dye(Mobile from, DyeTub sender) { if (Deleted) @@ -28,20 +25,6 @@ namespace Server.Items return true; } - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnDoubleClick(Mobile from) { if (IsChildOf(from.Backpack)) @@ -84,25 +67,24 @@ namespace Server.Items wheel = component.Addon as ISpinningWheel; } - if (wheel is Item) + if (wheel is not Item) { - if (!m_Cotton.IsChildOf(from.Backpack)) - { - from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. - } - else if (wheel.Spinning) - { - from.SendLocalizedMessage(502656); // That spinning wheel is being used. - } - else - { - m_Cotton.Consume(); - wheel.BeginSpin(m_Cotton.OnSpun, from, m_Cotton.Hue); - } + from.SendLocalizedMessage(502658); // Use that on a spinning wheel. + return; + } + + if (!m_Cotton.IsChildOf(from.Backpack)) + { + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + } + else if (wheel.Spinning) + { + from.SendLocalizedMessage(502656); // That spinning wheel is being used. } else { - from.SendLocalizedMessage(502658); // Use that on a spinning wheel. + m_Cotton.Consume(); + wheel.BeginSpin(m_Cotton.OnSpun, from, m_Cotton.Hue); } } } diff --git a/Projects/UOContent/Items/Resources/Tailor/Flax.cs b/Projects/UOContent/Items/Resources/Tailor/Flax.cs index f6828cb94..a0e265caf 100644 --- a/Projects/UOContent/Items/Resources/Tailor/Flax.cs +++ b/Projects/UOContent/Items/Resources/Tailor/Flax.cs @@ -2,7 +2,8 @@ using Server.Targeting; namespace Server.Items { - public class Flax : Item + [Serializable(0, false)] + public partial class Flax : Item { [Constructible] public Flax(int amount = 1) : base(0x1A9C) @@ -12,24 +13,6 @@ namespace Server.Items Amount = amount; } - public Flax(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnDoubleClick(Mobile from) { if (IsChildOf(from.Backpack)) @@ -72,25 +55,24 @@ namespace Server.Items wheel = component.Addon as ISpinningWheel; } - if (wheel is Item) + if (wheel is not Item) { - if (!m_Flax.IsChildOf(from.Backpack)) - { - from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. - } - else if (wheel.Spinning) - { - from.SendLocalizedMessage(502656); // That spinning wheel is being used. - } - else - { - m_Flax.Consume(); - wheel.BeginSpin(m_Flax.OnSpun, from, m_Flax.Hue); - } + from.SendLocalizedMessage(502658); // Use that on a spinning wheel. + return; + } + + if (!m_Flax.IsChildOf(from.Backpack)) + { + from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. + } + else if (wheel.Spinning) + { + from.SendLocalizedMessage(502656); // That spinning wheel is being used. } else { - from.SendLocalizedMessage(502658); // Use that on a spinning wheel. + m_Flax.Consume(); + wheel.BeginSpin(m_Flax.OnSpun, from, m_Flax.Hue); } } } diff --git a/Projects/UOContent/Items/Resources/Tailor/Hides.cs b/Projects/UOContent/Items/Resources/Tailor/Hides.cs index f77a15b6d..e2b32e2f7 100644 --- a/Projects/UOContent/Items/Resources/Tailor/Hides.cs +++ b/Projects/UOContent/Items/Resources/Tailor/Hides.cs @@ -1,8 +1,12 @@ namespace Server.Items { - public abstract class BaseHides : Item, ICommodity + [Serializable(2, false)] + public abstract partial class BaseHides : Item, ICommodity { - private CraftResource m_Resource; + [InvalidateProperties] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + [SerializableField(0)] + private CraftResource _resource; public BaseHides(CraftResource resource, int amount = 1) : base(0x1079) { @@ -11,31 +15,16 @@ namespace Server.Items Amount = amount; Hue = CraftResources.GetHue(resource); - m_Resource = resource; - } - - public BaseHides(Serial serial) : base(serial) - { - } - - [CommandProperty(AccessLevel.GameMaster)] - public CraftResource Resource - { - get => m_Resource; - set - { - m_Resource = value; - InvalidateProperties(); - } + _resource = resource; } public override int LabelNumber { get { - if (m_Resource >= CraftResource.SpinedLeather && m_Resource <= CraftResource.BarbedLeather) + if (_resource >= CraftResource.SpinedLeather && _resource <= CraftResource.BarbedLeather) { - return 1049687 + (m_Resource - CraftResource.SpinedLeather); + return 1049687 + (_resource - CraftResource.SpinedLeather); } return 1047023; @@ -45,33 +34,20 @@ namespace Server.Items int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write((int)m_Resource); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - switch (version) { case 1: { - m_Resource = (CraftResource)reader.ReadInt(); + _resource = (CraftResource)reader.ReadInt(); break; } case 0: { var info = new OreInfo(reader.ReadInt(), reader.ReadInt(), reader.ReadString()); - m_Resource = CraftResources.GetFromOreInfo(info); + _resource = CraftResources.GetFromOreInfo(info); break; } } @@ -93,9 +69,9 @@ namespace Server.Items { base.GetProperties(list); - if (!CraftResources.IsStandard(m_Resource)) + if (!CraftResources.IsStandard(_resource)) { - var num = CraftResources.GetLocalizationNumber(m_Resource); + var num = CraftResources.GetLocalizationNumber(_resource); if (num > 0) { @@ -103,24 +79,21 @@ namespace Server.Items } else { - list.Add(CraftResources.GetName(m_Resource)); + list.Add(CraftResources.GetName(_resource)); } } } } + [Serializable(0, false)] [Flippable(0x1079, 0x1078)] - public class Hides : BaseHides, IScissorable + public partial class Hides : BaseHides, IScissorable { [Constructible] public Hides(int amount = 1) : base(CraftResource.RegularLeather, amount) { } - public Hides(Serial serial) : base(serial) - { - } - public bool Scissor(Mobile from, Scissors scissors) { if (Deleted || !from.CanSee(this)) @@ -138,34 +111,17 @@ namespace Server.Items return true; } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1079, 0x1078)] - public class SpinedHides : BaseHides, IScissorable + public partial class SpinedHides : BaseHides, IScissorable { [Constructible] public SpinedHides(int amount = 1) : base(CraftResource.SpinedLeather, amount) { } - public SpinedHides(Serial serial) : base(serial) - { - } - public bool Scissor(Mobile from, Scissors scissors) { if (Deleted || !from.CanSee(this)) @@ -183,34 +139,17 @@ namespace Server.Items return true; } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1079, 0x1078)] - public class HornedHides : BaseHides, IScissorable + public partial class HornedHides : BaseHides, IScissorable { [Constructible] public HornedHides(int amount = 1) : base(CraftResource.HornedLeather, amount) { } - public HornedHides(Serial serial) : base(serial) - { - } - public bool Scissor(Mobile from, Scissors scissors) { if (Deleted || !from.CanSee(this)) @@ -228,34 +167,17 @@ namespace Server.Items return true; } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1079, 0x1078)] - public class BarbedHides : BaseHides, IScissorable + public partial class BarbedHides : BaseHides, IScissorable { [Constructible] public BarbedHides(int amount = 1) : base(CraftResource.BarbedLeather, amount) { } - public BarbedHides(Serial serial) : base(serial) - { - } - public bool Scissor(Mobile from, Scissors scissors) { if (Deleted || !from.CanSee(this)) @@ -273,19 +195,5 @@ namespace Server.Items return true; } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Tailor/Leathers.cs b/Projects/UOContent/Items/Resources/Tailor/Leathers.cs index aeee3b360..2b616b4bb 100644 --- a/Projects/UOContent/Items/Resources/Tailor/Leathers.cs +++ b/Projects/UOContent/Items/Resources/Tailor/Leathers.cs @@ -1,8 +1,12 @@ namespace Server.Items { - public abstract class BaseLeather : Item, ICommodity + [Serializable(2, false)] + public abstract partial class BaseLeather : Item, ICommodity { - private CraftResource m_Resource; + [InvalidateProperties] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + [SerializableField(0)] + private CraftResource _resource; public BaseLeather(CraftResource resource, int amount = 1) : base(0x1081) { @@ -11,31 +15,16 @@ namespace Server.Items Amount = amount; Hue = CraftResources.GetHue(resource); - m_Resource = resource; - } - - public BaseLeather(Serial serial) : base(serial) - { - } - - [CommandProperty(AccessLevel.GameMaster)] - public CraftResource Resource - { - get => m_Resource; - set - { - m_Resource = value; - InvalidateProperties(); - } + _resource = resource; } public override int LabelNumber { get { - if (m_Resource >= CraftResource.SpinedLeather && m_Resource <= CraftResource.BarbedLeather) + if (_resource >= CraftResource.SpinedLeather && _resource <= CraftResource.BarbedLeather) { - return 1049684 + (m_Resource - CraftResource.SpinedLeather); + return 1049684 + (_resource - CraftResource.SpinedLeather); } return 1047022; @@ -45,33 +34,20 @@ namespace Server.Items int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write((int)m_Resource); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - switch (version) { case 1: { - m_Resource = (CraftResource)reader.ReadInt(); + _resource = (CraftResource)reader.ReadInt(); break; } case 0: { var info = new OreInfo(reader.ReadInt(), reader.ReadInt(), reader.ReadString()); - m_Resource = CraftResources.GetFromOreInfo(info); + _resource = CraftResources.GetFromOreInfo(info); break; } } @@ -93,9 +69,9 @@ namespace Server.Items { base.GetProperties(list); - if (!CraftResources.IsStandard(m_Resource)) + if (!CraftResources.IsStandard(_resource)) { - var num = CraftResources.GetLocalizationNumber(m_Resource); + var num = CraftResources.GetLocalizationNumber(_resource); if (num > 0) { @@ -103,117 +79,49 @@ namespace Server.Items } else { - list.Add(CraftResources.GetName(m_Resource)); + list.Add(CraftResources.GetName(_resource)); } } } } + [Serializable(0, false)] [Flippable(0x1081, 0x1082)] - public class Leather : BaseLeather + public partial class Leather : BaseLeather { [Constructible] public Leather(int amount = 1) : base(CraftResource.RegularLeather, amount) { } - - public Leather(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1081, 0x1082)] - public class SpinedLeather : BaseLeather + public partial class SpinedLeather : BaseLeather { [Constructible] public SpinedLeather(int amount = 1) : base(CraftResource.SpinedLeather, amount) { } - - public SpinedLeather(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1081, 0x1082)] - public class HornedLeather : BaseLeather + public partial class HornedLeather : BaseLeather { [Constructible] public HornedLeather(int amount = 1) : base(CraftResource.HornedLeather, amount) { } - - public HornedLeather(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } + [Serializable(0, false)] [Flippable(0x1081, 0x1082)] - public class BarbedLeather : BaseLeather + public partial class BarbedLeather : BaseLeather { [Constructible] public BarbedLeather(int amount = 1) : base(CraftResource.BarbedLeather, amount) { } - - public BarbedLeather(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Resources/Tailor/UncutCloth.cs b/Projects/UOContent/Items/Resources/Tailor/UncutCloth.cs index 78d97416b..3daf072b0 100644 --- a/Projects/UOContent/Items/Resources/Tailor/UncutCloth.cs +++ b/Projects/UOContent/Items/Resources/Tailor/UncutCloth.cs @@ -2,8 +2,9 @@ using Server.Network; namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1765, 0x1767)] - public class UncutCloth : Item, IScissorable, IDyable, ICommodity + public partial class UncutCloth : Item, IScissorable, IDyable, ICommodity { [Constructible] public UncutCloth(int amount = 1) : base(0x1767) @@ -12,10 +13,6 @@ namespace Server.Items Amount = amount; } - public UncutCloth(Serial serial) : base(serial) - { - } - public override double DefaultWeight => 0.1; int ICommodity.DescriptionNumber => LabelNumber; bool ICommodity.IsDeedable => true; @@ -44,20 +41,6 @@ namespace Server.Items return true; } - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnSingleClick(Mobile from) { var number = Amount == 1 ? 1049124 : 1049123; diff --git a/Projects/UOContent/Items/Resources/Tailor/Wool.cs b/Projects/UOContent/Items/Resources/Tailor/Wool.cs index 99c00e6ba..53437fd37 100644 --- a/Projects/UOContent/Items/Resources/Tailor/Wool.cs +++ b/Projects/UOContent/Items/Resources/Tailor/Wool.cs @@ -2,7 +2,8 @@ using Server.Targeting; namespace Server.Items { - public class Wool : Item, IDyable + [Serializable(0, false)] + public partial class Wool : Item, IDyable { [Constructible] public Wool(int amount = 1) : base(0xDF8) @@ -12,10 +13,6 @@ namespace Server.Items Amount = amount; } - public Wool(Serial serial) : base(serial) - { - } - public bool Dye(Mobile from, DyeTub sender) { if (Deleted) @@ -28,20 +25,6 @@ namespace Server.Items return true; } - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnDoubleClick(Mobile from) { if (IsChildOf(from.Backpack)) @@ -108,7 +91,8 @@ namespace Server.Items } } - public class TaintedWool : Wool + [Serializable(0, false)] + public partial class TaintedWool : Wool { [Constructible] public TaintedWool(int amount = 1) : base(0x101F) @@ -118,24 +102,6 @@ namespace Server.Items Amount = amount; } - public TaintedWool(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnSpun(ISpinningWheel wheel, Mobile from, int hue) { Item item = new DarkYarn(); diff --git a/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs b/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs index 427b1bb35..a644f9f3b 100644 --- a/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs +++ b/Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs @@ -2,7 +2,8 @@ using Server.Targeting; namespace Server.Items { - public abstract class BaseClothMaterial : Item, IDyable + [Serializable(0, false)] + public abstract partial class BaseClothMaterial : Item, IDyable { public BaseClothMaterial(int itemID, int amount = 1) : base(itemID) { @@ -11,10 +12,6 @@ namespace Server.Items Amount = amount; } - public BaseClothMaterial(Serial serial) : base(serial) - { - } - public bool Dye(Mobile from, DyeTub sender) { if (Deleted) @@ -27,20 +24,6 @@ namespace Server.Items return true; } - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void OnDoubleClick(Mobile from) { if (IsChildOf(from.Backpack)) @@ -108,107 +91,39 @@ namespace Server.Items } } - public class DarkYarn : BaseClothMaterial + [Serializable(0, false)] + public partial class DarkYarn : BaseClothMaterial { [Constructible] public DarkYarn(int amount = 1) : base(0xE1D, amount) { } - - public DarkYarn(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class LightYarn : BaseClothMaterial + [Serializable(0, false)] + public partial class LightYarn : BaseClothMaterial { [Constructible] public LightYarn(int amount = 1) : base(0xE1E, amount) { } - - public LightYarn(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class LightYarnUnraveled : BaseClothMaterial + [Serializable(0, false)] + public partial class LightYarnUnraveled : BaseClothMaterial { [Constructible] public LightYarnUnraveled(int amount = 1) : base(0xE1F, amount) { } - - public LightYarnUnraveled(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } - public class SpoolOfThread : BaseClothMaterial + [Serializable(0, false)] + public partial class SpoolOfThread : BaseClothMaterial { [Constructible] public SpoolOfThread(int amount = 1) : base(0xFA0, amount) { } - - public SpoolOfThread(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Skill Items/Lumberjack/Log.cs b/Projects/UOContent/Items/Skill Items/Lumberjack/Log.cs index 6400d84d5..f3b692cb9 100644 --- a/Projects/UOContent/Items/Skill Items/Lumberjack/Log.cs +++ b/Projects/UOContent/Items/Skill Items/Lumberjack/Log.cs @@ -1,9 +1,13 @@ namespace Server.Items { + [Serializable(2, false)] [Flippable(0x1bdd, 0x1be0)] - public class Log : Item, ICommodity, IAxe + public partial class Log : Item, ICommodity, IAxe { - private CraftResource m_Resource; + [InvalidateProperties] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + [SerializableField(0)] + private CraftResource _resource; [Constructible] public Log(int amount = 1) : this(CraftResource.RegularWood, amount) @@ -11,51 +15,26 @@ namespace Server.Items } [Constructible] - public Log(CraftResource resource) - : this(resource, 1) + public Log(CraftResource resource) : this(resource, 1) { } [Constructible] - public Log(CraftResource resource, int amount) - : base(0x1BDD) + public Log(CraftResource resource, int amount) : base(0x1BDD) { Stackable = true; Weight = 2.0; Amount = amount; - m_Resource = resource; + _resource = resource; Hue = CraftResources.GetHue(resource); } - public Log(Serial serial) : base(serial) - { - } + public virtual bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 0, new Board()); - [CommandProperty(AccessLevel.GameMaster)] - public CraftResource Resource - { - get => m_Resource; - set - { - m_Resource = value; - InvalidateProperties(); - } - } - - public virtual bool Axe(Mobile from, BaseAxe axe) - { - if (!TryCreateBoards(from, 0, new Board())) - { - return false; - } - - return true; - } - - int ICommodity.DescriptionNumber => CraftResources.IsStandard(m_Resource) + int ICommodity.DescriptionNumber => CraftResources.IsStandard(_resource) ? LabelNumber - : 1075062 + ((int)m_Resource - (int)CraftResource.RegularWood); + : 1075062 + ((int)_resource - (int)CraftResource.RegularWood); bool ICommodity.IsDeedable => true; @@ -63,9 +42,9 @@ namespace Server.Items { base.GetProperties(list); - if (!CraftResources.IsStandard(m_Resource)) + if (!CraftResources.IsStandard(_resource)) { - var num = CraftResources.GetLocalizationNumber(m_Resource); + var num = CraftResources.GetLocalizationNumber(_resource); if (num > 0) { @@ -73,39 +52,18 @@ namespace Server.Items } else { - list.Add(CraftResources.GetName(m_Resource)); + list.Add(CraftResources.GetName(_resource)); } } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write((int)m_Resource); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) + _resource = version switch { - case 1: - { - m_Resource = (CraftResource)reader.ReadInt(); - break; - } - } - - if (version == 0) - { - m_Resource = CraftResource.RegularWood; - } + 1 => (CraftResource)reader.ReadInt(), + _ => CraftResource.RegularWood + }; } public virtual bool TryCreateBoards(Mobile from, double skill, Item item) @@ -128,230 +86,69 @@ namespace Server.Items } } - public class HeartwoodLog : Log + [Serializable(0, false)] + public partial class HeartwoodLog : Log { [Constructible] - public HeartwoodLog(int amount = 1) - : base(CraftResource.Heartwood, amount) + public HeartwoodLog(int amount = 1) : base(CraftResource.Heartwood, amount) { } - public HeartwoodLog(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - - public override bool Axe(Mobile from, BaseAxe axe) - { - if (!TryCreateBoards(from, 100, new HeartwoodBoard())) - { - return false; - } - - return true; - } + public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 100, new HeartwoodBoard()); } - public class BloodwoodLog : Log + [Serializable(0, false)] + public partial class BloodwoodLog : Log { [Constructible] - public BloodwoodLog(int amount = 1) - : base(CraftResource.Bloodwood, amount) + public BloodwoodLog(int amount = 1) : base(CraftResource.Bloodwood, amount) { } - public BloodwoodLog(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - - public override bool Axe(Mobile from, BaseAxe axe) - { - if (!TryCreateBoards(from, 100, new BloodwoodBoard())) - { - return false; - } - - return true; - } + public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 100, new BloodwoodBoard()); } - public class FrostwoodLog : Log + [Serializable(0, false)] + public partial class FrostwoodLog : Log { [Constructible] - public FrostwoodLog(int amount = 1) - : base(CraftResource.Frostwood, amount) + public FrostwoodLog(int amount = 1) : base(CraftResource.Frostwood, amount) { } - public FrostwoodLog(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - - public override bool Axe(Mobile from, BaseAxe axe) - { - if (!TryCreateBoards(from, 100, new FrostwoodBoard())) - { - return false; - } - - return true; - } + public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 100, new FrostwoodBoard()); } - public class OakLog : Log + [Serializable(0, false)] + public partial class OakLog : Log { [Constructible] - public OakLog(int amount = 1) - : base(CraftResource.OakWood, amount) + public OakLog(int amount = 1) : base(CraftResource.OakWood, amount) { } - public OakLog(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - - public override bool Axe(Mobile from, BaseAxe axe) - { - if (!TryCreateBoards(from, 65, new OakBoard())) - { - return false; - } - - return true; - } + public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 65, new OakBoard()); } - public class AshLog : Log + [Serializable(0, false)] + public partial class AshLog : Log { [Constructible] - public AshLog(int amount = 1) - : base(CraftResource.AshWood, amount) + public AshLog(int amount = 1) : base(CraftResource.AshWood, amount) { } - public AshLog(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - - public override bool Axe(Mobile from, BaseAxe axe) - { - if (!TryCreateBoards(from, 80, new AshBoard())) - { - return false; - } - - return true; - } + public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 80, new AshBoard()); } - public class YewLog : Log + [Serializable(0, false)] + public partial class YewLog : Log { [Constructible] - public YewLog(int amount = 1) - : base(CraftResource.YewWood, amount) + public YewLog(int amount = 1) : base(CraftResource.YewWood, amount) { } - public YewLog(Serial serial) - : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - - public override bool Axe(Mobile from, BaseAxe axe) - { - if (!TryCreateBoards(from, 95, new YewBoard())) - { - return false; - } - - return true; - } + public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 95, new YewBoard()); } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlackDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlackDyeTub.cs index b966ced74..da621fd74 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlackDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlackDyeTub.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class BlackDyeTub : DyeTub + [Serializable(0, false)] + public partial class BlackDyeTub : DyeTub { [Constructible] public BlackDyeTub() @@ -8,23 +9,5 @@ namespace Server.Items Hue = DyedHue = 0x0001; Redyable = false; } - - public BlackDyeTub(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlazeDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlazeDyeTub.cs index d91430113..e59f8115c 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlazeDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlazeDyeTub.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class BlazeDyeTub : DyeTub + [Serializable(0, false)] + public partial class BlazeDyeTub : DyeTub { [Constructible] public BlazeDyeTub() @@ -8,23 +9,5 @@ namespace Server.Items Hue = DyedHue = 0x489; Redyable = false; } - - public BlazeDyeTub(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs index 40c228547..1f422cd94 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs @@ -11,20 +11,24 @@ namespace Server.Items bool Dye(Mobile from, DyeTub sender); } - public class DyeTub : Item, ISecurable + [Serializable(2, false)] + public partial class DyeTub : Item, ISecurable { - private int m_DyedHue; - private bool m_Redyable; + [SerializableField(0)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private SecureLevel _level; + + [SerializableField(1, isVirtual: true)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _redyable; + + private int _dyedHue; [Constructible] public DyeTub() : base(0xFAB) { Weight = 10.0; - m_Redyable = true; - } - - public DyeTub(Serial serial) : base(serial) - { + _redyable = true; } public virtual CustomHuePicker CustomHuePicker => null; @@ -39,22 +43,16 @@ namespace Server.Items public virtual bool AllowDyables => true; - [CommandProperty(AccessLevel.GameMaster)] - public virtual bool Redyable - { - get => m_Redyable; - set => m_Redyable = value; - } - + [SerializableField(2)] [CommandProperty(AccessLevel.GameMaster)] public int DyedHue { - get => m_DyedHue; + get => _dyedHue; set { - if (m_Redyable) + if (_redyable) { - m_DyedHue = value; + _dyedHue = value; Hue = value; } } @@ -69,26 +67,8 @@ namespace Server.Items // You can not dye that. public virtual int FailMessage => 1042083; - [CommandProperty(AccessLevel.GameMaster)] - public SecureLevel Level { get; set; } - - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write((int)Level); - writer.Write(m_Redyable); - writer.Write(m_DyedHue); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - switch (version) { case 1: @@ -98,8 +78,8 @@ namespace Server.Items } case 0: { - m_Redyable = reader.ReadBool(); - m_DyedHue = reader.ReadInt(); + _redyable = reader.ReadBool(); + _dyedHue = reader.ReadInt(); break; } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs index a3c95005b..4bab7dab3 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs @@ -2,27 +2,25 @@ using Server.Engines.VeteranRewards; namespace Server.Items { - public class FurnitureDyeTub : DyeTub, IRewardItem + [Serializable(1, false)] + public partial class FurnitureDyeTub : DyeTub, IRewardItem { + [SerializableField(0)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _isRewardItem; + [Constructible] public FurnitureDyeTub() => LootType = LootType.Blessed; - public FurnitureDyeTub(Serial serial) : base(serial) - { - } - public override bool AllowDyables => false; public override bool AllowFurniture => true; public override int TargetMessage => 501019; // Select the furniture to dye. public override int FailMessage => 501021; // That is not a piece of furniture. public override int LabelNumber => 1041246; // Furniture Dye Tub - [CommandProperty(AccessLevel.GameMaster)] - public bool IsRewardItem { get; set; } - public override void OnDoubleClick(Mobile from) { - if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) + if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) { return; } @@ -34,36 +32,14 @@ namespace Server.Items { base.GetProperties(list); - if (Core.ML && IsRewardItem) + if (Core.ML && _isRewardItem) { list.Add(1076217); // 1st Year Veteran Reward } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write(IsRewardItem); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) - { - case 1: - { - IsRewardItem = reader.ReadBool(); - break; - } - } - if (LootType == LootType.Regular) { LootType = LootType.Blessed; diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs index 4d0031ff6..a33ceb428 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs @@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards; namespace Server.Items { - public class LeatherDyeTub : DyeTub, IRewardItem + [Serializable(1, false)] + public partial class LeatherDyeTub : DyeTub, IRewardItem { + [SerializableField(0)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _isRewardItem; + [Constructible] public LeatherDyeTub() => LootType = LootType.Blessed; - public LeatherDyeTub(Serial serial) : base(serial) - { - } - public override bool AllowDyables => false; public override bool AllowLeather => true; public override int TargetMessage => 1042416; // Select the leather item to dye. @@ -18,12 +19,9 @@ namespace Server.Items public override int LabelNumber => 1041284; // Leather Dye Tub public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; - [CommandProperty(AccessLevel.GameMaster)] - public bool IsRewardItem { get; set; } - public override void OnDoubleClick(Mobile from) { - if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) + if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) { return; } @@ -35,34 +33,17 @@ namespace Server.Items { base.GetProperties(list); - if (Core.ML && IsRewardItem) + if (Core.ML && _isRewardItem) { list.Add(1076218); // 2nd Year Veteran Reward } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write(IsRewardItem); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) + if (LootType == LootType.Regular) { - case 1: - { - IsRewardItem = reader.ReadBool(); - break; - } + LootType = LootType.Blessed; } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs index 1bab8dc79..fb1b9d20a 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs @@ -1,31 +1,13 @@ namespace Server.Items { - public class MetallicClothDyetub : DyeTub + [Serializable(0, false)] + public partial class MetallicClothDyetub : DyeTub { [Constructible] public MetallicClothDyetub() => LootType = LootType.Blessed; - public MetallicClothDyetub(Serial serial) - : base(serial) - { - } - public override int LabelNumber => 1152920; // Metallic Cloth ... public override bool MetallicHues => true; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs index 72695282c..7b11c8fbb 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs @@ -1,15 +1,11 @@ namespace Server.Items { - public class MetallicLeatherDyeTub : LeatherDyeTub + [Serializable(0, false)] + public partial class MetallicLeatherDyeTub : LeatherDyeTub { [Constructible] public MetallicLeatherDyeTub() => LootType = LootType.Blessed; - public MetallicLeatherDyeTub(Serial serial) - : base(serial) - { - } - public override CustomHuePicker CustomHuePicker => null; public override int LabelNumber => 1153495; // Metallic Leather ... @@ -25,19 +21,5 @@ namespace Server.Items list.Add(1076221); // 5th Year Veteran Reward } } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs index fa5281102..d04d01ea9 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs @@ -2,8 +2,13 @@ using Server.Engines.VeteranRewards; namespace Server.Items { - public class RewardBlackDyeTub : DyeTub, IRewardItem + [Serializable(1, false)] + public partial class RewardBlackDyeTub : DyeTub, IRewardItem { + [SerializableField(0)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _isRewardItem; + [Constructible] public RewardBlackDyeTub() { @@ -12,18 +17,11 @@ namespace Server.Items LootType = LootType.Blessed; } - public RewardBlackDyeTub(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1006008; // Black Dye Tub - [CommandProperty(AccessLevel.GameMaster)] - public bool IsRewardItem { get; set; } - public override void OnDoubleClick(Mobile from) { - if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) + if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) { return; } @@ -35,34 +33,17 @@ namespace Server.Items { base.GetProperties(list); - if (Core.ML && IsRewardItem) + if (Core.ML && _isRewardItem) { list.Add(1076217); // 1st Year Veteran Reward } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write(IsRewardItem); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) + if (LootType == LootType.Regular) { - case 1: - { - IsRewardItem = reader.ReadBool(); - break; - } + LootType = LootType.Blessed; } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs index 99d26933c..7f04fe35a 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs @@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards; namespace Server.Items { - public class RunebookDyeTub : DyeTub, IRewardItem + [Serializable(1, false)] + public partial class RunebookDyeTub : DyeTub, IRewardItem { + [SerializableField(0)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _isRewardItem; + [Constructible] public RunebookDyeTub() => LootType = LootType.Blessed; - public RunebookDyeTub(Serial serial) : base(serial) - { - } - public override bool AllowDyables => false; public override bool AllowRunebooks => true; public override int TargetMessage => 1049774; // Target the runebook or runestone to dye @@ -18,12 +19,9 @@ namespace Server.Items public override int LabelNumber => 1049740; // Runebook Dye Tub public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; - [CommandProperty(AccessLevel.GameMaster)] - public bool IsRewardItem { get; set; } - public override void OnDoubleClick(Mobile from) { - if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) + if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) { return; } @@ -35,34 +33,17 @@ namespace Server.Items { base.GetProperties(list); - if (Core.ML && IsRewardItem) + if (Core.ML && _isRewardItem) { list.Add(1076220); // 4th Year Veteran Reward } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write(IsRewardItem); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) + if (LootType == LootType.Regular) { - case 1: - { - IsRewardItem = reader.ReadBool(); - break; - } + LootType = LootType.Blessed; } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs index b9fe86bf6..da2ca3921 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs @@ -2,24 +2,22 @@ using Server.Engines.VeteranRewards; namespace Server.Items { - public class SpecialDyeTub : DyeTub, IRewardItem + [Serializable(1, false)] + public partial class SpecialDyeTub : DyeTub, IRewardItem { + [SerializableField(0)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _isRewardItem; + [Constructible] public SpecialDyeTub() => LootType = LootType.Blessed; - public SpecialDyeTub(Serial serial) : base(serial) - { - } - public override CustomHuePicker CustomHuePicker => CustomHuePicker.SpecialDyeTub; public override int LabelNumber => 1041285; // Special Dye Tub - [CommandProperty(AccessLevel.GameMaster)] - public bool IsRewardItem { get; set; } - public override void OnDoubleClick(Mobile from) { - if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) + if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) { return; } @@ -31,34 +29,17 @@ namespace Server.Items { base.GetProperties(list); - if (Core.ML && IsRewardItem) + if (Core.ML && _isRewardItem) { list.Add(1076217); // 1st Year Veteran Reward } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write(IsRewardItem); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) + if (LootType == LootType.Regular) { - case 1: - { - IsRewardItem = reader.ReadBool(); - break; - } + LootType = LootType.Blessed; } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs index c04f763d0..4d5d53e05 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs @@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards; namespace Server.Items { - public class StatuetteDyeTub : DyeTub, IRewardItem + [Serializable(1, false)] + public partial class StatuetteDyeTub : DyeTub, IRewardItem { + [SerializableField(0)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _isRewardItem; + [Constructible] public StatuetteDyeTub() => LootType = LootType.Blessed; - public StatuetteDyeTub(Serial serial) : base(serial) - { - } - public override bool AllowDyables => false; public override bool AllowStatuettes => true; public override int TargetMessage => 1049777; // Target the statuette to dye @@ -18,12 +19,9 @@ namespace Server.Items public override int LabelNumber => 1049741; // Reward Statuette Dye Tub public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; - [CommandProperty(AccessLevel.GameMaster)] - public bool IsRewardItem { get; set; } - public override void OnDoubleClick(Mobile from) { - if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) + if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) { return; } @@ -35,34 +33,17 @@ namespace Server.Items { base.GetProperties(list); - if (Core.ML && IsRewardItem) + if (Core.ML && _isRewardItem) { list.Add(1076221); // 5th Year Veteran Reward } } - public override void Serialize(IGenericWriter writer) + private void Deserialize(IGenericReader reader, int version) { - base.Serialize(writer); - - writer.Write(1); // version - - writer.Write(IsRewardItem); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) + if (LootType == LootType.Regular) { - case 1: - { - IsRewardItem = reader.ReadBool(); - break; - } + LootType = LootType.Blessed; } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs index 401d431c8..6ea785a37 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs @@ -1,31 +1,13 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "uncommon" loot item */ { - public class WhiteClothDyeTub : DyeTub + [Serializable(0, false)] + public partial class WhiteClothDyeTub : DyeTub { [Constructible] public WhiteClothDyeTub() => DyedHue = Hue = 0x9C2; - public WhiteClothDyeTub(Serial serial) - : base(serial) - { - } - public override int LabelNumber => 1149984; // White Cloth Dye Tub public override bool Redyable => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs index 992da9822..504c680a1 100644 --- a/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs +++ b/Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class WhiteLeatherDyeTub : LeatherDyeTub /* OSI UO 13th anniv gift, from redeemable gift tickets */ + [Serializable(0, false)] + public partial class WhiteLeatherDyeTub : LeatherDyeTub /* OSI UO 13th anniv gift, from redeemable gift tickets */ { [Constructible] public WhiteLeatherDyeTub() @@ -9,27 +10,8 @@ namespace Server.Items LootType = LootType.Blessed; } - public WhiteLeatherDyeTub(Serial serial) - : base(serial) - { - } - public override int LabelNumber => 1149900; // White Leather Dye Tub public override bool Redyable => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Special/MiniHouses.cs b/Projects/UOContent/Items/Special/MiniHouses.cs index 660b06170..651f6d3f3 100644 --- a/Projects/UOContent/Items/Special/MiniHouses.cs +++ b/Projects/UOContent/Items/Special/MiniHouses.cs @@ -39,7 +39,7 @@ namespace Server.Items c.Delete(); } - Components.Clear(); + this.Clear(Components); var info = MiniHouseInfo.GetInfo(m_Type); diff --git a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastInnard.cs b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastInnard.cs index 6cd588a99..55dedab31 100644 --- a/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastInnard.cs +++ b/Projects/UOContent/Items/Special/Mutation Core/PlagueBeastInnard.cs @@ -130,10 +130,7 @@ namespace Server.Items null ); // * You rip the organ out of the plague beast's flesh * - if (Organ.Components.Contains(this)) - { - Organ.Components.Remove(this); - } + Organ.Remove(Organ.Components, this); Organ = null; from.PlaySound(0x1CA); diff --git a/Projects/UOContent/Migrations/Server.Accounting.Account.v2.json b/Projects/UOContent/Migrations/Server.Accounting.Account.v2.json index 4fee22b2e..57d421442 100644 --- a/Projects/UOContent/Migrations/Server.Accounting.Account.v2.json +++ b/Projects/UOContent/Migrations/Server.Accounting.Account.v2.json @@ -72,7 +72,8 @@ "ruleArguments": [ "", "Server.Accounting.AccountComment", - "SerializationMethodSignatureMigrationRule" + "SerializationMethodSignatureMigrationRule", + "" ] }, { @@ -82,7 +83,8 @@ "ruleArguments": [ "", "Server.Accounting.AccountTag", - "SerializationMethodSignatureMigrationRule" + "SerializationMethodSignatureMigrationRule", + "" ] }, { diff --git a/Projects/UOContent/Migrations/Server.Items.AgapiteIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.AgapiteIngot.v0.json new file mode 100644 index 000000000..21384e53a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.AgapiteIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.AgapiteIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.AshLog.v0.json b/Projects/UOContent/Migrations/Server.Items.AshLog.v0.json new file mode 100644 index 000000000..f415d8bcc --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.AshLog.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.AshLog", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BarbedHides.v0.json b/Projects/UOContent/Migrations/Server.Items.BarbedHides.v0.json new file mode 100644 index 000000000..ef0adb9c0 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BarbedHides.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BarbedHides", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BarbedLeather.v0.json b/Projects/UOContent/Migrations/Server.Items.BarbedLeather.v0.json new file mode 100644 index 000000000..1e7c510ef --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BarbedLeather.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BarbedLeather", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BarkFragment.v0.json b/Projects/UOContent/Migrations/Server.Items.BarkFragment.v0.json new file mode 100644 index 000000000..98a90d5b6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BarkFragment.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BarkFragment", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseAddonContainer.v1.json b/Projects/UOContent/Migrations/Server.Items.BaseAddonContainer.v1.json new file mode 100644 index 000000000..3f1f9b3aa --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseAddonContainer.v1.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "type": "Server.Items.BaseAddonContainer", + "properties": [ + { + "name": "Components", + "type": "System.Collections.Generic.List\u003CServer.Items.AddonContainerComponent\u003E", + "rule": "ListMigrationRule", + "ruleArguments": [ + "", + "Server.Items.AddonContainerComponent", + "SerializableInterfaceMigrationRule" + ] + }, + { + "name": "Resource", + "type": "Server.Items.CraftResource", + "rule": "EnumMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseClothMaterial.v0.json b/Projects/UOContent/Migrations/Server.Items.BaseClothMaterial.v0.json new file mode 100644 index 000000000..303c6d06c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseClothMaterial.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BaseClothMaterial", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseHides.v2.json b/Projects/UOContent/Migrations/Server.Items.BaseHides.v2.json new file mode 100644 index 000000000..e0d323b1a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseHides.v2.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "type": "Server.Items.BaseHides", + "properties": [ + { + "name": "Resource", + "type": "Server.Items.CraftResource", + "rule": "EnumMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseIngot.v2.json b/Projects/UOContent/Migrations/Server.Items.BaseIngot.v2.json new file mode 100644 index 000000000..c356536d7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseIngot.v2.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "type": "Server.Items.BaseIngot", + "properties": [ + { + "name": "Resource", + "type": "Server.Items.CraftResource", + "rule": "EnumMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseLeather.v2.json b/Projects/UOContent/Migrations/Server.Items.BaseLeather.v2.json new file mode 100644 index 000000000..31b8d76d6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseLeather.v2.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "type": "Server.Items.BaseLeather", + "properties": [ + { + "name": "Resource", + "type": "Server.Items.CraftResource", + "rule": "EnumMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseMagicFish.v0.json b/Projects/UOContent/Migrations/Server.Items.BaseMagicFish.v0.json new file mode 100644 index 000000000..ab30d7c97 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseMagicFish.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BaseMagicFish", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseOre.v1.json b/Projects/UOContent/Migrations/Server.Items.BaseOre.v2.json similarity index 92% rename from Projects/UOContent/Migrations/Server.Items.BaseOre.v1.json rename to Projects/UOContent/Migrations/Server.Items.BaseOre.v2.json index 45f20fef6..8f078d488 100644 --- a/Projects/UOContent/Migrations/Server.Items.BaseOre.v1.json +++ b/Projects/UOContent/Migrations/Server.Items.BaseOre.v2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "type": "Server.Items.BaseOre", "properties": [ { diff --git a/Projects/UOContent/Migrations/Server.Items.BaseReagent.v0.json b/Projects/UOContent/Migrations/Server.Items.BaseReagent.v0.json new file mode 100644 index 000000000..792a85185 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseReagent.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BaseReagent", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BatWing.v0.json b/Projects/UOContent/Migrations/Server.Items.BatWing.v0.json new file mode 100644 index 000000000..6bc0c2aa3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BatWing.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BatWing", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BigFish.v1.json b/Projects/UOContent/Migrations/Server.Items.BigFish.v1.json new file mode 100644 index 000000000..83addb269 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BigFish.v1.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "type": "Server.Items.BigFish", + "properties": [ + { + "name": "Fisher", + "type": "Server.Mobile", + "rule": "SerializableInterfaceMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BlackDyeTub.v0.json b/Projects/UOContent/Migrations/Server.Items.BlackDyeTub.v0.json new file mode 100644 index 000000000..2d36728c1 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BlackDyeTub.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BlackDyeTub", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BlackPearl.v0.json b/Projects/UOContent/Migrations/Server.Items.BlackPearl.v0.json new file mode 100644 index 000000000..0abd5e6e3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BlackPearl.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BlackPearl", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BlazeDyeTub.v0.json b/Projects/UOContent/Migrations/Server.Items.BlazeDyeTub.v0.json new file mode 100644 index 000000000..1b8e75f3b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BlazeDyeTub.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BlazeDyeTub", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Blight.v0.json b/Projects/UOContent/Migrations/Server.Items.Blight.v0.json new file mode 100644 index 000000000..77760cbc4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Blight.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Blight", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Bloodmoss.v0.json b/Projects/UOContent/Migrations/Server.Items.Bloodmoss.v0.json new file mode 100644 index 000000000..013c096d7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Bloodmoss.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Bloodmoss", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BloodwoodLog.v0.json b/Projects/UOContent/Migrations/Server.Items.BloodwoodLog.v0.json new file mode 100644 index 000000000..19b8ef216 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BloodwoodLog.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BloodwoodLog", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BlueDiamond.v0.json b/Projects/UOContent/Migrations/Server.Items.BlueDiamond.v0.json new file mode 100644 index 000000000..821b6baa8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BlueDiamond.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BlueDiamond", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BoltOfCloth.v0.json b/Projects/UOContent/Migrations/Server.Items.BoltOfCloth.v0.json new file mode 100644 index 000000000..28904a618 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BoltOfCloth.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BoltOfCloth", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Bone.v0.json b/Projects/UOContent/Migrations/Server.Items.Bone.v0.json new file mode 100644 index 000000000..38eed5525 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Bone.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Bone", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BrilliantAmber.v0.json b/Projects/UOContent/Migrations/Server.Items.BrilliantAmber.v0.json new file mode 100644 index 000000000..1faf2e6f5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BrilliantAmber.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BrilliantAmber", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BronzeIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.BronzeIngot.v0.json new file mode 100644 index 000000000..4f67af4d0 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BronzeIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BronzeIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.CapturedEssence.v0.json b/Projects/UOContent/Migrations/Server.Items.CapturedEssence.v0.json new file mode 100644 index 000000000..98c4746c7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.CapturedEssence.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.CapturedEssence", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Cloth.v0.json b/Projects/UOContent/Migrations/Server.Items.Cloth.v0.json new file mode 100644 index 000000000..018b5d514 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Cloth.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Cloth", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.CopperIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.CopperIngot.v0.json new file mode 100644 index 000000000..af5bfdd42 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.CopperIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.CopperIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Corruption.v0.json b/Projects/UOContent/Migrations/Server.Items.Corruption.v0.json new file mode 100644 index 000000000..6e3ac6338 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Corruption.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Corruption", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Cotton.v0.json b/Projects/UOContent/Migrations/Server.Items.Cotton.v0.json new file mode 100644 index 000000000..62aeb60a9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Cotton.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Cotton", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DaemonBlood.v0.json b/Projects/UOContent/Migrations/Server.Items.DaemonBlood.v0.json new file mode 100644 index 000000000..d9c64ed7b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DaemonBlood.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DaemonBlood", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DaemonBone.v0.json b/Projects/UOContent/Migrations/Server.Items.DaemonBone.v0.json new file mode 100644 index 000000000..9df4e5013 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DaemonBone.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DaemonBone", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DarkSapphire.v0.json b/Projects/UOContent/Migrations/Server.Items.DarkSapphire.v0.json new file mode 100644 index 000000000..a6249c813 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DarkSapphire.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DarkSapphire", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DarkYarn.v0.json b/Projects/UOContent/Migrations/Server.Items.DarkYarn.v0.json new file mode 100644 index 000000000..9132d506b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DarkYarn.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DarkYarn", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DeadWood.v0.json b/Projects/UOContent/Migrations/Server.Items.DeadWood.v0.json new file mode 100644 index 000000000..98fc9bba7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DeadWood.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DeadWood", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DiseasedBark.v0.json b/Projects/UOContent/Migrations/Server.Items.DiseasedBark.v0.json new file mode 100644 index 000000000..c2d4e2211 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DiseasedBark.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DiseasedBark", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DragonsBlood.v0.json b/Projects/UOContent/Migrations/Server.Items.DragonsBlood.v0.json new file mode 100644 index 000000000..bee4304d6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DragonsBlood.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DragonsBlood", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DreadHornMane.v0.json b/Projects/UOContent/Migrations/Server.Items.DreadHornMane.v0.json new file mode 100644 index 000000000..c62f91315 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DreadHornMane.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DreadHornMane", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DullCopperIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.DullCopperIngot.v0.json new file mode 100644 index 000000000..20890c361 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DullCopperIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DullCopperIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DyeTub.v2.json b/Projects/UOContent/Migrations/Server.Items.DyeTub.v2.json new file mode 100644 index 000000000..587f0ce6f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DyeTub.v2.json @@ -0,0 +1,24 @@ +{ + "version": 2, + "type": "Server.Items.DyeTub", + "properties": [ + { + "name": "Level", + "type": "Server.Multis.SecureLevel", + "rule": "EnumMigrationRule", + "ruleArguments": [] + }, + { + "name": "Redyable", + "type": "bool", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + }, + { + "name": "DyedHue", + "type": "int", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.EcruCitrine.v0.json b/Projects/UOContent/Migrations/Server.Items.EcruCitrine.v0.json new file mode 100644 index 000000000..3eb3d36a3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.EcruCitrine.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.EcruCitrine", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.EyeOfTheTravesty.v0.json b/Projects/UOContent/Migrations/Server.Items.EyeOfTheTravesty.v0.json new file mode 100644 index 000000000..3a2e2eb2f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.EyeOfTheTravesty.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.EyeOfTheTravesty", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FireRuby.v0.json b/Projects/UOContent/Migrations/Server.Items.FireRuby.v0.json new file mode 100644 index 000000000..779d9a548 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FireRuby.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.FireRuby", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Fish.v0.json b/Projects/UOContent/Migrations/Server.Items.Fish.v0.json new file mode 100644 index 000000000..190a74a2a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Fish.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Fish", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Flax.v0.json b/Projects/UOContent/Migrations/Server.Items.Flax.v0.json new file mode 100644 index 000000000..82b23472a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Flax.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Flax", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FrostwoodLog.v0.json b/Projects/UOContent/Migrations/Server.Items.FrostwoodLog.v0.json new file mode 100644 index 000000000..f1855d218 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FrostwoodLog.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.FrostwoodLog", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FurnitureDyeTub.v1.json b/Projects/UOContent/Migrations/Server.Items.FurnitureDyeTub.v1.json new file mode 100644 index 000000000..cc2e6a823 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FurnitureDyeTub.v1.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "type": "Server.Items.FurnitureDyeTub", + "properties": [ + { + "name": "IsRewardItem", + "type": "bool", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Garlic.v0.json b/Projects/UOContent/Migrations/Server.Items.Garlic.v0.json new file mode 100644 index 000000000..353929a2b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Garlic.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Garlic", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Ginseng.v0.json b/Projects/UOContent/Migrations/Server.Items.Ginseng.v0.json new file mode 100644 index 000000000..4d3f7adfd --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Ginseng.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Ginseng", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GoldIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.GoldIngot.v0.json new file mode 100644 index 000000000..600b111bf --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GoldIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.GoldIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GraveDust.v0.json b/Projects/UOContent/Migrations/Server.Items.GraveDust.v0.json new file mode 100644 index 000000000..15d2299ee --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GraveDust.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.GraveDust", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GrizzledBones.v0.json b/Projects/UOContent/Migrations/Server.Items.GrizzledBones.v0.json new file mode 100644 index 000000000..9273243a4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GrizzledBones.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.GrizzledBones", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HeartwoodLog.v0.json b/Projects/UOContent/Migrations/Server.Items.HeartwoodLog.v0.json new file mode 100644 index 000000000..cafbc2c8f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HeartwoodLog.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.HeartwoodLog", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Hides.v0.json b/Projects/UOContent/Migrations/Server.Items.Hides.v0.json new file mode 100644 index 000000000..bc199beba --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Hides.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Hides", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HornedHides.v0.json b/Projects/UOContent/Migrations/Server.Items.HornedHides.v0.json new file mode 100644 index 000000000..623eb5e82 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HornedHides.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.HornedHides", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HornedLeather.v0.json b/Projects/UOContent/Migrations/Server.Items.HornedLeather.v0.json new file mode 100644 index 000000000..f94c94626 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HornedLeather.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.HornedLeather", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.IronIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.IronIngot.v0.json new file mode 100644 index 000000000..a6d69ae0a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.IronIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.IronIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LardOfParoxysmus.v0.json b/Projects/UOContent/Migrations/Server.Items.LardOfParoxysmus.v0.json new file mode 100644 index 000000000..934ceec73 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LardOfParoxysmus.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.LardOfParoxysmus", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Leather.v0.json b/Projects/UOContent/Migrations/Server.Items.Leather.v0.json new file mode 100644 index 000000000..a74779a53 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Leather.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Leather", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeatherDyeTub.v1.json b/Projects/UOContent/Migrations/Server.Items.LeatherDyeTub.v1.json new file mode 100644 index 000000000..d608c49c1 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeatherDyeTub.v1.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "type": "Server.Items.LeatherDyeTub", + "properties": [ + { + "name": "IsRewardItem", + "type": "bool", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LightYarn.v0.json b/Projects/UOContent/Migrations/Server.Items.LightYarn.v0.json new file mode 100644 index 000000000..5546652d8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LightYarn.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.LightYarn", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LightYarnUnraveled.v0.json b/Projects/UOContent/Migrations/Server.Items.LightYarnUnraveled.v0.json new file mode 100644 index 000000000..03ed63482 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LightYarnUnraveled.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.LightYarnUnraveled", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LocalizedContainerComponent.v0.json b/Projects/UOContent/Migrations/Server.Items.LocalizedContainerComponent.v0.json new file mode 100644 index 000000000..7db612f9c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LocalizedContainerComponent.v0.json @@ -0,0 +1,12 @@ +{ + "version": 0, + "type": "Server.Items.LocalizedContainerComponent", + "properties": [ + { + "name": "Number", + "type": "int", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Log.v2.json b/Projects/UOContent/Migrations/Server.Items.Log.v2.json new file mode 100644 index 000000000..238bafea3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Log.v2.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "type": "Server.Items.Log", + "properties": [ + { + "name": "Resource", + "type": "Server.Items.CraftResource", + "rule": "EnumMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LuminescentFungi.v0.json b/Projects/UOContent/Migrations/Server.Items.LuminescentFungi.v0.json new file mode 100644 index 000000000..a2162a097 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LuminescentFungi.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.LuminescentFungi", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.MandrakeRoot.v0.json b/Projects/UOContent/Migrations/Server.Items.MandrakeRoot.v0.json new file mode 100644 index 000000000..de2356382 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.MandrakeRoot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.MandrakeRoot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.MetallicClothDyetub.v0.json b/Projects/UOContent/Migrations/Server.Items.MetallicClothDyetub.v0.json new file mode 100644 index 000000000..376f3494f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.MetallicClothDyetub.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.MetallicClothDyetub", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.MetallicLeatherDyeTub.v0.json b/Projects/UOContent/Migrations/Server.Items.MetallicLeatherDyeTub.v0.json new file mode 100644 index 000000000..11e328d51 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.MetallicLeatherDyeTub.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.MetallicLeatherDyeTub", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Muculent.v0.json b/Projects/UOContent/Migrations/Server.Items.Muculent.v0.json new file mode 100644 index 000000000..8d8e2b520 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Muculent.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Muculent", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Nightshade.v0.json b/Projects/UOContent/Migrations/Server.Items.Nightshade.v0.json new file mode 100644 index 000000000..3bff6c0ce --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Nightshade.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Nightshade", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.NoxCrystal.v0.json b/Projects/UOContent/Migrations/Server.Items.NoxCrystal.v0.json new file mode 100644 index 000000000..de69b03e6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.NoxCrystal.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.NoxCrystal", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.OakLog.v0.json b/Projects/UOContent/Migrations/Server.Items.OakLog.v0.json new file mode 100644 index 000000000..538fe04ff --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.OakLog.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.OakLog", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ParasiticPlant.v0.json b/Projects/UOContent/Migrations/Server.Items.ParasiticPlant.v0.json new file mode 100644 index 000000000..7fd50492e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ParasiticPlant.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ParasiticPlant", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PeculiarFish.v0.json b/Projects/UOContent/Migrations/Server.Items.PeculiarFish.v0.json new file mode 100644 index 000000000..c912970b6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PeculiarFish.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.PeculiarFish", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PerfectEmerald.v0.json b/Projects/UOContent/Migrations/Server.Items.PerfectEmerald.v0.json new file mode 100644 index 000000000..5d7507fb3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PerfectEmerald.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.PerfectEmerald", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PigIron.v0.json b/Projects/UOContent/Migrations/Server.Items.PigIron.v0.json new file mode 100644 index 000000000..38f37b85b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PigIron.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.PigIron", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PristineDreadHorn.v0.json b/Projects/UOContent/Migrations/Server.Items.PristineDreadHorn.v0.json new file mode 100644 index 000000000..c4dfd285c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PristineDreadHorn.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.PristineDreadHorn", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PrizedFish.v0.json b/Projects/UOContent/Migrations/Server.Items.PrizedFish.v0.json new file mode 100644 index 000000000..254f3e90f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PrizedFish.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.PrizedFish", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Putrefication.v0.json b/Projects/UOContent/Migrations/Server.Items.Putrefication.v0.json new file mode 100644 index 000000000..9c2597b4e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Putrefication.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Putrefication", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RewardBlackDyeTub.v1.json b/Projects/UOContent/Migrations/Server.Items.RewardBlackDyeTub.v1.json new file mode 100644 index 000000000..0323a0a12 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RewardBlackDyeTub.v1.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "type": "Server.Items.RewardBlackDyeTub", + "properties": [ + { + "name": "IsRewardItem", + "type": "bool", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RunebookDyeTub.v1.json b/Projects/UOContent/Migrations/Server.Items.RunebookDyeTub.v1.json new file mode 100644 index 000000000..a46bc747c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RunebookDyeTub.v1.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "type": "Server.Items.RunebookDyeTub", + "properties": [ + { + "name": "IsRewardItem", + "type": "bool", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Scourge.v0.json b/Projects/UOContent/Migrations/Server.Items.Scourge.v0.json new file mode 100644 index 000000000..410b23111 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Scourge.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Scourge", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ShadowIronIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.ShadowIronIngot.v0.json new file mode 100644 index 000000000..69c309522 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ShadowIronIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ShadowIronIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SpecialDyeTub.v1.json b/Projects/UOContent/Migrations/Server.Items.SpecialDyeTub.v1.json new file mode 100644 index 000000000..491360e30 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SpecialDyeTub.v1.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "type": "Server.Items.SpecialDyeTub", + "properties": [ + { + "name": "IsRewardItem", + "type": "bool", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SpidersSilk.v0.json b/Projects/UOContent/Migrations/Server.Items.SpidersSilk.v0.json new file mode 100644 index 000000000..2ec20a945 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SpidersSilk.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SpidersSilk", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SpinedHides.v0.json b/Projects/UOContent/Migrations/Server.Items.SpinedHides.v0.json new file mode 100644 index 000000000..50fae11c5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SpinedHides.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SpinedHides", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SpinedLeather.v0.json b/Projects/UOContent/Migrations/Server.Items.SpinedLeather.v0.json new file mode 100644 index 000000000..8321e2641 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SpinedLeather.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SpinedLeather", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SpoolOfThread.v0.json b/Projects/UOContent/Migrations/Server.Items.SpoolOfThread.v0.json new file mode 100644 index 000000000..308073e26 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SpoolOfThread.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SpoolOfThread", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StatuetteDyeTub.v1.json b/Projects/UOContent/Migrations/Server.Items.StatuetteDyeTub.v1.json new file mode 100644 index 000000000..74139be8c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StatuetteDyeTub.v1.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "type": "Server.Items.StatuetteDyeTub", + "properties": [ + { + "name": "IsRewardItem", + "type": "bool", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SulfurousAsh.v0.json b/Projects/UOContent/Migrations/Server.Items.SulfurousAsh.v0.json new file mode 100644 index 000000000..a36caf6a4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SulfurousAsh.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SulfurousAsh", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SwitchItem.v0.json b/Projects/UOContent/Migrations/Server.Items.SwitchItem.v0.json new file mode 100644 index 000000000..500827f65 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SwitchItem.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SwitchItem", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Taint.v0.json b/Projects/UOContent/Migrations/Server.Items.Taint.v0.json new file mode 100644 index 000000000..da2f97459 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Taint.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Taint", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TaintedWool.v0.json b/Projects/UOContent/Migrations/Server.Items.TaintedWool.v0.json new file mode 100644 index 000000000..859d4fdcb --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TaintedWool.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.TaintedWool", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TrulyRareFish.v0.json b/Projects/UOContent/Migrations/Server.Items.TrulyRareFish.v0.json new file mode 100644 index 000000000..4dcba5ed7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TrulyRareFish.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.TrulyRareFish", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Turquoise.v0.json b/Projects/UOContent/Migrations/Server.Items.Turquoise.v0.json new file mode 100644 index 000000000..e00830e65 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Turquoise.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Turquoise", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.UncutCloth.v0.json b/Projects/UOContent/Migrations/Server.Items.UncutCloth.v0.json new file mode 100644 index 000000000..970c0ab72 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.UncutCloth.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.UncutCloth", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ValoriteIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.ValoriteIngot.v0.json new file mode 100644 index 000000000..14ce52927 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ValoriteIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ValoriteIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.VeriteIngot.v0.json b/Projects/UOContent/Migrations/Server.Items.VeriteIngot.v0.json new file mode 100644 index 000000000..d0035290c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.VeriteIngot.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.VeriteIngot", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WhiteClothDyeTub.v0.json b/Projects/UOContent/Migrations/Server.Items.WhiteClothDyeTub.v0.json new file mode 100644 index 000000000..f6dae666b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WhiteClothDyeTub.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.WhiteClothDyeTub", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WhiteLeatherDyeTub.v0.json b/Projects/UOContent/Migrations/Server.Items.WhiteLeatherDyeTub.v0.json new file mode 100644 index 000000000..3c9c12f69 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WhiteLeatherDyeTub.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.WhiteLeatherDyeTub", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WhitePearl.v0.json b/Projects/UOContent/Migrations/Server.Items.WhitePearl.v0.json new file mode 100644 index 000000000..ddfbac966 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WhitePearl.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.WhitePearl", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WondrousFish.v0.json b/Projects/UOContent/Migrations/Server.Items.WondrousFish.v0.json new file mode 100644 index 000000000..b637db13a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WondrousFish.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.WondrousFish", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Wool.v0.json b/Projects/UOContent/Migrations/Server.Items.Wool.v0.json new file mode 100644 index 000000000..30ae7ce42 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Wool.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.Wool", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.YewLog.v0.json b/Projects/UOContent/Migrations/Server.Items.YewLog.v0.json new file mode 100644 index 000000000..d0ca9ef43 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.YewLog.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.YewLog", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Misc/Cleanup.cs b/Projects/UOContent/Misc/Cleanup.cs index 4f49bf30f..5678ab851 100644 --- a/Projects/UOContent/Misc/Cleanup.cs +++ b/Projects/UOContent/Misc/Cleanup.cs @@ -76,7 +76,7 @@ namespace Server.Misc continue; } - else if (item.Layer == Layer.Hair || item.Layer == Layer.FacialHair) + else if (item.Layer is Layer.Hair or Layer.FacialHair) { if (item.RootParent is Mobile rootMobile) { @@ -159,36 +159,13 @@ namespace Server.Misc return false; } - if (item is ICommodity || item is BaseBoat - || item is Fish || item is BigFish || item is Food || item is CookableFood - || item is SpecialFishingNet || item is BaseMagicFish - || item is Shoes || item is Sandals - || item is Boots || item is ThighBoots - || item is TreasureMap || item is MessageInABottle - || item is BaseArmor || item is BaseWeapon - || item is BaseClothing - || item is BaseJewel && Core.AOS || item is SkullPole - || item is EvilIdolSkull - || item is MonsterStatuette - || item is Pier - || item is ArtifactLargeVase - || item is ArtifactVase - || item is MinotaurStatueDeed - || item is SwampTile - || item is WallBlood - || item is TatteredAncientMummyWrapping - || item is LavaTile - || item is DemonSkull - || item is Web - || item is WaterTile - || item is WindSpirit - || item is DirtPatch - || item is Futon) - { - return true; - } - - return false; + return item is BaseJewel && Core.AOS || + item is ICommodity or BaseBoat or Fish or BigFish or Food or CookableFood or SpecialFishingNet or + BaseMagicFish or Shoes or Sandals or Boots or ThighBoots or TreasureMap or MessageInABottle or + BaseArmor or BaseWeapon or BaseClothing or SkullPole or EvilIdolSkull or MonsterStatuette or Pier or + ArtifactLargeVase or ArtifactVase or MinotaurStatueDeed or SwampTile or WallBlood or + TatteredAncientMummyWrapping or LavaTile or DemonSkull or Web or WaterTile or WindSpirit or DirtPatch + or Futon; } } }