diff --git a/Projects/UOContent/Items/Addons/ElvenStoveSouthAddon.cs b/Projects/UOContent/Items/Addons/ElvenStoveSouthAddon.cs index 5da4b9190..d63db83fe 100644 --- a/Projects/UOContent/Items/Addons/ElvenStoveSouthAddon.cs +++ b/Projects/UOContent/Items/Addons/ElvenStoveSouthAddon.cs @@ -12,17 +12,14 @@ namespace Server.Items public override BaseAddonDeed Deed => new ElvenStoveSouthDeed(); } - public class ElvenStoveSouthDeed : BaseAddonDeed + [Serializable(0)] + public partial class ElvenStoveSouthDeed : BaseAddonDeed { [Constructible] public ElvenStoveSouthDeed() { } - public ElvenStoveSouthDeed(Serial serial) : base(serial) - { - } - public override BaseAddon Addon => new ElvenStoveSouthAddon(); public override int LabelNumber => 1073394; // elven oven (south) } diff --git a/Projects/UOContent/Items/Addons/ElvenWashbasinEastAddon.cs b/Projects/UOContent/Items/Addons/ElvenWashbasinEastAddon.cs index 472a62210..cac9d9ff5 100644 --- a/Projects/UOContent/Items/Addons/ElvenWashbasinEastAddon.cs +++ b/Projects/UOContent/Items/Addons/ElvenWashbasinEastAddon.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class ElvenWashBasinEastAddon : BaseAddon + [Serializable(0)] + public partial class ElvenWashBasinEastAddon : BaseAddon { [Constructible] public ElvenWashBasinEastAddon() @@ -9,29 +10,18 @@ namespace Server.Items AddComponent(new AddonComponent(0x30E0), 0, 1, 0); } - public ElvenWashBasinEastAddon(Serial serial) : base(serial) - { - } - public override BaseAddonDeed Deed => new ElvenWashBasinEastDeed(); - - } - public class ElvenWashBasinEastDeed : BaseAddonDeed + [Serializable(0)] + public partial class ElvenWashBasinEastDeed : BaseAddonDeed { [Constructible] public ElvenWashBasinEastDeed() { } - public ElvenWashBasinEastDeed(Serial serial) : base(serial) - { - } - public override BaseAddon Addon => new ElvenWashBasinEastAddon(); public override int LabelNumber => 1073387; // elven wash basin (east) - - } } diff --git a/Projects/UOContent/Items/Addons/ElvenWashbasinSouthAddon.cs b/Projects/UOContent/Items/Addons/ElvenWashbasinSouthAddon.cs index 344e7cc74..2387bc2e8 100644 --- a/Projects/UOContent/Items/Addons/ElvenWashbasinSouthAddon.cs +++ b/Projects/UOContent/Items/Addons/ElvenWashbasinSouthAddon.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class ElvenWashBasinSouthAddon : BaseAddon + [Serializable(0)] + public partial class ElvenWashBasinSouthAddon : BaseAddon { [Constructible] public ElvenWashBasinSouthAddon() @@ -9,29 +10,18 @@ namespace Server.Items AddComponent(new AddonComponent(0x30E2), 1, 0, 0); } - public ElvenWashBasinSouthAddon(Serial serial) : base(serial) - { - } - public override BaseAddonDeed Deed => new ElvenWashBasinSouthDeed(); - - } - public class ElvenWashBasinSouthDeed : BaseAddonDeed + [Serializable(0)] + public partial class ElvenWashBasinSouthDeed : BaseAddonDeed { [Constructible] public ElvenWashBasinSouthDeed() { } - public ElvenWashBasinSouthDeed(Serial serial) : base(serial) - { - } - public override BaseAddon Addon => new ElvenWashBasinSouthAddon(); public override int LabelNumber => 1072865; // elven wash basin (south) - - } } diff --git a/Projects/UOContent/Items/Addons/FancyElvenTableEastAddon.cs b/Projects/UOContent/Items/Addons/FancyElvenTableEastAddon.cs index 555ab5034..e31e67f22 100644 --- a/Projects/UOContent/Items/Addons/FancyElvenTableEastAddon.cs +++ b/Projects/UOContent/Items/Addons/FancyElvenTableEastAddon.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class FancyElvenTableEastAddon : BaseAddon + [Serializable(0)] + public partial class FancyElvenTableEastAddon : BaseAddon { [Constructible] public FancyElvenTableEastAddon() @@ -10,29 +11,18 @@ namespace Server.Items AddComponent(new AddonComponent(0x3092), 1, 0, 0); } - public FancyElvenTableEastAddon(Serial serial) : base(serial) - { - } - public override BaseAddonDeed Deed => new FancyElvenTableEastDeed(); - - } - public class FancyElvenTableEastDeed : BaseAddonDeed + [Serializable(0)] + public partial class FancyElvenTableEastDeed : BaseAddonDeed { [Constructible] public FancyElvenTableEastDeed() { } - public FancyElvenTableEastDeed(Serial serial) : base(serial) - { - } - public override BaseAddon Addon => new FancyElvenTableEastAddon(); public override int LabelNumber => 1073386; // hardwood table (east) - - } } diff --git a/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs b/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs index 4191d3b9d..b729fd392 100644 --- a/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs +++ b/Projects/UOContent/Items/Addons/FlourMillEastAddon.cs @@ -16,7 +16,7 @@ namespace Server.Items Working } - [Serializable(1, false)] + [Serializable(0, false)] public partial class FlourMillEastAddon : BaseAddon, IFlourMill { private static readonly int[][] m_StageTable = @@ -164,10 +164,6 @@ namespace Server.Items } } - private void Deserialize(IGenericReader reader, int version) - { - } - [AfterDeserialization] private void AfterDeserialization() { diff --git a/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs b/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs index 2eabf8481..f5bb4ab63 100644 --- a/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs +++ b/Projects/UOContent/Items/Addons/FlourMillSouthAddon.cs @@ -3,7 +3,7 @@ using Server.Network; namespace Server.Items { - [Serializable(1, false)] + [Serializable(0, false)] public partial class FlourMillSouthAddon : BaseAddon, IFlourMill { private static readonly int[][] m_StageTable = @@ -13,7 +13,7 @@ namespace Server.Items new[] { 0x1930, 0x1930, 0x1934 } }; - private int m_Flour; + private int _flour; [Constructible] public FlourMillSouthAddon() @@ -26,10 +26,10 @@ namespace Server.Items public override BaseAddonDeed Deed => new FlourMillSouthDeed(); [CommandProperty(AccessLevel.GameMaster)] - public bool HasFlour => m_Flour > 0; + public bool HasFlour => _flour > 0; [CommandProperty(AccessLevel.GameMaster)] - public bool IsFull => m_Flour >= MaxFlour; + public bool IsFull => _flour >= MaxFlour; [CommandProperty(AccessLevel.GameMaster)] public bool IsWorking { get; private set; } @@ -37,13 +37,14 @@ namespace Server.Items [CommandProperty(AccessLevel.GameMaster)] public int MaxFlour => 2; + [SerializableField(0)] [CommandProperty(AccessLevel.GameMaster)] public int CurFlour { - get => m_Flour; + get => _flour; set { - m_Flour = Math.Max(0, Math.Min(value, MaxFlour)); + _flour = Math.Max(0, Math.Min(value, MaxFlour)); UpdateStage(); } } @@ -72,7 +73,7 @@ namespace Server.Items if (from.PlaceInBackpack(flour)) { - m_Flour = 0; + _flour = 0; } else { @@ -151,10 +152,6 @@ namespace Server.Items } } - private void Deserialize(IGenericReader reader, int version) - { - } - [AfterDeserialization] private void AfterDeserialization() { diff --git a/Projects/UOContent/Items/Addons/LoomEastAddon.cs b/Projects/UOContent/Items/Addons/LoomEastAddon.cs index 4b4128338..034cdbf1c 100644 --- a/Projects/UOContent/Items/Addons/LoomEastAddon.cs +++ b/Projects/UOContent/Items/Addons/LoomEastAddon.cs @@ -5,7 +5,7 @@ namespace Server.Items int Phase { get; set; } } - [Serializable(1, false)] + [Serializable(0, false)] public partial class LoomEastAddon : BaseAddon, ILoom { [SerializableField(0)] @@ -19,10 +19,6 @@ namespace Server.Items } public override BaseAddonDeed Deed => new LoomEastDeed(); - - private void Deserialize(IGenericReader reader, int version) - { - } } [Serializable(0, false)] diff --git a/Projects/UOContent/Items/Addons/LoomSouthAddon.cs b/Projects/UOContent/Items/Addons/LoomSouthAddon.cs index b39b4b026..596ff2170 100644 --- a/Projects/UOContent/Items/Addons/LoomSouthAddon.cs +++ b/Projects/UOContent/Items/Addons/LoomSouthAddon.cs @@ -1,6 +1,6 @@ namespace Server.Items { - [Serializable(1, false)] + [Serializable(0, false)] public partial class LoomSouthAddon : BaseAddon, ILoom { [SerializableField(0)] @@ -14,10 +14,6 @@ namespace Server.Items } public override BaseAddonDeed Deed => new LoomSouthDeed(); - - private void Deserialize(IGenericReader reader, int version) - { - } } [Serializable(0, false)] diff --git a/Projects/UOContent/Items/Addons/SquirrelStatueSouthAddon.cs b/Projects/UOContent/Items/Addons/SquirrelStatueSouthAddon.cs index a3f324015..3429b1404 100644 --- a/Projects/UOContent/Items/Addons/SquirrelStatueSouthAddon.cs +++ b/Projects/UOContent/Items/Addons/SquirrelStatueSouthAddon.cs @@ -12,7 +12,8 @@ namespace Server.Items public override BaseAddonDeed Deed => new SquirrelStatueSouthDeed(); } - public class SquirrelStatueSouthDeed : BaseAddonDeed + [Serializable(0)] + public partial class SquirrelStatueSouthDeed : BaseAddonDeed { [Constructible] public SquirrelStatueSouthDeed() diff --git a/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs b/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs index 6544cb73e..474abcde4 100644 --- a/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs +++ b/Projects/UOContent/Items/Aquarium/AquariumFishingNet.cs @@ -1,20 +1,12 @@ namespace Server.Items { - public class AquariumFishNet : SpecialFishingNet + [Serializable(0, false)] + public partial class AquariumFishNet : SpecialFishingNet { [Constructible] public AquariumFishNet() { ItemID = 0xDC8; - - if (Hue == 0x8A0) - { - Hue = 0x240; - } - } - - public AquariumFishNet(Serial serial) : base(serial) - { } public override int LabelNumber => 1074463; // An aquarium fishing net @@ -118,82 +110,5 @@ namespace Server.Items return new MinocBlueFish(); } - - 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(); - } - } - - // Legacy code - public class AquariumFishingNet : Item - { - public AquariumFishingNet() - { - } - - public AquariumFishingNet(Serial serial) : base(serial) - { - } - - public override int LabelNumber => 1074463; // An aquarium fishing net - - private Item CreateReplacement() - { - Item result = new AquariumFishNet(); - result.Hue = Hue; - result.LootType = LootType; - result.Movable = Movable; - result.Name = Name; - result.QuestItem = QuestItem; - result.Visible = Visible; - - return result; - } - - public override void OnDoubleClick(Mobile from) - { - if (!IsChildOf(from.Backpack)) - { - from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it. - return; - } - - var replacement = CreateReplacement(); - - if (!from.PlaceInBackpack(replacement)) - { - replacement.Delete(); - from.SendLocalizedMessage(500720); // You don't have enough room in your backpack! - } - else - { - Delete(); - from.Use(replacement); - } - } - - 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/Aquarium/AquariumFood.cs b/Projects/UOContent/Items/Aquarium/AquariumFood.cs index 9927c53f5..db2cc1bc9 100644 --- a/Projects/UOContent/Items/Aquarium/AquariumFood.cs +++ b/Projects/UOContent/Items/Aquarium/AquariumFood.cs @@ -1,30 +1,13 @@ namespace Server.Items { - public class AquariumFood : Item + [Serializable(0, false)] + public partial class AquariumFood : Item { [Constructible] public AquariumFood() : base(0xEFC) { } - public AquariumFood(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1074819; // Aquarium food - - 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/Aquarium/BaseFish.cs b/Projects/UOContent/Items/Aquarium/BaseFish.cs index f8e55d856..9611a5429 100644 --- a/Projects/UOContent/Items/Aquarium/BaseFish.cs +++ b/Projects/UOContent/Items/Aquarium/BaseFish.cs @@ -2,7 +2,8 @@ using System; namespace Server.Items { - public class BaseFish : Item + [Serializable(0, false)] + public abstract partial class BaseFish : Item { private static readonly TimeSpan DeathDelay = TimeSpan.FromMinutes(5); @@ -14,10 +15,6 @@ namespace Server.Items StartTimer(); } - public BaseFish(Serial serial) : base(serial) - { - } - [CommandProperty(AccessLevel.GameMaster)] public bool Dead => ItemID == 0x3B0C; @@ -44,8 +41,6 @@ namespace Server.Items { ItemID = 0x3B0C; StopTimer(); - - InvalidateProperties(); } public int GetDescription() @@ -76,20 +71,10 @@ namespace Server.Items } } - public override void Serialize(IGenericWriter writer) + [AfterDeserialization] + private void AfterDeserialization() { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (!(Parent is Aquarium) && !(Parent is FishBowl)) + if (Parent is not Aquarium && Parent is not FishBowl) { StartTimer(); } diff --git a/Projects/UOContent/Items/Aquarium/FishBowl.cs b/Projects/UOContent/Items/Aquarium/FishBowl.cs index edec4fa70..71d364305 100644 --- a/Projects/UOContent/Items/Aquarium/FishBowl.cs +++ b/Projects/UOContent/Items/Aquarium/FishBowl.cs @@ -4,7 +4,8 @@ using Server.Network; namespace Server.Items { - public class FishBowl : BaseContainer + [Serializable(0, false)] + public partial class FishBowl : BaseContainer { [Constructible] public FishBowl() : base(0x241C) @@ -13,28 +14,13 @@ namespace Server.Items MaxItems = 1; } - public FishBowl(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1074499; // A fish bowl [CommandProperty(AccessLevel.GameMaster)] public bool Empty => Items.Count == 0; [CommandProperty(AccessLevel.GameMaster)] - public BaseFish Fish - { - get - { - if (Empty) - { - return null; - } - - return Items[0] as BaseFish; - } - } + public BaseFish Fish => Empty ? null : Items[0] as BaseFish; public override double DefaultWeight => 2.0; @@ -78,15 +64,7 @@ namespace Server.Items return false; } - public override bool CheckItemUse(Mobile from, Item item) - { - if (item != this) - { - return false; - } - - return base.CheckItemUse(from, item); - } + public override bool CheckItemUse(Mobile from, Item item) => item == this && base.CheckItemUse(from, item); public override bool CheckLift(Mobile from, Item item, ref LRReason reject) { @@ -124,32 +102,11 @@ namespace Server.Items } } - 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) - { - Weight = DefaultWeight; - } - } - private class RemoveCreature : ContextMenuEntry { private readonly FishBowl m_Bowl; - public RemoveCreature(FishBowl bowl) : base(6242, 3) // Remove creature - => - m_Bowl = bowl; + public RemoveCreature(FishBowl bowl) : base(6242, 3) => m_Bowl = bowl; public override void OnClick() { diff --git a/Projects/UOContent/Items/Aquarium/VacationWafer.cs b/Projects/UOContent/Items/Aquarium/VacationWafer.cs index a39a7da20..1021afc37 100644 --- a/Projects/UOContent/Items/Aquarium/VacationWafer.cs +++ b/Projects/UOContent/Items/Aquarium/VacationWafer.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class VacationWafer : Item + [Serializable(0, false)] + public partial class VacationWafer : Item { public const int VacationDays = 7; @@ -9,10 +10,6 @@ namespace Server.Items { } - public VacationWafer(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1074431; // An aquarium flake sphere public override void AddNameProperties(ObjectPropertyList list) @@ -21,24 +18,5 @@ namespace Server.Items list.Add(1074432, VacationDays.ToString()); // Vacation days: ~1_DAYS~ } - - 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 < 1 && ItemID == 0x971) - { - ItemID = 0x973; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/ArmorOfFortune.cs b/Projects/UOContent/Items/Armor/Artifacts/ArmorOfFortune.cs index cb99131b0..624692b54 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/ArmorOfFortune.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/ArmorOfFortune.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class ArmorOfFortune : StuddedChest + [Serializable(0, false)] + public partial class ArmorOfFortune : StuddedChest { [Constructible] public ArmorOfFortune() @@ -12,28 +13,10 @@ namespace Server.Items ArmorAttributes.MageArmor = 1; } - public ArmorOfFortune(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061098; // Armor of Fortune public override int ArtifactRarity => 11; public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/Craftable/BrambleCoat.cs b/Projects/UOContent/Items/Armor/Artifacts/Craftable/BrambleCoat.cs index c354d5dc7..7327a9b52 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/Craftable/BrambleCoat.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/Craftable/BrambleCoat.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class BrambleCoat : WoodlandChest + [Serializable(0)] + public partial class BrambleCoat : WoodlandChest { [Constructible] public BrambleCoat() @@ -14,10 +15,6 @@ namespace Server.Items Attributes.DefendChance = 15; } - public BrambleCoat(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1072925; // Bramble Coat public override int BasePhysicalResistance => 10; @@ -25,19 +22,5 @@ namespace Server.Items public override int BaseColdResistance => 7; public override int BasePoisonResistance => 8; public override int BaseEnergyResistance => 7; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs b/Projects/UOContent/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs index 9e09e917c..dd00c0838 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/Craftable/IronwoodCrown.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class IronwoodCrown : RavenHelm + [Serializable(0)] + public partial class IronwoodCrown : RavenHelm { [Constructible] public IronwoodCrown() @@ -14,10 +15,6 @@ namespace Server.Items Attributes.BonusInt = 5; } - public IronwoodCrown(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1072924; // Ironwood Crown public override int BasePhysicalResistance => 10; @@ -25,19 +22,5 @@ namespace Server.Items public override int BaseColdResistance => 7; public override int BasePoisonResistance => 7; public override int BaseEnergyResistance => 10; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs b/Projects/UOContent/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs index c47a0b140..007bf2165 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/Craftable/SongWovenMantle.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class SongWovenMantle : LeafArms + [Serializable(0)] + public partial class SongWovenMantle : LeafArms { [Constructible] public SongWovenMantle() @@ -13,28 +14,10 @@ namespace Server.Items Attributes.DefendChance = 5; } - public SongWovenMantle(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1072931; // Song Woven Mantle public override int BasePhysicalResistance => 14; public override int BaseColdResistance => 14; public override int BaseEnergyResistance => 16; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs b/Projects/UOContent/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs index 8f61a95b5..1ad94ff66 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/Craftable/SpellWovenBritches.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class SpellWovenBritches : LeafLegs + [Serializable(0)] + public partial class SpellWovenBritches : LeafLegs { [Constructible] public SpellWovenBritches() @@ -14,27 +15,9 @@ namespace Server.Items Attributes.LowerManaCost = 10; } - public SpellWovenBritches(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1072929; // Spell Woven Britches public override int BaseFireResistance => 15; public override int BasePoisonResistance => 16; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/Craftable/StitchersMittens.cs b/Projects/UOContent/Items/Armor/Artifacts/Craftable/StitchersMittens.cs index 173e56ce8..c2b0e0a13 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/Craftable/StitchersMittens.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/Craftable/StitchersMittens.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class StitchersMittens : LeafGloves + [Serializable(0)] + public partial class StitchersMittens : LeafGloves { [Constructible] public StitchersMittens() @@ -13,27 +14,9 @@ namespace Server.Items Attributes.LowerRegCost = 30; } - public StitchersMittens(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1072932; // Stitcher's Mittens public override int BasePhysicalResistance => 20; public override int BaseColdResistance => 20; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/GauntletsOfNobility.cs b/Projects/UOContent/Items/Armor/Artifacts/GauntletsOfNobility.cs index 69695cb89..872851cd6 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/GauntletsOfNobility.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/GauntletsOfNobility.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class GauntletsOfNobility : RingmailGloves + [Serializable(0, false)] + public partial class GauntletsOfNobility : RingmailGloves { [Constructible] public GauntletsOfNobility() @@ -11,10 +12,6 @@ namespace Server.Items Attributes.WeaponDamage = 20; } - public GauntletsOfNobility(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061092; // Gauntlets of Nobility public override int ArtifactRarity => 11; @@ -23,30 +20,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - if (Hue == 0x562) - { - Hue = 0x4FE; - } - - PhysicalBonus = 0; - PoisonBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/HelmOfInsight.cs b/Projects/UOContent/Items/Armor/Artifacts/HelmOfInsight.cs index 59660e885..c19866380 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/HelmOfInsight.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/HelmOfInsight.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class HelmOfInsight : PlateHelm + [Serializable(0, false)] + public partial class HelmOfInsight : PlateHelm { [Constructible] public HelmOfInsight() @@ -12,10 +13,6 @@ namespace Server.Items Attributes.LowerManaCost = 8; } - public HelmOfInsight(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061096; // Helm of Insight public override int ArtifactRarity => 11; @@ -23,24 +20,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - EnergyBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/HolyKnightsBreastplate.cs b/Projects/UOContent/Items/Armor/Artifacts/HolyKnightsBreastplate.cs index 4eab9dd38..2f7b0951c 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/HolyKnightsBreastplate.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/HolyKnightsBreastplate.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class HolyKnightsBreastplate : PlateChest + [Serializable(0, false)] + public partial class HolyKnightsBreastplate : PlateChest { [Constructible] public HolyKnightsBreastplate() @@ -10,10 +11,6 @@ namespace Server.Items Attributes.ReflectPhysical = 15; } - public HolyKnightsBreastplate(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061097; // Holy Knight's Breastplate public override int ArtifactRarity => 11; @@ -21,24 +18,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - PhysicalBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/InquisitorsResolution.cs b/Projects/UOContent/Items/Armor/Artifacts/InquisitorsResolution.cs index 0f8595ebf..3aee07ed6 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/InquisitorsResolution.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/InquisitorsResolution.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class InquisitorsResolution : PlateGloves + [Serializable(0, false)] + public partial class InquisitorsResolution : PlateGloves { [Constructible] public InquisitorsResolution() @@ -11,10 +12,6 @@ namespace Server.Items ArmorAttributes.MageArmor = 1; } - public InquisitorsResolution(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1060206; // The Inquisitor's Resolution public override int ArtifactRarity => 10; @@ -23,25 +20,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - ColdBonus = 0; - EnergyBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/JackalsCollar.cs b/Projects/UOContent/Items/Armor/Artifacts/JackalsCollar.cs index 2a452629d..32114470e 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/JackalsCollar.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/JackalsCollar.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class JackalsCollar : PlateGorget + [Serializable(0, false)] + public partial class JackalsCollar : PlateGorget { [Constructible] public JackalsCollar() @@ -10,10 +11,6 @@ namespace Server.Items Attributes.RegenHits = 2; } - public JackalsCollar(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061594; // Jackal's Collar public override int ArtifactRarity => 11; @@ -22,30 +19,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - if (Hue == 0x54B) - { - Hue = 0x6D1; - } - - FireBonus = 0; - ColdBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/LeggingsOfBane.cs b/Projects/UOContent/Items/Armor/Artifacts/LeggingsOfBane.cs index 0b58b2209..6a7fa1da7 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/LeggingsOfBane.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/LeggingsOfBane.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class LeggingsOfBane : ChainLegs + [Serializable(0, false)] + public partial class LeggingsOfBane : ChainLegs { [Constructible] public LeggingsOfBane() @@ -13,10 +14,6 @@ namespace Server.Items Attributes.AttackChance = 20; } - public LeggingsOfBane(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061100; // Leggings of Bane public override int ArtifactRarity => 11; @@ -24,42 +21,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(2); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version <= 1) - { - if (HitPoints > 255 || MaxHitPoints > 255) - { - HitPoints = MaxHitPoints = 255; - } - } - - if (version < 1) - { - if (Hue == 0x559) - { - Hue = 0x4F5; - } - - if (ArmorAttributes.DurabilityBonus == 0) - { - ArmorAttributes.DurabilityBonus = 100; - } - - PoisonBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/MidnightBracers.cs b/Projects/UOContent/Items/Armor/Artifacts/MidnightBracers.cs index 5e35cd644..57d6d661d 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/MidnightBracers.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/MidnightBracers.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class MidnightBracers : BoneArms + [Serializable(0, false)] + public partial class MidnightBracers : BoneArms { [Constructible] public MidnightBracers() @@ -11,10 +12,6 @@ namespace Server.Items ArmorAttributes.MageArmor = 1; } - public MidnightBracers(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061093; // Midnight Bracers public override int ArtifactRarity => 11; @@ -22,24 +19,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - PhysicalBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs b/Projects/UOContent/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs index 9de7f2256..c94054d0d 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/OrnateCrownOfTheHarrower.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class OrnateCrownOfTheHarrower : BoneHelm + [Serializable(0, false)] + public partial class OrnateCrownOfTheHarrower : BoneHelm { [Constructible] public OrnateCrownOfTheHarrower() @@ -11,10 +12,6 @@ namespace Server.Items Attributes.WeaponDamage = 25; } - public OrnateCrownOfTheHarrower(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061095; // Ornate Crown of the Harrower public override int ArtifactRarity => 11; @@ -22,29 +19,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - if (Hue == 0x55A) - { - Hue = 0x4F6; - } - - PoisonBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/ShadowDancerLeggings.cs b/Projects/UOContent/Items/Armor/Artifacts/ShadowDancerLeggings.cs index e081e8f33..188c50b2b 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/ShadowDancerLeggings.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/ShadowDancerLeggings.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class ShadowDancerLeggings : LeatherLegs + [Serializable(0, false)] + public partial class ShadowDancerLeggings : LeatherLegs { [Constructible] public ShadowDancerLeggings() @@ -11,10 +12,6 @@ namespace Server.Items SkillBonuses.SetValues(1, SkillName.Stealing, 20.0); } - public ShadowDancerLeggings(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061598; // Shadow Dancer Leggings public override int ArtifactRarity => 11; @@ -24,31 +21,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - if (ItemID == 0x13CB) - { - ItemID = 0x13D2; - } - - PhysicalBonus = 0; - PoisonBonus = 0; - EnergyBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/TunicOfFire.cs b/Projects/UOContent/Items/Armor/Artifacts/TunicOfFire.cs index feef1b59f..9b83136fd 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/TunicOfFire.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/TunicOfFire.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class TunicOfFire : ChainChest + [Serializable(0, false)] + public partial class TunicOfFire : ChainChest { [Constructible] public TunicOfFire() @@ -11,10 +12,6 @@ namespace Server.Items Attributes.ReflectPhysical = 15; } - public TunicOfFire(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061099; // Tunic of Fire public override int ArtifactRarity => 11; @@ -23,35 +20,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - if (Hue == 0x54E) - { - Hue = 0x54F; - } - - if (Attributes.NightSight == 0) - { - Attributes.NightSight = 1; - } - - PhysicalBonus = 0; - FireBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs b/Projects/UOContent/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs index 6b034bbd3..e4db5af05 100644 --- a/Projects/UOContent/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs +++ b/Projects/UOContent/Items/Armor/Artifacts/VoiceOfTheFallenKing.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class VoiceOfTheFallenKing : LeatherGorget + [Serializable(0, false)] + public partial class VoiceOfTheFallenKing : LeatherGorget { [Constructible] public VoiceOfTheFallenKing() @@ -11,10 +12,6 @@ namespace Server.Items Attributes.RegenStam = 3; } - public VoiceOfTheFallenKing(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1061094; // Voice of the Fallen King public override int ArtifactRarity => 11; @@ -23,30 +20,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1) - { - if (Hue == 0x551) - { - Hue = 0x76D; - } - - ColdBonus = 0; - EnergyBonus = 0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Bone/BoneArms.cs b/Projects/UOContent/Items/Armor/Bone/BoneArms.cs index 97aa911a0..886bff8a1 100644 --- a/Projects/UOContent/Items/Armor/Bone/BoneArms.cs +++ b/Projects/UOContent/Items/Armor/Bone/BoneArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x144e, 0x1453)] - public class BoneArms : BaseArmor + public partial class BoneArms : BaseArmor { [Constructible] public BoneArms() : base(0x144E) => Weight = 2.0; - public BoneArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 4; @@ -29,22 +26,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; public override CraftResource DefaultResource => CraftResource.RegularLeather; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - - if (Weight == 1.0) - { - Weight = 2.0; - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Bone/BoneChest.cs b/Projects/UOContent/Items/Armor/Bone/BoneChest.cs index e14184cdc..6431abd75 100644 --- a/Projects/UOContent/Items/Armor/Bone/BoneChest.cs +++ b/Projects/UOContent/Items/Armor/Bone/BoneChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x144f, 0x1454)] - public class BoneChest : BaseArmor + public partial class BoneChest : BaseArmor { [Constructible] public BoneChest() : base(0x144F) => Weight = 6.0; - public BoneChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 4; @@ -29,22 +26,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; public override CraftResource DefaultResource => CraftResource.RegularLeather; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - - if (Weight == 1.0) - { - Weight = 6.0; - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Bone/BoneGloves.cs b/Projects/UOContent/Items/Armor/Bone/BoneGloves.cs index 09e68207d..795fe85f4 100644 --- a/Projects/UOContent/Items/Armor/Bone/BoneGloves.cs +++ b/Projects/UOContent/Items/Armor/Bone/BoneGloves.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1450, 0x1455)] - public class BoneGloves : BaseArmor + public partial class BoneGloves : BaseArmor { [Constructible] public BoneGloves() : base(0x1450) => Weight = 2.0; - public BoneGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 4; @@ -29,22 +26,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; public override CraftResource DefaultResource => CraftResource.RegularLeather; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - - if (Weight == 1.0) - { - Weight = 2.0; - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Bone/BoneLegs.cs b/Projects/UOContent/Items/Armor/Bone/BoneLegs.cs index 73d318b5e..ed0357a12 100644 --- a/Projects/UOContent/Items/Armor/Bone/BoneLegs.cs +++ b/Projects/UOContent/Items/Armor/Bone/BoneLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1452, 0x1457)] - public class BoneLegs : BaseArmor + public partial class BoneLegs : BaseArmor { [Constructible] public BoneLegs() : base(0x1452) => Weight = 3.0; - public BoneLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 4; @@ -29,17 +26,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Bone; public override CraftResource DefaultResource => CraftResource.RegularLeather; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Chain/ChainChest.cs b/Projects/UOContent/Items/Armor/Chain/ChainChest.cs index 3c50c2cca..57df216de 100644 --- a/Projects/UOContent/Items/Armor/Chain/ChainChest.cs +++ b/Projects/UOContent/Items/Armor/Chain/ChainChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13bf, 0x13c4)] - public class ChainChest : BaseArmor + public partial class ChainChest : BaseArmor { [Constructible] public ChainChest() : base(0x13BF) => Weight = 7.0; - public ChainChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 4; public override int BaseFireResistance => 4; public override int BaseColdResistance => 4; @@ -27,17 +24,5 @@ namespace Server.Items public override int ArmorBase => 28; public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Chain/ChainHatsuburi.cs b/Projects/UOContent/Items/Armor/Chain/ChainHatsuburi.cs index f6b1f23ab..4f537f4b1 100644 --- a/Projects/UOContent/Items/Armor/Chain/ChainHatsuburi.cs +++ b/Projects/UOContent/Items/Armor/Chain/ChainHatsuburi.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class ChainHatsuburi : BaseArmor + [Serializable(0, false)] + public partial class ChainHatsuburi : BaseArmor { [Constructible] public ChainHatsuburi() : base(0x2774) => Weight = 7.0; - public ChainHatsuburi(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 2; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 3; public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Chain/ChainLegs.cs b/Projects/UOContent/Items/Armor/Chain/ChainLegs.cs index cd4f8dd61..2e40231f7 100644 --- a/Projects/UOContent/Items/Armor/Chain/ChainLegs.cs +++ b/Projects/UOContent/Items/Armor/Chain/ChainLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13be, 0x13c3)] - public class ChainLegs : BaseArmor + public partial class ChainLegs : BaseArmor { [Constructible] public ChainLegs() : base(0x13BE) => Weight = 7.0; - public ChainLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 4; public override int BaseFireResistance => 4; public override int BaseColdResistance => 4; @@ -27,17 +24,5 @@ namespace Server.Items public override int ArmorBase => 28; public override ArmorMaterialType MaterialType => ArmorMaterialType.Chainmail; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/DaemonBone/DaemonArms.cs b/Projects/UOContent/Items/Armor/DaemonBone/DaemonArms.cs index 51d43ea44..fd997f57f 100644 --- a/Projects/UOContent/Items/Armor/DaemonBone/DaemonArms.cs +++ b/Projects/UOContent/Items/Armor/DaemonBone/DaemonArms.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x144e, 0x1453)] - public class DaemonArms : BaseArmor + public partial class DaemonArms : BaseArmor { [Constructible] public DaemonArms() : base(0x144E) @@ -12,10 +13,6 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } - public DaemonArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; public override int BaseFireResistance => 6; public override int BaseColdResistance => 7; @@ -36,29 +33,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041371; // daemon bone arms - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); - - if (Weight == 1.0) - { - Weight = 2.0; - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (ArmorAttributes.SelfRepair == 0) - { - ArmorAttributes.SelfRepair = 1; - } - } } } diff --git a/Projects/UOContent/Items/Armor/DaemonBone/DaemonChest.cs b/Projects/UOContent/Items/Armor/DaemonBone/DaemonChest.cs index a580e032d..5c591a497 100644 --- a/Projects/UOContent/Items/Armor/DaemonBone/DaemonChest.cs +++ b/Projects/UOContent/Items/Armor/DaemonBone/DaemonChest.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x144f, 0x1454)] - public class DaemonChest : BaseArmor + public partial class DaemonChest : BaseArmor { [Constructible] public DaemonChest() : base(0x144F) @@ -12,10 +13,6 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } - public DaemonChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; public override int BaseFireResistance => 6; public override int BaseColdResistance => 7; @@ -36,29 +33,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041372; // daemon bone armor - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 6.0; - } - - if (ArmorAttributes.SelfRepair == 0) - { - ArmorAttributes.SelfRepair = 1; - } - } } } diff --git a/Projects/UOContent/Items/Armor/DaemonBone/DaemonGloves.cs b/Projects/UOContent/Items/Armor/DaemonBone/DaemonGloves.cs index 6ffdef93d..070102ebe 100644 --- a/Projects/UOContent/Items/Armor/DaemonBone/DaemonGloves.cs +++ b/Projects/UOContent/Items/Armor/DaemonBone/DaemonGloves.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1450, 0x1455)] - public class DaemonGloves : BaseArmor + public partial class DaemonGloves : BaseArmor { [Constructible] public DaemonGloves() : base(0x1450) @@ -12,10 +13,6 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } - public DaemonGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; public override int BaseFireResistance => 6; public override int BaseColdResistance => 7; @@ -36,29 +33,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041373; // daemon bone gloves - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 2.0; - } - - if (ArmorAttributes.SelfRepair == 0) - { - ArmorAttributes.SelfRepair = 1; - } - } } } diff --git a/Projects/UOContent/Items/Armor/DaemonBone/DaemonLegs.cs b/Projects/UOContent/Items/Armor/DaemonBone/DaemonLegs.cs index 8e1737ee8..f74377813 100644 --- a/Projects/UOContent/Items/Armor/DaemonBone/DaemonLegs.cs +++ b/Projects/UOContent/Items/Armor/DaemonBone/DaemonLegs.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1452, 0x1457)] - public class DaemonLegs : BaseArmor + public partial class DaemonLegs : BaseArmor { [Constructible] public DaemonLegs() : base(0x1452) @@ -12,10 +13,6 @@ namespace Server.Items ArmorAttributes.SelfRepair = 1; } - public DaemonLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; public override int BaseFireResistance => 6; public override int BaseColdResistance => 7; @@ -36,22 +33,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041375; // daemon bone leggings - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (ArmorAttributes.SelfRepair == 0) - { - ArmorAttributes.SelfRepair = 1; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Dragon/DragonArms.cs b/Projects/UOContent/Items/Armor/Dragon/DragonArms.cs index 3cc6a90b0..1412755c8 100644 --- a/Projects/UOContent/Items/Armor/Dragon/DragonArms.cs +++ b/Projects/UOContent/Items/Armor/Dragon/DragonArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x2657, 0x2658)] - public class DragonArms : BaseArmor + public partial class DragonArms : BaseArmor { [Constructible] public DragonArms() : base(0x2657) => Weight = 5.0; - public DragonArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; public override CraftResource DefaultResource => CraftResource.RedScales; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 15.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Dragon/DragonChest.cs b/Projects/UOContent/Items/Armor/Dragon/DragonChest.cs index b5f0b61f8..796a76329 100644 --- a/Projects/UOContent/Items/Armor/Dragon/DragonChest.cs +++ b/Projects/UOContent/Items/Armor/Dragon/DragonChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x2641, 0x2642)] - public class DragonChest : BaseArmor + public partial class DragonChest : BaseArmor { [Constructible] public DragonChest() : base(0x2641) => Weight = 10.0; - public DragonChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; public override CraftResource DefaultResource => CraftResource.RedScales; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 15.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Dragon/DragonGloves.cs b/Projects/UOContent/Items/Armor/Dragon/DragonGloves.cs index 4fb01fbd4..a327b29d9 100644 --- a/Projects/UOContent/Items/Armor/Dragon/DragonGloves.cs +++ b/Projects/UOContent/Items/Armor/Dragon/DragonGloves.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x2643, 0x2644)] - public class DragonGloves : BaseArmor + public partial class DragonGloves : BaseArmor { [Constructible] public DragonGloves() : base(0x2643) => Weight = 2.0; - public DragonGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; public override CraftResource DefaultResource => CraftResource.RedScales; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 2.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Dragon/DragonHelm.cs b/Projects/UOContent/Items/Armor/Dragon/DragonHelm.cs index 692bf5aec..900a9db5b 100644 --- a/Projects/UOContent/Items/Armor/Dragon/DragonHelm.cs +++ b/Projects/UOContent/Items/Armor/Dragon/DragonHelm.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x2645, 0x2646)] - public class DragonHelm : BaseArmor + public partial class DragonHelm : BaseArmor { [Constructible] public DragonHelm() : base(0x2645) => Weight = 5.0; - public DragonHelm(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; public override CraftResource DefaultResource => CraftResource.RedScales; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Dragon/DragonLegs.cs b/Projects/UOContent/Items/Armor/Dragon/DragonLegs.cs index 900604f09..d708fa77c 100644 --- a/Projects/UOContent/Items/Armor/Dragon/DragonLegs.cs +++ b/Projects/UOContent/Items/Armor/Dragon/DragonLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x2647, 0x2648)] - public class DragonLegs : BaseArmor + public partial class DragonLegs : BaseArmor { [Constructible] public DragonLegs() : base(0x2647) => Weight = 6.0; - public DragonLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 3; @@ -28,17 +25,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Dragon; public override CraftResource DefaultResource => CraftResource.RedScales; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Glasses/AnthropomorphistGlasses.cs b/Projects/UOContent/Items/Armor/Glasses/AnthropomorphistGlasses.cs index 5fdeb4ac4..d367588bc 100644 --- a/Projects/UOContent/Items/Armor/Glasses/AnthropomorphistGlasses.cs +++ b/Projects/UOContent/Items/Armor/Glasses/AnthropomorphistGlasses.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class AnthropomorphistGlasses : ElvenGlasses + [Serializable(0, false)] + public partial class AnthropomorphistGlasses : ElvenGlasses { [Constructible] public AnthropomorphistGlasses() @@ -12,10 +13,6 @@ namespace Server.Items Hue = 0x80; } - public AnthropomorphistGlasses(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1073379; // Anthropomorphist Reading Glasses public override int BasePhysicalResistance => 5; @@ -26,22 +23,5 @@ namespace Server.Items public override int InitMinHits => 255; public override int InitMaxHits => 255; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (version == 0 && Hue == 0) - { - Hue = 0x80; - } - } } } diff --git a/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs b/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs index cb9729d75..cbde70d19 100644 --- a/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs +++ b/Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs @@ -42,6 +42,8 @@ namespace Server.Items { case 1: { + // Use this line instead if you are getting world loading issues + // _resource = (CraftResource)reader.ReadByte(); _resource = (CraftResource)reader.ReadInt(); break; } diff --git a/Projects/UOContent/Migrations/Server.Items.AnthropomorphistGlasses.v0.json b/Projects/UOContent/Migrations/Server.Items.AnthropomorphistGlasses.v0.json new file mode 100644 index 000000000..7e0cc84a9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.AnthropomorphistGlasses.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.AnthropomorphistGlasses", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.AquariumFishNet.v0.json b/Projects/UOContent/Migrations/Server.Items.AquariumFishNet.v0.json new file mode 100644 index 000000000..90ac0d773 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.AquariumFishNet.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.AquariumFishNet", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.AquariumFood.v0.json b/Projects/UOContent/Migrations/Server.Items.AquariumFood.v0.json new file mode 100644 index 000000000..69a5501c5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.AquariumFood.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.AquariumFood", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ArmorOfFortune.v0.json b/Projects/UOContent/Migrations/Server.Items.ArmorOfFortune.v0.json new file mode 100644 index 000000000..67d5ce0b5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ArmorOfFortune.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ArmorOfFortune", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BaseFish.v0.json b/Projects/UOContent/Migrations/Server.Items.BaseFish.v0.json new file mode 100644 index 000000000..13588e804 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseFish.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BaseFish", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BoneArms.v0.json b/Projects/UOContent/Migrations/Server.Items.BoneArms.v0.json new file mode 100644 index 000000000..25e284101 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BoneArms.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BoneArms", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BoneChest.v0.json b/Projects/UOContent/Migrations/Server.Items.BoneChest.v0.json new file mode 100644 index 000000000..0647c1982 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BoneChest.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BoneChest", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BoneGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.BoneGloves.v0.json new file mode 100644 index 000000000..5dbfe0680 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BoneGloves.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BoneGloves", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BoneLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.BoneLegs.v0.json new file mode 100644 index 000000000..abe84bd79 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BoneLegs.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BoneLegs", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BrambleCoat.v0.json b/Projects/UOContent/Migrations/Server.Items.BrambleCoat.v0.json new file mode 100644 index 000000000..7daf34aae --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BrambleCoat.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.BrambleCoat", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ChainChest.v0.json b/Projects/UOContent/Migrations/Server.Items.ChainChest.v0.json new file mode 100644 index 000000000..355f5e85f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ChainChest.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ChainChest", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ChainHatsuburi.v0.json b/Projects/UOContent/Migrations/Server.Items.ChainHatsuburi.v0.json new file mode 100644 index 000000000..03d98e9e2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ChainHatsuburi.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ChainHatsuburi", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ChainLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.ChainLegs.v0.json new file mode 100644 index 000000000..cc9c0a238 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ChainLegs.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ChainLegs", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DaemonArms.v0.json b/Projects/UOContent/Migrations/Server.Items.DaemonArms.v0.json new file mode 100644 index 000000000..9413c70a7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DaemonArms.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DaemonArms", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DaemonChest.v0.json b/Projects/UOContent/Migrations/Server.Items.DaemonChest.v0.json new file mode 100644 index 000000000..63c6cd759 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DaemonChest.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DaemonChest", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DaemonGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.DaemonGloves.v0.json new file mode 100644 index 000000000..04a5622bd --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DaemonGloves.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DaemonGloves", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DaemonLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.DaemonLegs.v0.json new file mode 100644 index 000000000..015188ba7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DaemonLegs.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DaemonLegs", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DragonArms.v0.json b/Projects/UOContent/Migrations/Server.Items.DragonArms.v0.json new file mode 100644 index 000000000..646d1a72a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DragonArms.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DragonArms", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DragonChest.v0.json b/Projects/UOContent/Migrations/Server.Items.DragonChest.v0.json new file mode 100644 index 000000000..9f00996a1 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DragonChest.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DragonChest", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DragonGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.DragonGloves.v0.json new file mode 100644 index 000000000..8685a3dfc --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DragonGloves.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DragonGloves", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DragonHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.DragonHelm.v0.json new file mode 100644 index 000000000..123b2d10a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DragonHelm.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DragonHelm", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DragonLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.DragonLegs.v0.json new file mode 100644 index 000000000..9e73a6469 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DragonLegs.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.DragonLegs", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ElvenStoveSouthDeed.v0.json b/Projects/UOContent/Migrations/Server.Items.ElvenStoveSouthDeed.v0.json new file mode 100644 index 000000000..cc7ac1ab2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ElvenStoveSouthDeed.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ElvenStoveSouthDeed", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinEastAddon.v0.json b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinEastAddon.v0.json new file mode 100644 index 000000000..4b0cec609 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinEastAddon.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ElvenWashBasinEastAddon", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinEastDeed.v0.json b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinEastDeed.v0.json new file mode 100644 index 000000000..3e3d4e398 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinEastDeed.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ElvenWashBasinEastDeed", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinSouthAddon.v0.json b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinSouthAddon.v0.json new file mode 100644 index 000000000..82e44acb6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinSouthAddon.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ElvenWashBasinSouthAddon", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinSouthDeed.v0.json b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinSouthDeed.v0.json new file mode 100644 index 000000000..941b080f2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ElvenWashBasinSouthDeed.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ElvenWashBasinSouthDeed", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FancyElvenTableEastAddon.v0.json b/Projects/UOContent/Migrations/Server.Items.FancyElvenTableEastAddon.v0.json new file mode 100644 index 000000000..b26d24d68 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FancyElvenTableEastAddon.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.FancyElvenTableEastAddon", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FancyElvenTableEastDeed.v0.json b/Projects/UOContent/Migrations/Server.Items.FancyElvenTableEastDeed.v0.json new file mode 100644 index 000000000..ed1e53cc3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FancyElvenTableEastDeed.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.FancyElvenTableEastDeed", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FishBowl.v0.json b/Projects/UOContent/Migrations/Server.Items.FishBowl.v0.json new file mode 100644 index 000000000..069db8b0b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FishBowl.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.FishBowl", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FlourMillEastAddon.v1.json b/Projects/UOContent/Migrations/Server.Items.FlourMillEastAddon.v0.json similarity index 93% rename from Projects/UOContent/Migrations/Server.Items.FlourMillEastAddon.v1.json rename to Projects/UOContent/Migrations/Server.Items.FlourMillEastAddon.v0.json index 067b9d310..770e74e89 100644 --- a/Projects/UOContent/Migrations/Server.Items.FlourMillEastAddon.v1.json +++ b/Projects/UOContent/Migrations/Server.Items.FlourMillEastAddon.v0.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 0, "type": "Server.Items.FlourMillEastAddon", "properties": [ { diff --git a/Projects/UOContent/Migrations/Server.Items.FlourMillSouthAddon.v0.json b/Projects/UOContent/Migrations/Server.Items.FlourMillSouthAddon.v0.json new file mode 100644 index 000000000..21b655013 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FlourMillSouthAddon.v0.json @@ -0,0 +1,14 @@ +{ + "version": 0, + "type": "Server.Items.FlourMillSouthAddon", + "properties": [ + { + "name": "CurFlour", + "type": "int", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FlourMillSouthAddon.v1.json b/Projects/UOContent/Migrations/Server.Items.FlourMillSouthAddon.v1.json deleted file mode 100644 index 7d19fcc21..000000000 --- a/Projects/UOContent/Migrations/Server.Items.FlourMillSouthAddon.v1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 1, - "type": "Server.Items.FlourMillSouthAddon", - "properties": [] -} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GauntletsOfNobility.v0.json b/Projects/UOContent/Migrations/Server.Items.GauntletsOfNobility.v0.json new file mode 100644 index 000000000..af35b0243 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GauntletsOfNobility.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.GauntletsOfNobility", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HelmOfInsight.v0.json b/Projects/UOContent/Migrations/Server.Items.HelmOfInsight.v0.json new file mode 100644 index 000000000..c70e9950a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HelmOfInsight.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.HelmOfInsight", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HolyKnightsBreastplate.v0.json b/Projects/UOContent/Migrations/Server.Items.HolyKnightsBreastplate.v0.json new file mode 100644 index 000000000..2ad313cf3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HolyKnightsBreastplate.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.HolyKnightsBreastplate", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.InquisitorsResolution.v0.json b/Projects/UOContent/Migrations/Server.Items.InquisitorsResolution.v0.json new file mode 100644 index 000000000..18ba377dd --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.InquisitorsResolution.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.InquisitorsResolution", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.IronwoodCrown.v0.json b/Projects/UOContent/Migrations/Server.Items.IronwoodCrown.v0.json new file mode 100644 index 000000000..951b71e83 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.IronwoodCrown.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.IronwoodCrown", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.JackalsCollar.v0.json b/Projects/UOContent/Migrations/Server.Items.JackalsCollar.v0.json new file mode 100644 index 000000000..f8a1308aa --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.JackalsCollar.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.JackalsCollar", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LeggingsOfBane.v0.json b/Projects/UOContent/Migrations/Server.Items.LeggingsOfBane.v0.json new file mode 100644 index 000000000..62dd8c404 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LeggingsOfBane.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.LeggingsOfBane", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LoomEastAddon.v1.json b/Projects/UOContent/Migrations/Server.Items.LoomEastAddon.v0.json similarity index 92% rename from Projects/UOContent/Migrations/Server.Items.LoomEastAddon.v1.json rename to Projects/UOContent/Migrations/Server.Items.LoomEastAddon.v0.json index 4c2aad325..32c0d2019 100644 --- a/Projects/UOContent/Migrations/Server.Items.LoomEastAddon.v1.json +++ b/Projects/UOContent/Migrations/Server.Items.LoomEastAddon.v0.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 0, "type": "Server.Items.LoomEastAddon", "properties": [ { diff --git a/Projects/UOContent/Migrations/Server.Items.LoomSouthAddon.v1.json b/Projects/UOContent/Migrations/Server.Items.LoomSouthAddon.v0.json similarity index 92% rename from Projects/UOContent/Migrations/Server.Items.LoomSouthAddon.v1.json rename to Projects/UOContent/Migrations/Server.Items.LoomSouthAddon.v0.json index 715cb75ea..3c446d759 100644 --- a/Projects/UOContent/Migrations/Server.Items.LoomSouthAddon.v1.json +++ b/Projects/UOContent/Migrations/Server.Items.LoomSouthAddon.v0.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 0, "type": "Server.Items.LoomSouthAddon", "properties": [ { diff --git a/Projects/UOContent/Migrations/Server.Items.MidnightBracers.v0.json b/Projects/UOContent/Migrations/Server.Items.MidnightBracers.v0.json new file mode 100644 index 000000000..d805df425 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.MidnightBracers.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.MidnightBracers", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.OrnateCrownOfTheHarrower.v0.json b/Projects/UOContent/Migrations/Server.Items.OrnateCrownOfTheHarrower.v0.json new file mode 100644 index 000000000..cb1ad9841 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.OrnateCrownOfTheHarrower.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.OrnateCrownOfTheHarrower", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ShadowDancerLeggings.v0.json b/Projects/UOContent/Migrations/Server.Items.ShadowDancerLeggings.v0.json new file mode 100644 index 000000000..dc6755b73 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ShadowDancerLeggings.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.ShadowDancerLeggings", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SongWovenMantle.v0.json b/Projects/UOContent/Migrations/Server.Items.SongWovenMantle.v0.json new file mode 100644 index 000000000..ad582de7f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SongWovenMantle.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SongWovenMantle", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SpellWovenBritches.v0.json b/Projects/UOContent/Migrations/Server.Items.SpellWovenBritches.v0.json new file mode 100644 index 000000000..45094d7fd --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SpellWovenBritches.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SpellWovenBritches", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SquirrelStatueSouthDeed.v0.json b/Projects/UOContent/Migrations/Server.Items.SquirrelStatueSouthDeed.v0.json new file mode 100644 index 000000000..e281eda66 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SquirrelStatueSouthDeed.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.SquirrelStatueSouthDeed", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StitchersMittens.v0.json b/Projects/UOContent/Migrations/Server.Items.StitchersMittens.v0.json new file mode 100644 index 000000000..b5c2476c7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StitchersMittens.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.StitchersMittens", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TunicOfFire.v0.json b/Projects/UOContent/Migrations/Server.Items.TunicOfFire.v0.json new file mode 100644 index 000000000..df9ac98c2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TunicOfFire.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.TunicOfFire", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.VacationWafer.v0.json b/Projects/UOContent/Migrations/Server.Items.VacationWafer.v0.json new file mode 100644 index 000000000..afb1c85e7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.VacationWafer.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.VacationWafer", + "properties": [] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.VoiceOfTheFallenKing.v0.json b/Projects/UOContent/Migrations/Server.Items.VoiceOfTheFallenKing.v0.json new file mode 100644 index 000000000..19d537c03 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.VoiceOfTheFallenKing.v0.json @@ -0,0 +1,5 @@ +{ + "version": 0, + "type": "Server.Items.VoiceOfTheFallenKing", + "properties": [] +} \ No newline at end of file