From c8a2605c0d6a28cd567d16a3d853e3106a54a73a Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 17 Aug 2021 17:52:15 -0700 Subject: [PATCH] fix(codegen): Code gens base armor and fixes code genning of other armors. (#696) * Fixes code gen of save flags * Code gens rest of armor * Fixes some existing code genned armors * Code gens BaseArmor --- .../SerializableEntityGeneration.Class.cs | 2 +- ...zableEntityGeneration.DeserializeMethod.cs | 28 +- ...lizableEntityGeneration.SerializeMethod.cs | 18 +- .../SerializationGenerator.ContentStruct.cs | 32 +- .../SourceGeneration/SourceGeneration.Enum.cs | 3 +- Projects/UOContent/Items/Armor/BaseArmor.cs | 1311 ++++++----------- .../UOContent/Items/Armor/Helmets/Circlet.cs | 2 +- .../Items/Armor/Helmets/GemmedCirclet.cs | 2 +- .../Armor/Plate/DecorativePlateKabuto.cs | 19 +- .../Items/Armor/Plate/FemalePlateChest.cs | 24 +- .../Items/Armor/Plate/FemaleWoodlandChest.cs | 22 +- .../Items/Armor/Plate/HeavyPlateJingasa.cs | 19 +- .../Items/Armor/Plate/LightPlateJingasa.cs | 19 +- .../UOContent/Items/Armor/Plate/PlateArms.cs | 24 +- .../Items/Armor/Plate/PlateBattleKabuto.cs | 19 +- .../UOContent/Items/Armor/Plate/PlateChest.cs | 24 +- .../UOContent/Items/Armor/Plate/PlateDo.cs | 19 +- .../Items/Armor/Plate/PlateGloves.cs | 24 +- .../Items/Armor/Plate/PlateGorget.cs | 19 +- .../Items/Armor/Plate/PlateHaidate.cs | 19 +- .../Items/Armor/Plate/PlateHatsuburi.cs | 19 +- .../Items/Armor/Plate/PlateHiroSode.cs | 19 +- .../UOContent/Items/Armor/Plate/PlateLegs.cs | 19 +- .../UOContent/Items/Armor/Plate/PlateMempo.cs | 19 +- .../Items/Armor/Plate/PlateSuneate.cs | 19 +- .../Items/Armor/Plate/SmallPlateJingasa.cs | 19 +- .../Items/Armor/Plate/StandardPlateKabuto.cs | 19 +- .../Items/Armor/Plate/WoodlandArms.cs | 21 +- .../Items/Armor/Plate/WoodlandChest.cs | 21 +- .../Items/Armor/Plate/WoodlandGloves.cs | 21 +- .../Items/Armor/Plate/WoodlandGorget.cs | 26 +- .../Items/Armor/Plate/WoodlandLegs.cs | 21 +- .../Items/Armor/Ranger/RangerArms.cs | 24 +- .../Items/Armor/Ranger/RangerChest.cs | 24 +- .../Items/Armor/Ranger/RangerGloves.cs | 19 +- .../Items/Armor/Ranger/RangerGorget.cs | 19 +- .../Items/Armor/Ranger/RangerLegs.cs | 24 +- .../Items/Armor/Ring/RingmailArms.cs | 24 +- .../Items/Armor/Ring/RingmailChest.cs | 24 +- .../Items/Armor/Ring/RingmailGloves.cs | 24 +- .../Items/Armor/Ring/RingmailLegs.cs | 19 +- .../Items/Armor/Studded/FemaleStuddedChest.cs | 24 +- .../Armor/Studded/GargishStuddedArmsType1.cs | 17 +- .../Armor/Studded/GargishStuddedArmsType2.cs | 17 +- .../Armor/Studded/GargishStuddedChestType1.cs | 17 +- .../Armor/Studded/GargishStuddedChestType2.cs | 17 +- .../Armor/Studded/GargishStuddedKiltType1.cs | 18 +- .../Armor/Studded/GargishStuddedKiltType2.cs | 17 +- .../Armor/Studded/GargishStuddedLegsType1.cs | 17 +- .../Armor/Studded/GargishStuddedLegsType2.cs | 17 +- .../Items/Armor/Studded/HideChest.cs | 21 +- .../Items/Armor/Studded/HideFemaleChest.cs | 21 +- .../Items/Armor/Studded/HideGloves.cs | 21 +- .../Items/Armor/Studded/HideGorget.cs | 24 +- .../Items/Armor/Studded/HidePants.cs | 21 +- .../Items/Armor/Studded/HidePauldrons.cs | 21 +- .../Items/Armor/Studded/StuddedArms.cs | 24 +- .../Items/Armor/Studded/StuddedBustierArms.cs | 19 +- .../Items/Armor/Studded/StuddedChest.cs | 24 +- .../Items/Armor/Studded/StuddedDo.cs | 19 +- .../Items/Armor/Studded/StuddedGloves.cs | 24 +- .../Items/Armor/Studded/StuddedGorget.cs | 24 +- .../Items/Armor/Studded/StuddedHaidate.cs | 19 +- .../Items/Armor/Studded/StuddedHiroSode.cs | 19 +- .../Items/Armor/Studded/StuddedLegs.cs | 24 +- .../Items/Armor/Studded/StuddedMempo.cs | 19 +- .../Items/Armor/Studded/StuddedSuneate.cs | 19 +- .../Migrations/Server.Items.BaseArmor.v8.json | 213 +++ ...Server.Items.DecorativePlateKabuto.v0.json | 4 + ...Server.Items.FemaleElvenPlateChest.v0.json | 4 + .../Server.Items.FemalePlateChest.v0.json | 4 + .../Server.Items.FemaleStuddedChest.v0.json | 4 + ...rver.Items.GargishStuddedArmsType1.v0.json | 4 + ...rver.Items.GargishStuddedArmsType2.v0.json | 4 + ...ver.Items.GargishStuddedChestType1.v0.json | 4 + ...ver.Items.GargishStuddedChestType2.v0.json | 4 + ...rver.Items.GargishStuddedKiltType1.v0.json | 4 + ...rver.Items.GargishStuddedKiltType2.v0.json | 4 + ...rver.Items.GargishStuddedLegsType1.v0.json | 4 + ...rver.Items.GargishStuddedLegsType2.v0.json | 4 + .../Server.Items.HeavyPlateJingasa.v0.json | 4 + .../Migrations/Server.Items.HideChest.v0.json | 4 + .../Server.Items.HideFemaleChest.v0.json | 4 + .../Server.Items.HideGloves.v0.json | 4 + .../Server.Items.HideGorget.v0.json | 4 + .../Migrations/Server.Items.HidePants.v0.json | 4 + .../Server.Items.HidePauldrons.v0.json | 4 + .../Server.Items.LightPlateJingasa.v0.json | 4 + .../Migrations/Server.Items.PlateArms.v0.json | 4 + .../Server.Items.PlateBattleKabuto.v0.json | 4 + .../Server.Items.PlateChest.v0.json | 4 + .../Migrations/Server.Items.PlateDo.v0.json | 4 + .../Server.Items.PlateGloves.v0.json | 4 + .../Server.Items.PlateGorget.v0.json | 4 + .../Server.Items.PlateHaidate.v0.json | 4 + .../Server.Items.PlateHatsuburi.v0.json | 4 + .../Server.Items.PlateHiroSode.v0.json | 4 + .../Migrations/Server.Items.PlateLegs.v0.json | 4 + .../Server.Items.PlateMempo.v0.json | 4 + .../Server.Items.PlateSuneate.v0.json | 4 + .../Server.Items.RangerArms.v0.json | 4 + .../Server.Items.RangerChest.v0.json | 4 + .../Server.Items.RangerGloves.v0.json | 4 + .../Server.Items.RangerGorget.v0.json | 4 + .../Server.Items.RangerLegs.v0.json | 4 + .../Server.Items.RingmailArms.v0.json | 4 + .../Server.Items.RingmailChest.v0.json | 4 + .../Server.Items.RingmailGloves.v0.json | 4 + .../Server.Items.RingmailLegs.v0.json | 4 + .../Server.Items.SmallPlateJingasa.v0.json | 4 + .../Server.Items.StandardPlateKabuto.v0.json | 4 + .../Server.Items.StuddedArms.v0.json | 4 + .../Server.Items.StuddedBustierArms.v0.json | 4 + .../Server.Items.StuddedChest.v0.json | 4 + .../Migrations/Server.Items.StuddedDo.v0.json | 4 + .../Server.Items.StuddedGloves.v0.json | 4 + .../Server.Items.StuddedGorget.v0.json | 4 + .../Server.Items.StuddedHaidate.v0.json | 4 + .../Server.Items.StuddedHiroSode.v0.json | 4 + .../Server.Items.StuddedLegs.v0.json | 4 + .../Server.Items.StuddedMempo.v0.json | 4 + .../Server.Items.StuddedSuneate.v0.json | 4 + .../Server.Items.WoodlandArms.v0.json | 4 + .../Server.Items.WoodlandChest.v0.json | 4 + .../Server.Items.WoodlandGloves.v0.json | 4 + .../Server.Items.WoodlandGorget.v0.json | 4 + .../Server.Items.WoodlandLegs.v0.json | 4 + 127 files changed, 1107 insertions(+), 1959 deletions(-) create mode 100644 Projects/UOContent/Migrations/Server.Items.BaseArmor.v8.json create mode 100644 Projects/UOContent/Migrations/Server.Items.DecorativePlateKabuto.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.FemaleElvenPlateChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.FemalePlateChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.FemaleStuddedChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType1.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType2.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType1.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType2.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType1.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType2.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType1.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType2.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.HeavyPlateJingasa.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.HideChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.HideFemaleChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.HideGloves.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.HideGorget.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.HidePants.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.HidePauldrons.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.LightPlateJingasa.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateArms.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateBattleKabuto.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateDo.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateGloves.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateGorget.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateHaidate.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateHatsuburi.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateHiroSode.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateLegs.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateMempo.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.PlateSuneate.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RangerArms.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RangerChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RangerGloves.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RangerGorget.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RangerLegs.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RingmailArms.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RingmailChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RingmailGloves.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RingmailLegs.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.SmallPlateJingasa.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StandardPlateKabuto.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedArms.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedBustierArms.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedDo.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedGloves.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedGorget.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedHaidate.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedHiroSode.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedLegs.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedMempo.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StuddedSuneate.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WoodlandArms.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WoodlandChest.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WoodlandGloves.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WoodlandGorget.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WoodlandLegs.v0.json diff --git a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.Class.cs b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.Class.cs index c3119c7e2..7d1e33a52 100644 --- a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.Class.cs +++ b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.Class.cs @@ -338,8 +338,8 @@ namespace SerializationGenerator Accessibility.Private ); + source.GenerateEnumValue(" ", true, "None", -1); int index = 0; - source.GenerateEnumValue(" ", true, "None", index++); foreach (var (_, order) in serializablePropertyFlagGetters) { source.GenerateEnumValue(" ", true, serializableProperties[order].Name, index++); diff --git a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.DeserializeMethod.cs b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.DeserializeMethod.cs index c0e540cfb..663cce855 100644 --- a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.DeserializeMethod.cs +++ b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.DeserializeMethod.cs @@ -130,16 +130,24 @@ namespace SerializationGenerator if (usesSaveFlag) { - source.AppendLine($"\n{indent}if ((saveFlags & SaveFlag.{property.Name}) != 0)\n{indent}{{"); - rule.GenerateDeserializationMethod( - source, - innerIndent, - property, - "this" - ); - (rule as IPostDeserializeMethod)?.PostDeserializeMethod(source, innerIndent, property, compilation, classSymbol); - - source.AppendLine($"{indent}}}"); + source.AppendLine(); + // Special case + if (property.Type == "bool") + { + source.AppendLine($"{indent}{property.Name} = (saveFlags & SaveFlag.{property.Name}) != 0;"); + } + else + { + source.AppendLine($"{indent}if ((saveFlags & SaveFlag.{property.Name}) != 0)\n{indent}{{"); + rule.GenerateDeserializationMethod( + source, + innerIndent, + property, + "this" + ); + (rule as IPostDeserializeMethod)?.PostDeserializeMethod(source, innerIndent, property, compilation, classSymbol); + source.AppendLine($"{indent}}}"); + } } else { diff --git a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.SerializeMethod.cs b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.SerializeMethod.cs index 8f23d998c..0cf851d56 100644 --- a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.SerializeMethod.cs +++ b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializableEntityGeneration.SerializeMethod.cs @@ -79,13 +79,17 @@ namespace SerializationGenerator if (usesSaveFlag) { - source.AppendLine($"\n{indent}if ((saveFlags & SaveFlag.{property.Name}) != 0)\n{indent}{{"); - SerializableMigrationRulesEngine.Rules[property.Rule].GenerateSerializationMethod( - source, - innerIndent, - property - ); - source.AppendLine($"{indent}}}"); + // Special case + if (property.Type != "bool") + { + source.AppendLine($"\n{indent}if ((saveFlags & SaveFlag.{property.Name}) != 0)\n{indent}{{"); + SerializableMigrationRulesEngine.Rules[property.Rule].GenerateSerializationMethod( + source, + innerIndent, + property + ); + source.AppendLine($"{indent}}}"); + } } else { diff --git a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializationGenerator.ContentStruct.cs b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializationGenerator.ContentStruct.cs index 8ea39d0dd..276fb64e2 100644 --- a/Projects/SerializationGenerator/SerializableEntityGeneration/SerializationGenerator.ContentStruct.cs +++ b/Projects/SerializationGenerator/SerializableEntityGeneration/SerializationGenerator.ContentStruct.cs @@ -54,8 +54,8 @@ namespace SerializationGenerator Accessibility.Private ); + source.GenerateEnumValue(" ", true, "None", -1); int index = 0; - source.GenerateEnumValue(innerIndent, true, "None", index++); foreach (var property in properties) { if (property.UsesSaveFlag == true) @@ -82,16 +82,26 @@ namespace SerializationGenerator { if (property.UsesSaveFlag == true) { - source.AppendLine($"\n{innerIndent}if ((saveFlags & V{migration.Version}SaveFlag.{property.Name}) != 0)\n{innerIndent}{{"); - SerializableMigrationRulesEngine.Rules[property.Rule].GenerateDeserializationMethod( - source, - $"{innerIndent} ", - property, - "entity" - ); - source.AppendLine($"{innerIndent}}}\n{innerIndent}else\n{innerIndent}{{"); - source.AppendLine($"{innerIndent} {property.Name} = default;"); - source.AppendLine($"{innerIndent}}}"); + source.AppendLine(); + // Special case + if (property.Type == "bool") + { + source.AppendLine($"{innerIndent}{property.Name} = (saveFlags & SaveFlag.{property.Name}) != 0;"); + } + else + { + source.AppendLine($"{innerIndent}if ((saveFlags & V{migration.Version}SaveFlag.{property.Name}) != 0)\n{innerIndent}{{"); + SerializableMigrationRulesEngine.Rules[property.Rule].GenerateDeserializationMethod( + source, + $"{innerIndent} ", + property, + "entity" + ); + + source.AppendLine($"{innerIndent}}}\n{innerIndent}else\n{innerIndent}{{"); + source.AppendLine($"{innerIndent} {property.Name} = default;"); + source.AppendLine($"{innerIndent}}}"); + } } else { diff --git a/Projects/SerializationGenerator/SourceGeneration/SourceGeneration.Enum.cs b/Projects/SerializationGenerator/SourceGeneration/SourceGeneration.Enum.cs index 8d18a2230..6f8213561 100644 --- a/Projects/SerializationGenerator/SourceGeneration/SourceGeneration.Enum.cs +++ b/Projects/SerializationGenerator/SourceGeneration/SourceGeneration.Enum.cs @@ -37,7 +37,8 @@ namespace SerializationGenerator public static void GenerateEnumValue(this StringBuilder source, string indent, bool isFlag, string name, int value) { - var valueStr = isFlag ? $"0x{1 << value:X8}" : value.ToString(); + var number = value < 0 ? 0 : 1 << value; + var valueStr = isFlag ? $"0x{number:X8}" : value.ToString(); source.AppendLine($"{indent}{name} = {valueStr},"); } diff --git a/Projects/UOContent/Items/Armor/BaseArmor.cs b/Projects/UOContent/Items/Armor/BaseArmor.cs index 62c48a57e..23ef3153b 100644 --- a/Projects/UOContent/Items/Armor/BaseArmor.cs +++ b/Projects/UOContent/Items/Armor/BaseArmor.cs @@ -10,56 +10,148 @@ using AMT = Server.Items.ArmorMaterialType; namespace Server.Items { - public abstract class BaseArmor : Item, IScissorable, IFactionItem, ICraftable, IWearableDurability + [Serializable(8, false)] + public abstract partial class BaseArmor : Item, IScissorable, IFactionItem, ICraftable, IWearableDurability { - // Overridable values. These values are provided to override the defaults which get defined in the individual armor scripts. - private int m_ArmorBase = -1; - private Mobile m_Crafter; - private ArmorDurabilityLevel m_Durability; + [SerializableField(0, setter: "private")] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster, canModify: true)]")] + private AosAttributes _attributes; + + [SerializableFieldSaveFlag(0)] + private bool ShouldSerializeAosAttributes() => !_attributes.IsEmpty; + + [SerializableField(1, setter: "private")] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster, canModify: true)]")] + private AosArmorAttributes _armorAttributes; + + [SerializableFieldSaveFlag(1)] + private bool ShouldSerializeArmorAttributes() => !_armorAttributes.IsEmpty; + + [InvalidateProperties] + [SerializableField(2)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private int _physicalBonus; + + [SerializableFieldSaveFlag(2)] + private bool ShouldSerializePhysicalBonus() => _physicalBonus != 0; + + [InvalidateProperties] + [SerializableField(3)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private int _fireBonus; + + [SerializableFieldSaveFlag(3)] + private bool ShouldSerializeFireBonus() => _fireBonus != 0; + + [InvalidateProperties] + [SerializableField(4)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private int _coldBonus; + + [SerializableFieldSaveFlag(4)] + private bool ShouldSerializeColdBonus() => _coldBonus != 0; + + [InvalidateProperties] + [SerializableField(5)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private int _poisonBonus; + + [SerializableFieldSaveFlag(5)] + private bool ShouldSerializePoisonBonus() => _poisonBonus != 0; + + [InvalidateProperties] + [SerializableField(6)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private int _energyBonus; + + [SerializableFieldSaveFlag(6)] + private bool ShouldSerializeEnergyBonus() => _energyBonus != 0; + + [SerializableField(7)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private bool _identified; + + [SerializableFieldSaveFlag(7)] + private bool ShouldSerializeIdentified() => _identified; + + [SerializableField(8)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private int _maxHitPoints; + + [SerializableFieldSaveFlag(8)] + private bool ShouldSerializeMaxHitPoints() => _maxHitPoints != 0; + + // Field 9 + private int _hitPoints; + + [InvalidateProperties] + [SerializableField(10)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + private Mobile _crafter; + + [SerializableFieldSaveFlag(10)] + private bool ShouldSerializeCrafter() => _crafter != null; + + // Field 11 + private ArmorQuality _quality = ArmorQuality.Regular; + + // Field 12 + private ArmorDurabilityLevel _durability = ArmorDurabilityLevel.Regular; + + // Field 13 + private ArmorProtectionLevel _protection = ArmorProtectionLevel.Regular; + + // Field 14 + private CraftResource _resource; + + // Field 15 + private int _armorBase = -1; + + // Field 16 + private int _strBonus = -1; + + // Field 17 + private int _dexBonus = -1; + + // Field 18 + private int _intBonus = -1; + + // Field 19 + private int _strReq = -1; + + // Field 20 + private int _dexReq = -1; + + // Field 21 + private int _intReq = -1; + + // Field 22 + private AMA _meditate = (AMA)(-1); + + [SerializableField(23, setter: "private")] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster, canModify: true)]")] + public AosSkillBonuses _skillBonuses; + + [SerializableFieldSaveFlag(23)] + private bool ShouldSerializeSkillBonuses() => !_skillBonuses.IsEmpty; + + [SerializableField(24)] + [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")] + public bool _playerConstructed; + + [SerializableFieldSaveFlag(24)] + private bool ShouldSerializePlayerConstructed() => _playerConstructed; private FactionItem m_FactionState; - private int m_HitPoints; - private bool m_Identified; - - /* Armor internals work differently now (Jun 19 2003) - * - * The attributes defined below default to -1. - * If the value is -1, the corresponding virtual 'Aos/Old' property is used. - * If not, the attribute value itself is used. Here's the list: - * - ArmorBase - * - StrBonus - * - DexBonus - * - IntBonus - * - StrReq - * - DexReq - * - IntReq - * - MeditationAllowance - */ - - // Instance values. These values must are unique to each armor piece. - private int m_MaxHitPoints; - private AMA m_Meditate = (AMA)(-1); - private int m_PhysicalBonus, m_FireBonus, m_ColdBonus, m_PoisonBonus, m_EnergyBonus; - private ArmorProtectionLevel m_Protection; - private ArmorQuality m_Quality; - private CraftResource m_Resource; - private int m_StrBonus = -1, m_DexBonus = -1, m_IntBonus = -1; - private int m_StrReq = -1, m_DexReq = -1, m_IntReq = -1; - - public BaseArmor(Serial serial) : base(serial) - { - } public BaseArmor(int itemID) : base(itemID) { - m_Quality = ArmorQuality.Regular; - m_Durability = ArmorDurabilityLevel.Regular; - m_Crafter = null; + _crafter = null; - m_Resource = DefaultResource; - Hue = CraftResources.GetHue(m_Resource); + _resource = DefaultResource; + Hue = CraftResources.GetHue(_resource); - m_HitPoints = m_MaxHitPoints = Utility.RandomMinMax(InitMinHits, InitMaxHits); + _hitPoints = _maxHitPoints = Utility.RandomMinMax(InitMinHits, InitMaxHits); Layer = (Layer)ItemData.Quality; @@ -94,32 +186,105 @@ namespace Server.Items public virtual int OldDexReq => 0; public virtual int OldIntReq => 0; + [SerializableField(11)] [CommandProperty(AccessLevel.GameMaster)] - public AMA MeditationAllowance + public ArmorQuality Quality { - get => m_Meditate == (AMA)(-1) ? Core.AOS ? AosMedAllowance : OldMedAllowance : m_Meditate; - set => m_Meditate = value; + get => _quality; + set + { + UnscaleDurability(); + _quality = value; + ScaleDurability(); + } } + [SerializableFieldSaveFlag(11)] + private bool ShouldSerializeArmorQuality() => _quality != ArmorQuality.Regular; + + [SerializableField(12)] + [CommandProperty(AccessLevel.GameMaster)] + public ArmorDurabilityLevel Durability + { + get => _durability; + set + { + UnscaleDurability(); + _durability = value; + ScaleDurability(); + } + } + + [SerializableFieldSaveFlag(12)] + private bool ShouldSerializeDurability() => _durability != ArmorDurabilityLevel.Regular; + + [SerializableField(13)] + [CommandProperty(AccessLevel.GameMaster)] + public ArmorProtectionLevel ProtectionLevel + { + get => _protection; + set + { + if (_protection != value) + { + _protection = value; + + Invalidate(); + InvalidateProperties(); + + (Parent as Mobile)?.UpdateResistances(); + this.MarkDirty(); + } + } + } + + [SerializableFieldSaveFlag(13)] + private bool ShouldSerializeProtectionLevel() => _protection != ArmorProtectionLevel.Regular; + + [SerializableField(14)] + [CommandProperty(AccessLevel.GameMaster)] + public CraftResource Resource + { + get => _resource; + set + { + if (_resource != value) + { + UnscaleDurability(); + + _resource = value; + + if (CraftItem.RetainsColor(GetType())) + { + Hue = CraftResources.GetHue(_resource); + } + + Invalidate(); + (Parent as Mobile)?.UpdateResistances(); + ScaleDurability(); + } + } + } + + [SerializableFieldSaveFlag(14)] + private bool ShouldSerializeResource() => _resource != DefaultResource; + + [SerializableField(15)] [CommandProperty(AccessLevel.GameMaster)] public int BaseArmorRating { - get - { - if (m_ArmorBase == -1) - { - return ArmorBase; - } - - return m_ArmorBase; - } + get => _armorBase == -1 ? ArmorBase : _armorBase; set { - m_ArmorBase = value; + _armorBase = value; Invalidate(); + this.MarkDirty(); } } + [SerializableFieldSaveFlag(15)] + private bool ShouldSerializeArmorBase() => _armorBase != -1; + public double BaseArmorRatingScaled => BaseArmorRating * ArmorScalar; public virtual double ArmorRating @@ -128,12 +293,12 @@ namespace Server.Items { var ar = BaseArmorRating; - if (m_Protection != ArmorProtectionLevel.Regular) + if (_protection != ArmorProtectionLevel.Regular) { - ar += 10 + 5 * (int)m_Protection; + ar += 10 + 5 * (int)_protection; } - switch (m_Resource) + switch (_resource) { case CraftResource.DullCopper: ar += 2; @@ -170,119 +335,123 @@ namespace Server.Items break; } - ar += -8 + 8 * (int)m_Quality; + ar += -8 + 8 * (int)_quality; return ScaleArmorByDurability(ar); } } public double ArmorRatingScaled => ArmorRating * ArmorScalar; + [SerializableField(16)] [CommandProperty(AccessLevel.GameMaster)] public int StrBonus { - get => m_StrBonus == -1 ? Core.AOS ? AosStrBonus : OldStrBonus : m_StrBonus; + get => _strBonus == -1 ? Core.AOS ? AosStrBonus : OldStrBonus : _strBonus; set { - m_StrBonus = value; + _strBonus = value; InvalidateProperties(); + this.MarkDirty(); } } + [SerializableFieldSaveFlag(16)] + private bool ShouldSerializeStrBonus() => _strBonus != -1; + + [SerializableField(17)] [CommandProperty(AccessLevel.GameMaster)] public int DexBonus { - get => m_DexBonus == -1 ? Core.AOS ? AosDexBonus : OldDexBonus : m_DexBonus; + get => _dexBonus == -1 ? Core.AOS ? AosDexBonus : OldDexBonus : _dexBonus; set { - m_DexBonus = value; + _dexBonus = value; InvalidateProperties(); + this.MarkDirty(); } } + [SerializableFieldSaveFlag(17)] + private bool ShouldSerializeDexBonus() => _dexBonus != -1; + + [SerializableField(18)] [CommandProperty(AccessLevel.GameMaster)] public int IntBonus { - get => m_IntBonus == -1 ? Core.AOS ? AosIntBonus : OldIntBonus : m_IntBonus; + get => _intBonus == -1 ? Core.AOS ? AosIntBonus : OldIntBonus : _intBonus; set { - m_IntBonus = value; + _intBonus = value; InvalidateProperties(); + this.MarkDirty(); } } + [SerializableFieldSaveFlag(18)] + private bool ShouldSerializeIntBonus() => _intBonus != -1; + + [SerializableField(19)] [CommandProperty(AccessLevel.GameMaster)] public int StrRequirement { - get => m_StrReq == -1 ? Core.AOS ? AosStrReq : OldStrReq : m_StrReq; + get => _strReq == -1 ? Core.AOS ? AosStrReq : OldStrReq : _strReq; set { - m_StrReq = value; + _strReq = value; InvalidateProperties(); + this.MarkDirty(); } } + [SerializableFieldSaveFlag(19)] + private bool ShouldSerializeStrReq() => _strReq != -1; + + [SerializableField(20)] [CommandProperty(AccessLevel.GameMaster)] public int DexRequirement { - get => m_DexReq == -1 ? Core.AOS ? AosDexReq : OldDexReq : m_DexReq; + get => _dexReq == -1 ? Core.AOS ? AosDexReq : OldDexReq : _dexReq; set { - m_DexReq = value; + _dexReq = value; InvalidateProperties(); + this.MarkDirty(); } } + [SerializableFieldSaveFlag(20)] + private bool ShouldSerializeDexReq() => _dexReq != -1; + + [SerializableField(21)] [CommandProperty(AccessLevel.GameMaster)] public int IntRequirement { - get => m_IntReq == -1 ? Core.AOS ? AosIntReq : OldIntReq : m_IntReq; + get => _intReq == -1 ? Core.AOS ? AosIntReq : OldIntReq : _intReq; set { - m_IntReq = value; + _intReq = value; InvalidateProperties(); + this.MarkDirty(); } } + [SerializableFieldSaveFlag(21)] + private bool ShouldSerializeIntReq() => _intReq != -1; + + [SerializableField(22)] [CommandProperty(AccessLevel.GameMaster)] - public bool Identified + public AMA MeditationAllowance { - get => m_Identified; + get => _meditate < AMA.All ? Core.AOS ? AosMedAllowance : OldMedAllowance : _meditate; set { - m_Identified = value; - InvalidateProperties(); + _meditate = value; + this.MarkDirty(); } } - [CommandProperty(AccessLevel.GameMaster)] - public bool PlayerConstructed { get; set; } - - [CommandProperty(AccessLevel.GameMaster)] - public CraftResource Resource - { - get => m_Resource; - set - { - if (m_Resource != value) - { - UnscaleDurability(); - - m_Resource = value; - - if (CraftItem.RetainsColor(GetType())) - { - Hue = CraftResources.GetHue(m_Resource); - } - - Invalidate(); - InvalidateProperties(); - - (Parent as Mobile)?.UpdateResistances(); - - ScaleDurability(); - } - } - } + [SerializableFieldSaveFlag(22)] + private bool ShouldSerializeMeditationAllowance() => _meditate >= AMA.All; public virtual double ArmorScalar { @@ -299,128 +468,8 @@ namespace Server.Items } } - [CommandProperty(AccessLevel.GameMaster)] - public Mobile Crafter - { - get => m_Crafter; - set - { - m_Crafter = value; - InvalidateProperties(); - } - } - - [CommandProperty(AccessLevel.GameMaster)] - public ArmorQuality Quality - { - get => m_Quality; - set - { - UnscaleDurability(); - m_Quality = value; - Invalidate(); - InvalidateProperties(); - ScaleDurability(); - } - } - - [CommandProperty(AccessLevel.GameMaster)] - public ArmorDurabilityLevel Durability - { - get => m_Durability; - set - { - UnscaleDurability(); - m_Durability = value; - ScaleDurability(); - InvalidateProperties(); - } - } - public virtual int ArtifactRarity => 0; - [CommandProperty(AccessLevel.GameMaster)] - public ArmorProtectionLevel ProtectionLevel - { - get => m_Protection; - set - { - if (m_Protection != value) - { - m_Protection = value; - - Invalidate(); - InvalidateProperties(); - - (Parent as Mobile)?.UpdateResistances(); - } - } - } - - [CommandProperty(AccessLevel.GameMaster, canModify: true)] - public AosAttributes Attributes { get; private set; } - - [CommandProperty(AccessLevel.GameMaster, canModify: true)] - public AosArmorAttributes ArmorAttributes { get; private set; } - - [CommandProperty(AccessLevel.GameMaster, canModify: true)] - public AosSkillBonuses SkillBonuses { get; private set; } - - [CommandProperty(AccessLevel.GameMaster)] - public int PhysicalBonus - { - get => m_PhysicalBonus; - set - { - m_PhysicalBonus = value; - InvalidateProperties(); - } - } - - [CommandProperty(AccessLevel.GameMaster)] - public int FireBonus - { - get => m_FireBonus; - set - { - m_FireBonus = value; - InvalidateProperties(); - } - } - - [CommandProperty(AccessLevel.GameMaster)] - public int ColdBonus - { - get => m_ColdBonus; - set - { - m_ColdBonus = value; - InvalidateProperties(); - } - } - - [CommandProperty(AccessLevel.GameMaster)] - public int PoisonBonus - { - get => m_PoisonBonus; - set - { - m_PoisonBonus = value; - InvalidateProperties(); - } - } - - [CommandProperty(AccessLevel.GameMaster)] - public int EnergyBonus - { - get => m_EnergyBonus; - set - { - m_EnergyBonus = value; - InvalidateProperties(); - } - } - public virtual int BasePhysicalResistance => 0; public virtual int BaseFireResistance => 0; public virtual int BaseColdResistance => 0; @@ -428,19 +477,19 @@ namespace Server.Items public virtual int BaseEnergyResistance => 0; public override int PhysicalResistance => BasePhysicalResistance + GetProtOffset() + - GetResourceAttrs().ArmorPhysicalResist + m_PhysicalBonus; + GetResourceAttrs().ArmorPhysicalResist + _physicalBonus; public override int FireResistance => - BaseFireResistance + GetProtOffset() + GetResourceAttrs().ArmorFireResist + m_FireBonus; + BaseFireResistance + GetProtOffset() + GetResourceAttrs().ArmorFireResist + _fireBonus; public override int ColdResistance => - BaseColdResistance + GetProtOffset() + GetResourceAttrs().ArmorColdResist + m_ColdBonus; + BaseColdResistance + GetProtOffset() + GetResourceAttrs().ArmorColdResist + _coldBonus; public override int PoisonResistance => - BasePoisonResistance + GetProtOffset() + GetResourceAttrs().ArmorPoisonResist + m_PoisonBonus; + BasePoisonResistance + GetProtOffset() + GetResourceAttrs().ArmorPoisonResist + _poisonBonus; public override int EnergyResistance => - BaseEnergyResistance + GetProtOffset() + GetResourceAttrs().ArmorEnergyResist + m_EnergyBonus; + BaseEnergyResistance + GetProtOffset() + GetResourceAttrs().ArmorEnergyResist + _energyBonus; [CommandProperty(AccessLevel.GameMaster)] public ArmorBodyType BodyPosition @@ -526,19 +575,19 @@ namespace Server.Items switch (Utility.Random(5)) { case 0: - m_PhysicalBonus++; + PhysicalBonus++; break; case 1: - m_FireBonus++; + FireBonus++; break; case 2: - m_ColdBonus++; + ColdBonus++; break; case 3: - m_EnergyBonus++; + EnergyBonus++; break; case 4: - m_PoisonBonus++; + PoisonBonus++; break; } } @@ -593,7 +642,7 @@ namespace Server.Items { try { - var res = CraftResources.GetInfo(m_Resource).ResourceTypes[0].CreateInstance(); + var res = CraftResources.GetInfo(_resource).ResourceTypes[0].CreateInstance(); ScissorHelper(from, res, PlayerConstructed ? item.Resources[0].Amount / 2 : 1); return true; @@ -610,41 +659,37 @@ namespace Server.Items public virtual bool CanFortify => true; - [CommandProperty(AccessLevel.GameMaster)] - public int MaxHitPoints - { - get => m_MaxHitPoints; - set - { - m_MaxHitPoints = value; - InvalidateProperties(); - } - } - + [SerializableField(9)] [CommandProperty(AccessLevel.GameMaster)] public int HitPoints { - get => m_HitPoints; + get => _hitPoints; set { - if (value != m_HitPoints && MaxHitPoints > 0) + if (value != _hitPoints && MaxHitPoints > 0) { - m_HitPoints = value; + _hitPoints = value; - if (m_HitPoints < 0) + if (_hitPoints < 0) { Delete(); + return; } - else if (m_HitPoints > MaxHitPoints) + + if (_hitPoints > MaxHitPoints) { - m_HitPoints = MaxHitPoints; + _hitPoints = MaxHitPoints; } InvalidateProperties(); + this.MarkDirty(); } } } + [SerializableFieldSaveFlag(9)] + private bool ShouldSerializeHitPoints() => _hitPoints != 0; + public virtual int InitMinHits => 0; public virtual int InitMaxHits => 0; @@ -652,18 +697,20 @@ namespace Server.Items { var scale = 100 + GetDurabilityBonus(); - m_HitPoints = (m_HitPoints * 100 + (scale - 1)) / scale; - m_MaxHitPoints = (m_MaxHitPoints * 100 + (scale - 1)) / scale; + _maxHitPoints = (_maxHitPoints * 100 + (scale - 1)) / scale; + _hitPoints = (_hitPoints * 100 + (scale - 1)) / scale; InvalidateProperties(); + this.MarkDirty(); } public void ScaleDurability() { var scale = 100 + GetDurabilityBonus(); - m_HitPoints = (m_HitPoints * scale + 99) / 100; - m_MaxHitPoints = (m_MaxHitPoints * scale + 99) / 100; + _maxHitPoints = (_maxHitPoints * scale + 99) / 100; + _hitPoints = (_hitPoints * scale + 99) / 100; InvalidateProperties(); + this.MarkDirty(); } public virtual int OnHit(BaseWeapon weapon, int damageTaken) @@ -698,9 +745,9 @@ namespace Server.Items wear = Utility.Random(2); } - if (wear > 0 && m_MaxHitPoints > 0) + if (wear > 0 && _maxHitPoints > 0) { - if (m_HitPoints >= wear) + if (_hitPoints >= wear) { HitPoints -= wear; wear = 0; @@ -713,7 +760,7 @@ namespace Server.Items if (wear > 0) { - if (m_MaxHitPoints > wear) + if (_maxHitPoints > wear) { MaxHitPoints -= wear; @@ -772,17 +819,12 @@ namespace Server.Items public int ComputeStatBonus(StatType type) { - if (type == StatType.Str) + return type switch { - return StrBonus + Attributes.BonusStr; - } - - if (type == StatType.Dex) - { - return DexBonus + Attributes.BonusDex; - } - - return IntBonus + Attributes.BonusInt; + StatType.Str => StrBonus + Attributes.BonusStr, + StatType.Dex => DexBonus + Attributes.BonusDex, + _ => IntBonus + Attributes.BonusInt + }; } public void DistributeBonuses(int amount) @@ -792,19 +834,19 @@ namespace Server.Items switch (Utility.Random(5)) { case 0: - ++m_PhysicalBonus; + ++PhysicalBonus; break; case 1: - ++m_FireBonus; + ++FireBonus; break; case 2: - ++m_ColdBonus; + ++ColdBonus; break; case 3: - ++m_PoisonBonus; + ++PoisonBonus; break; case 4: - ++m_EnergyBonus; + ++EnergyBonus; break; } } @@ -814,7 +856,7 @@ namespace Server.Items public CraftAttributeInfo GetResourceAttrs() { - var info = CraftResources.GetInfo(m_Resource); + var info = CraftResources.GetInfo(_resource); if (info == null) { @@ -826,7 +868,7 @@ namespace Server.Items public int GetProtOffset() { - return m_Protection switch + return _protection switch { ArmorProtectionLevel.Guarding => 1, ArmorProtectionLevel.Hardening => 2, @@ -840,12 +882,12 @@ namespace Server.Items { var bonus = 0; - if (m_Quality == ArmorQuality.Exceptional) + if (_quality == ArmorQuality.Exceptional) { bonus += 20; } - switch (m_Durability) + switch (_durability) { case ArmorDurabilityLevel.Durable: bonus += 20; @@ -868,7 +910,7 @@ namespace Server.Items { bonus += ArmorAttributes.DurabilityBonus; - var resInfo = CraftResources.GetInfo(m_Resource); + var resInfo = CraftResources.GetInfo(_resource); CraftAttributeInfo attrInfo = null; if (resInfo != null) @@ -950,7 +992,7 @@ namespace Server.Items var v = ArmorAttributes.LowerStatReq; - var info = CraftResources.GetInfo(m_Resource); + var info = CraftResources.GetInfo(_resource); var attrInfo = info?.AttributeInfo; @@ -984,9 +1026,9 @@ namespace Server.Items { var scale = 100; - if (m_MaxHitPoints > 0 && m_HitPoints < m_MaxHitPoints) + if (_maxHitPoints > 0 && _hitPoints < _maxHitPoints) { - scale = 50 + 50 * m_HitPoints / m_MaxHitPoints; + scale = 50 + 50 * _hitPoints / _maxHitPoints; } return armor * scale / 100; @@ -997,519 +1039,13 @@ namespace Server.Items (Parent as Mobile)?.Delta(MobileDelta.Armor); // Tell them armor rating has changed } - private static void SetSaveFlag(ref SaveFlag flags, SaveFlag toSet, bool setIf) + private static bool GetSaveFlag(OldSaveFlag flags, OldSaveFlag toGet) => (flags & toGet) != 0; + + [AfterDeserialization] + private void AfterDeserialization() { - if (setIf) - { - flags |= toSet; - } - } - - private static bool GetSaveFlag(SaveFlag flags, SaveFlag toGet) => (flags & toGet) != 0; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(7); // version - - var flags = SaveFlag.None; - - SetSaveFlag(ref flags, SaveFlag.Attributes, !Attributes.IsEmpty); - SetSaveFlag(ref flags, SaveFlag.ArmorAttributes, !ArmorAttributes.IsEmpty); - SetSaveFlag(ref flags, SaveFlag.PhysicalBonus, m_PhysicalBonus != 0); - SetSaveFlag(ref flags, SaveFlag.FireBonus, m_FireBonus != 0); - SetSaveFlag(ref flags, SaveFlag.ColdBonus, m_ColdBonus != 0); - SetSaveFlag(ref flags, SaveFlag.PoisonBonus, m_PoisonBonus != 0); - SetSaveFlag(ref flags, SaveFlag.EnergyBonus, m_EnergyBonus != 0); - SetSaveFlag(ref flags, SaveFlag.Identified, m_Identified); - SetSaveFlag(ref flags, SaveFlag.MaxHitPoints, m_MaxHitPoints != 0); - SetSaveFlag(ref flags, SaveFlag.HitPoints, m_HitPoints != 0); - SetSaveFlag(ref flags, SaveFlag.Crafter, m_Crafter != null); - SetSaveFlag(ref flags, SaveFlag.Quality, m_Quality != ArmorQuality.Regular); - SetSaveFlag(ref flags, SaveFlag.Durability, m_Durability != ArmorDurabilityLevel.Regular); - SetSaveFlag(ref flags, SaveFlag.Protection, m_Protection != ArmorProtectionLevel.Regular); - SetSaveFlag(ref flags, SaveFlag.Resource, m_Resource != DefaultResource); - SetSaveFlag(ref flags, SaveFlag.BaseArmor, m_ArmorBase != -1); - SetSaveFlag(ref flags, SaveFlag.StrBonus, m_StrBonus != -1); - SetSaveFlag(ref flags, SaveFlag.DexBonus, m_DexBonus != -1); - SetSaveFlag(ref flags, SaveFlag.IntBonus, m_IntBonus != -1); - SetSaveFlag(ref flags, SaveFlag.StrReq, m_StrReq != -1); - SetSaveFlag(ref flags, SaveFlag.DexReq, m_DexReq != -1); - SetSaveFlag(ref flags, SaveFlag.IntReq, m_IntReq != -1); - SetSaveFlag(ref flags, SaveFlag.MedAllowance, m_Meditate != (AMA)(-1)); - SetSaveFlag(ref flags, SaveFlag.SkillBonuses, !SkillBonuses.IsEmpty); - SetSaveFlag(ref flags, SaveFlag.PlayerConstructed, PlayerConstructed); - - writer.WriteEncodedInt((int)flags); - - if (GetSaveFlag(flags, SaveFlag.Attributes)) - { - Attributes.Serialize(writer); - } - - if (GetSaveFlag(flags, SaveFlag.ArmorAttributes)) - { - ArmorAttributes.Serialize(writer); - } - - if (GetSaveFlag(flags, SaveFlag.PhysicalBonus)) - { - writer.WriteEncodedInt(m_PhysicalBonus); - } - - if (GetSaveFlag(flags, SaveFlag.FireBonus)) - { - writer.WriteEncodedInt(m_FireBonus); - } - - if (GetSaveFlag(flags, SaveFlag.ColdBonus)) - { - writer.WriteEncodedInt(m_ColdBonus); - } - - if (GetSaveFlag(flags, SaveFlag.PoisonBonus)) - { - writer.WriteEncodedInt(m_PoisonBonus); - } - - if (GetSaveFlag(flags, SaveFlag.EnergyBonus)) - { - writer.WriteEncodedInt(m_EnergyBonus); - } - - if (GetSaveFlag(flags, SaveFlag.MaxHitPoints)) - { - writer.WriteEncodedInt(m_MaxHitPoints); - } - - if (GetSaveFlag(flags, SaveFlag.HitPoints)) - { - writer.WriteEncodedInt(m_HitPoints); - } - - if (GetSaveFlag(flags, SaveFlag.Crafter)) - { - writer.Write(m_Crafter); - } - - if (GetSaveFlag(flags, SaveFlag.Quality)) - { - writer.WriteEncodedInt((int)m_Quality); - } - - if (GetSaveFlag(flags, SaveFlag.Durability)) - { - writer.WriteEncodedInt((int)m_Durability); - } - - if (GetSaveFlag(flags, SaveFlag.Protection)) - { - writer.WriteEncodedInt((int)m_Protection); - } - - if (GetSaveFlag(flags, SaveFlag.Resource)) - { - writer.WriteEncodedInt((int)m_Resource); - } - - if (GetSaveFlag(flags, SaveFlag.BaseArmor)) - { - writer.WriteEncodedInt(m_ArmorBase); - } - - if (GetSaveFlag(flags, SaveFlag.StrBonus)) - { - writer.WriteEncodedInt(m_StrBonus); - } - - if (GetSaveFlag(flags, SaveFlag.DexBonus)) - { - writer.WriteEncodedInt(m_DexBonus); - } - - if (GetSaveFlag(flags, SaveFlag.IntBonus)) - { - writer.WriteEncodedInt(m_IntBonus); - } - - if (GetSaveFlag(flags, SaveFlag.StrReq)) - { - writer.WriteEncodedInt(m_StrReq); - } - - if (GetSaveFlag(flags, SaveFlag.DexReq)) - { - writer.WriteEncodedInt(m_DexReq); - } - - if (GetSaveFlag(flags, SaveFlag.IntReq)) - { - writer.WriteEncodedInt(m_IntReq); - } - - if (GetSaveFlag(flags, SaveFlag.MedAllowance)) - { - writer.WriteEncodedInt((int)m_Meditate); - } - - if (GetSaveFlag(flags, SaveFlag.SkillBonuses)) - { - SkillBonuses.Serialize(writer); - } - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - switch (version) - { - case 7: - case 6: - case 5: - { - var flags = (SaveFlag)reader.ReadEncodedInt(); - - Attributes = new AosAttributes(this); - - if (GetSaveFlag(flags, SaveFlag.Attributes)) - { - Attributes.Deserialize(reader); - } - - ArmorAttributes = new AosArmorAttributes(this); - - if (GetSaveFlag(flags, SaveFlag.ArmorAttributes)) - { - ArmorAttributes.Deserialize(reader); - } - - if (GetSaveFlag(flags, SaveFlag.PhysicalBonus)) - { - m_PhysicalBonus = reader.ReadEncodedInt(); - } - - if (GetSaveFlag(flags, SaveFlag.FireBonus)) - { - m_FireBonus = reader.ReadEncodedInt(); - } - - if (GetSaveFlag(flags, SaveFlag.ColdBonus)) - { - m_ColdBonus = reader.ReadEncodedInt(); - } - - if (GetSaveFlag(flags, SaveFlag.PoisonBonus)) - { - m_PoisonBonus = reader.ReadEncodedInt(); - } - - if (GetSaveFlag(flags, SaveFlag.EnergyBonus)) - { - m_EnergyBonus = reader.ReadEncodedInt(); - } - - if (GetSaveFlag(flags, SaveFlag.Identified)) - { - m_Identified = version >= 7 || reader.ReadBool(); - } - - if (GetSaveFlag(flags, SaveFlag.MaxHitPoints)) - { - m_MaxHitPoints = reader.ReadEncodedInt(); - } - - if (GetSaveFlag(flags, SaveFlag.HitPoints)) - { - m_HitPoints = reader.ReadEncodedInt(); - } - - if (GetSaveFlag(flags, SaveFlag.Crafter)) - { - m_Crafter = reader.ReadEntity(); - } - - if (GetSaveFlag(flags, SaveFlag.Quality)) - { - m_Quality = (ArmorQuality)reader.ReadEncodedInt(); - } - else - { - m_Quality = ArmorQuality.Regular; - } - - if (version == 5 && m_Quality == ArmorQuality.Low) - { - m_Quality = ArmorQuality.Regular; - } - - if (GetSaveFlag(flags, SaveFlag.Durability)) - { - m_Durability = (ArmorDurabilityLevel)reader.ReadEncodedInt(); - - if (m_Durability > ArmorDurabilityLevel.Indestructible) - { - m_Durability = ArmorDurabilityLevel.Durable; - } - } - - if (GetSaveFlag(flags, SaveFlag.Protection)) - { - m_Protection = (ArmorProtectionLevel)reader.ReadEncodedInt(); - - if (m_Protection > ArmorProtectionLevel.Invulnerability) - { - m_Protection = ArmorProtectionLevel.Defense; - } - } - - if (GetSaveFlag(flags, SaveFlag.Resource)) - { - m_Resource = (CraftResource)reader.ReadEncodedInt(); - } - else - { - m_Resource = DefaultResource; - } - - if (m_Resource == CraftResource.None) - { - m_Resource = DefaultResource; - } - - if (GetSaveFlag(flags, SaveFlag.BaseArmor)) - { - m_ArmorBase = reader.ReadEncodedInt(); - } - else - { - m_ArmorBase = -1; - } - - if (GetSaveFlag(flags, SaveFlag.StrBonus)) - { - m_StrBonus = reader.ReadEncodedInt(); - } - else - { - m_StrBonus = -1; - } - - if (GetSaveFlag(flags, SaveFlag.DexBonus)) - { - m_DexBonus = reader.ReadEncodedInt(); - } - else - { - m_DexBonus = -1; - } - - if (GetSaveFlag(flags, SaveFlag.IntBonus)) - { - m_IntBonus = reader.ReadEncodedInt(); - } - else - { - m_IntBonus = -1; - } - - if (GetSaveFlag(flags, SaveFlag.StrReq)) - { - m_StrReq = reader.ReadEncodedInt(); - } - else - { - m_StrReq = -1; - } - - if (GetSaveFlag(flags, SaveFlag.DexReq)) - { - m_DexReq = reader.ReadEncodedInt(); - } - else - { - m_DexReq = -1; - } - - if (GetSaveFlag(flags, SaveFlag.IntReq)) - { - m_IntReq = reader.ReadEncodedInt(); - } - else - { - m_IntReq = -1; - } - - if (GetSaveFlag(flags, SaveFlag.MedAllowance)) - { - m_Meditate = (AMA)reader.ReadEncodedInt(); - } - else - { - m_Meditate = (AMA)(-1); - } - - SkillBonuses = new AosSkillBonuses(this); - - if (GetSaveFlag(flags, SaveFlag.SkillBonuses)) - { - SkillBonuses.Deserialize(reader); - } - - if (GetSaveFlag(flags, SaveFlag.PlayerConstructed)) - { - PlayerConstructed = true; - } - - break; - } - case 4: - { - Attributes = new AosAttributes(this); - Attributes.Deserialize(reader); - - ArmorAttributes = new AosArmorAttributes(this); - ArmorAttributes.Deserialize(reader); - goto case 3; - } - case 3: - { - m_PhysicalBonus = reader.ReadInt(); - m_FireBonus = reader.ReadInt(); - m_ColdBonus = reader.ReadInt(); - m_PoisonBonus = reader.ReadInt(); - m_EnergyBonus = reader.ReadInt(); - goto case 2; - } - case 2: - case 1: - { - m_Identified = reader.ReadBool(); - goto case 0; - } - case 0: - { - m_ArmorBase = reader.ReadInt(); - m_MaxHitPoints = reader.ReadInt(); - m_HitPoints = reader.ReadInt(); - m_Crafter = reader.ReadEntity(); - m_Quality = (ArmorQuality)reader.ReadInt(); - m_Durability = (ArmorDurabilityLevel)reader.ReadInt(); - m_Protection = (ArmorProtectionLevel)reader.ReadInt(); - - var mat = (AMT)reader.ReadInt(); - - if (m_ArmorBase == RevertArmorBase) - { - m_ArmorBase = -1; - } - - /*m_BodyPos = (ArmorBodyType)*/ - reader.ReadInt(); - - if (version < 4) - { - Attributes = new AosAttributes(this); - ArmorAttributes = new AosArmorAttributes(this); - } - - if (version < 3 && m_Quality == ArmorQuality.Exceptional) - { - DistributeBonuses(6); - } - - if (version >= 2) - { - m_Resource = (CraftResource)reader.ReadInt(); - } - else - { - 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, - _ => OreInfo.Iron - }; - - m_Resource = CraftResources.GetFromOreInfo(info, mat); - } - - m_StrBonus = reader.ReadInt(); - m_DexBonus = reader.ReadInt(); - m_IntBonus = reader.ReadInt(); - m_StrReq = reader.ReadInt(); - m_DexReq = reader.ReadInt(); - m_IntReq = reader.ReadInt(); - - if (m_StrBonus == OldStrBonus) - { - m_StrBonus = -1; - } - - if (m_DexBonus == OldDexBonus) - { - m_DexBonus = -1; - } - - if (m_IntBonus == OldIntBonus) - { - m_IntBonus = -1; - } - - if (m_StrReq == OldStrReq) - { - m_StrReq = -1; - } - - if (m_DexReq == OldDexReq) - { - m_DexReq = -1; - } - - if (m_IntReq == OldIntReq) - { - m_IntReq = -1; - } - - m_Meditate = (AMA)reader.ReadInt(); - - if (m_Meditate == OldMedAllowance) - { - m_Meditate = (AMA)(-1); - } - - if (m_Resource == CraftResource.None) - { - m_Resource = mat switch - { - ArmorMaterialType.Studded => CraftResource.RegularLeather, - ArmorMaterialType.Leather => CraftResource.RegularLeather, - ArmorMaterialType.Spined => CraftResource.SpinedLeather, - ArmorMaterialType.Horned => CraftResource.HornedLeather, - ArmorMaterialType.Barbed => CraftResource.BarbedLeather, - _ => CraftResource.Iron - }; - } - - if (m_MaxHitPoints == 0 && m_HitPoints == 0) - { - m_HitPoints = m_MaxHitPoints = Utility.RandomMinMax(InitMinHits, InitMaxHits); - } - - break; - } - } - + Attributes ??= new AosAttributes(this); + ArmorAttributes ??= new AosArmorAttributes(this); SkillBonuses ??= new AosSkillBonuses(this); var m = Parent as Mobile; @@ -1519,6 +1055,11 @@ namespace Server.Items SkillBonuses.AddTo(m); } + if (_resource == CraftResource.None) + { + _resource = DefaultResource; + } + var strBonus = ComputeStatBonus(StatType.Str); var dexBonus = ComputeStatBonus(StatType.Dex); var intBonus = ComputeStatBonus(StatType.Int); @@ -1544,10 +1085,140 @@ namespace Server.Items } m?.CheckStatTimers(); + } - if (version < 7) + private void Deserialize(IGenericReader reader, int version) + { + var flags = (OldSaveFlag)reader.ReadEncodedInt(); + + if (GetSaveFlag(flags, OldSaveFlag.Attributes)) { - PlayerConstructed = true; // we don't know, so, assume it's crafted + Attributes = new AosAttributes(this); + Attributes.Deserialize(reader); + } + + if (GetSaveFlag(flags, OldSaveFlag.ArmorAttributes)) + { + ArmorAttributes = new AosArmorAttributes(this); + ArmorAttributes.Deserialize(reader); + } + + if (GetSaveFlag(flags, OldSaveFlag.PhysicalBonus)) + { + _physicalBonus = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.FireBonus)) + { + _fireBonus = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.ColdBonus)) + { + _coldBonus = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.PoisonBonus)) + { + _poisonBonus = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.EnergyBonus)) + { + _energyBonus = reader.ReadEncodedInt(); + } + + _identified = GetSaveFlag(flags, OldSaveFlag.Identified); + + if (GetSaveFlag(flags, OldSaveFlag.MaxHitPoints)) + { + _maxHitPoints = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.HitPoints)) + { + _hitPoints = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.Crafter)) + { + _crafter = reader.ReadEntity(); + } + + if (GetSaveFlag(flags, OldSaveFlag.Quality)) + { + _quality = (ArmorQuality)reader.ReadEncodedInt(); + } + else + { + _quality = ArmorQuality.Regular; + } + + if (GetSaveFlag(flags, OldSaveFlag.Durability)) + { + _durability = (ArmorDurabilityLevel)reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.Protection)) + { + _protection = (ArmorProtectionLevel)reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.Resource)) + { + _resource = (CraftResource)reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.BaseArmor)) + { + _armorBase = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.StrBonus)) + { + _strBonus = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.DexBonus)) + { + _dexBonus = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.IntBonus)) + { + _intBonus = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.StrReq)) + { + _strReq = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.DexReq)) + { + _dexReq = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.IntReq)) + { + _intReq = reader.ReadEncodedInt(); + } + + if (GetSaveFlag(flags, OldSaveFlag.MedAllowance)) + { + _meditate = (AMA)reader.ReadEncodedInt(); + } + + SkillBonuses = new AosSkillBonuses(this); + + if (GetSaveFlag(flags, OldSaveFlag.SkillBonuses)) + { + SkillBonuses.Deserialize(reader); + } + + if (GetSaveFlag(flags, OldSaveFlag.PlayerConstructed)) + { + PlayerConstructed = true; } } @@ -1710,7 +1381,7 @@ namespace Server.Items public override void AddNameProperty(ObjectPropertyList list) { - var oreType = m_Resource switch + var oreType = _resource switch { CraftResource.DullCopper => 1053108, CraftResource.ShadowIron => 1053107, @@ -1732,7 +1403,7 @@ namespace Server.Items _ => 0 }; - if (m_Quality == ArmorQuality.Exceptional) + if (_quality == ArmorQuality.Exceptional) { if (oreType != 0) { @@ -1770,27 +1441,15 @@ namespace Server.Items return Attributes.SpellChanneling != 0; } - public virtual int GetLuckBonus() - { - var resInfo = CraftResources.GetInfo(m_Resource); - - var attrInfo = resInfo?.AttributeInfo; - - if (attrInfo == null) - { - return 0; - } - - return attrInfo.ArmorLuck; - } + public virtual int GetLuckBonus() => CraftResources.GetInfo(_resource)?.AttributeInfo?.ArmorLuck ?? 0; public override void GetProperties(ObjectPropertyList list) { base.GetProperties(list); - if (m_Crafter != null) + if (_crafter != null) { - list.Add(1050043, m_Crafter.Name); // crafted by ~1_NAME~ + list.Add(1050043, _crafter.Name); // crafted by ~1_NAME~ } if (m_FactionState != null) @@ -1964,9 +1623,9 @@ namespace Server.Items list.Add(1061170, prop.ToString()); // strength requirement ~1_val~ } - if (m_HitPoints >= 0 && m_MaxHitPoints > 0) + if (_hitPoints >= 0 && _maxHitPoints > 0) { - list.Add(1060639, "{0}\t{1}", m_HitPoints, m_MaxHitPoints); // durability ~1_val~ / ~2_val~ + list.Add(1060639, "{0}\t{1}", _hitPoints, _maxHitPoints); // durability ~1_val~ / ~2_val~ } } @@ -1991,25 +1650,25 @@ namespace Server.Items attrs.Add(new EquipInfoAttribute(1041350)); // faction item } - if (m_Quality == ArmorQuality.Exceptional) + if (_quality == ArmorQuality.Exceptional) { - attrs.Add(new EquipInfoAttribute(1018305 - (int)m_Quality)); + attrs.Add(new EquipInfoAttribute(1018305 - (int)_quality)); } - if (m_Identified || from.AccessLevel >= AccessLevel.GameMaster) + if (_identified || from.AccessLevel >= AccessLevel.GameMaster) { - if (m_Durability != ArmorDurabilityLevel.Regular) + if (_durability != ArmorDurabilityLevel.Regular) { - attrs.Add(new EquipInfoAttribute(1038000 + (int)m_Durability)); + attrs.Add(new EquipInfoAttribute(1038000 + (int)_durability)); } - if (m_Protection > ArmorProtectionLevel.Regular && m_Protection <= ArmorProtectionLevel.Invulnerability) + if (_protection > ArmorProtectionLevel.Regular && _protection <= ArmorProtectionLevel.Invulnerability) { - attrs.Add(new EquipInfoAttribute(1038005 + (int)m_Protection)); + attrs.Add(new EquipInfoAttribute(1038005 + (int)_protection)); } } - else if (m_Durability != ArmorDurabilityLevel.Regular || m_Protection > ArmorProtectionLevel.Regular && - m_Protection <= ArmorProtectionLevel.Invulnerability) + else if (_durability != ArmorDurabilityLevel.Regular || _protection > ArmorProtectionLevel.Regular && + _protection <= ArmorProtectionLevel.Invulnerability) { attrs.Add(new EquipInfoAttribute(1038000)); // Unidentified } @@ -2031,11 +1690,11 @@ namespace Server.Items return; } - from.NetState.SendDisplayEquipmentInfo(Serial, number, m_Crafter?.RawName, false, attrs); + from.NetState.SendDisplayEquipmentInfo(Serial, number, _crafter?.RawName, false, attrs); } [Flags] - private enum SaveFlag + private enum OldSaveFlag { None = 0x00000000, Attributes = 0x00000001, diff --git a/Projects/UOContent/Items/Armor/Helmets/Circlet.cs b/Projects/UOContent/Items/Armor/Helmets/Circlet.cs index e35f8909e..4e2971ce1 100644 --- a/Projects/UOContent/Items/Armor/Helmets/Circlet.cs +++ b/Projects/UOContent/Items/Armor/Helmets/Circlet.cs @@ -1,6 +1,6 @@ namespace Server.Items { - [Serializable(0, false)] + [Serializable(0)] [Flippable(0x2B6E, 0x3165)] public partial class Circlet : BaseArmor { diff --git a/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs b/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs index fa918315c..3eea1725b 100644 --- a/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs +++ b/Projects/UOContent/Items/Armor/Helmets/GemmedCirclet.cs @@ -1,7 +1,7 @@ namespace Server.Items { [Flippable(0x2B70, 0x3167)] - [Serializable(0, false)] + [Serializable(0)] public partial class GemmedCirclet : BaseArmor { [Constructible] diff --git a/Projects/UOContent/Items/Armor/Plate/DecorativePlateKabuto.cs b/Projects/UOContent/Items/Armor/Plate/DecorativePlateKabuto.cs index 57a088cf1..f24620620 100644 --- a/Projects/UOContent/Items/Armor/Plate/DecorativePlateKabuto.cs +++ b/Projects/UOContent/Items/Armor/Plate/DecorativePlateKabuto.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class DecorativePlateKabuto : BaseArmor + [Serializable(0, false)] + public partial class DecorativePlateKabuto : BaseArmor { [Constructible] public DecorativePlateKabuto() : base(0x2778) => Weight = 6.0; - public DecorativePlateKabuto(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; 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.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/FemalePlateChest.cs b/Projects/UOContent/Items/Armor/Plate/FemalePlateChest.cs index e3291630f..5298e68f9 100644 --- a/Projects/UOContent/Items/Armor/Plate/FemalePlateChest.cs +++ b/Projects/UOContent/Items/Armor/Plate/FemalePlateChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1c04, 0x1c05)] - public class FemalePlateChest : BaseArmor + public partial class FemalePlateChest : BaseArmor { [Constructible] public FemalePlateChest() : base(0x1C04) => Weight = 4.0; - public FemalePlateChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -29,22 +26,5 @@ namespace Server.Items public override int ArmorBase => 30; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 4.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/FemaleWoodlandChest.cs b/Projects/UOContent/Items/Armor/Plate/FemaleWoodlandChest.cs index 02b8a0cde..1d4a643dd 100644 --- a/Projects/UOContent/Items/Armor/Plate/FemaleWoodlandChest.cs +++ b/Projects/UOContent/Items/Armor/Plate/FemaleWoodlandChest.cs @@ -1,16 +1,12 @@ namespace Server.Items { - // Is this a filler-type item? the clilocs don't match up and at a glacnce I can't find direct reference of it + [Serializable(0)] [Flippable(0x2B6D, 0x3164)] - public class FemaleElvenPlateChest : BaseArmor + public partial class FemaleElvenPlateChest : BaseArmor { [Constructible] public FemaleElvenPlateChest() : base(0x2B6D) => Weight = 8.0; - public FemaleElvenPlateChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -28,19 +24,5 @@ namespace Server.Items public override int ArmorBase => 30; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/HeavyPlateJingasa.cs b/Projects/UOContent/Items/Armor/Plate/HeavyPlateJingasa.cs index b906df997..f98e3c58b 100644 --- a/Projects/UOContent/Items/Armor/Plate/HeavyPlateJingasa.cs +++ b/Projects/UOContent/Items/Armor/Plate/HeavyPlateJingasa.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class HeavyPlateJingasa : BaseArmor + [Serializable(0, false)] + public partial class HeavyPlateJingasa : BaseArmor { [Constructible] public HeavyPlateJingasa() : base(0x2777) => Weight = 5.0; - public HeavyPlateJingasa(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 7; public override int BaseFireResistance => 2; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 4; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/LightPlateJingasa.cs b/Projects/UOContent/Items/Armor/Plate/LightPlateJingasa.cs index eb16788b2..a8024d88f 100644 --- a/Projects/UOContent/Items/Armor/Plate/LightPlateJingasa.cs +++ b/Projects/UOContent/Items/Armor/Plate/LightPlateJingasa.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class LightPlateJingasa : BaseArmor + [Serializable(0, false)] + public partial class LightPlateJingasa : BaseArmor { [Constructible] public LightPlateJingasa() : base(0x2781) => Weight = 5.0; - public LightPlateJingasa(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 7; public override int BaseFireResistance => 2; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 4; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateArms.cs b/Projects/UOContent/Items/Armor/Plate/PlateArms.cs index 50763b151..2269150fa 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateArms.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1410, 0x1417)] - public class PlateArms : BaseArmor + public partial class PlateArms : BaseArmor { [Constructible] public PlateArms() : base(0x1410) => Weight = 5.0; - public PlateArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -27,22 +24,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.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/Plate/PlateBattleKabuto.cs b/Projects/UOContent/Items/Armor/Plate/PlateBattleKabuto.cs index ab859eb12..8a6aa5289 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateBattleKabuto.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateBattleKabuto.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateBattleKabuto : BaseArmor + [Serializable(0, false)] + public partial class PlateBattleKabuto : BaseArmor { [Constructible] public PlateBattleKabuto() : base(0x2785) => Weight = 6.0; - public PlateBattleKabuto(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; 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.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateChest.cs b/Projects/UOContent/Items/Armor/Plate/PlateChest.cs index 9dc54e4f9..4a00f339d 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateChest.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1415, 0x1416)] - public class PlateChest : BaseArmor + public partial class PlateChest : BaseArmor { [Constructible] public PlateChest() : base(0x1415) => Weight = 10.0; - public PlateChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -27,22 +24,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 10.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateDo.cs b/Projects/UOContent/Items/Armor/Plate/PlateDo.cs index 75198caba..44fdf73f2 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateDo.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateDo.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateDo : BaseArmor + [Serializable(0, false)] + public partial class PlateDo : BaseArmor { [Constructible] public PlateDo() : base(0x277D) => Weight = 10.0; - public PlateDo(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 3; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateGloves.cs b/Projects/UOContent/Items/Armor/Plate/PlateGloves.cs index 783a4f304..bf10b5751 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateGloves.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateGloves.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1414, 0x1418)] - public class PlateGloves : BaseArmor + public partial class PlateGloves : BaseArmor { [Constructible] public PlateGloves() : base(0x1414) => Weight = 2.0; - public PlateGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -27,22 +24,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.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/Plate/PlateGorget.cs b/Projects/UOContent/Items/Armor/Plate/PlateGorget.cs index dcaec124c..10880dad2 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateGorget.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateGorget.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateGorget : BaseArmor + [Serializable(0, false)] + public partial class PlateGorget : BaseArmor { [Constructible] public PlateGorget() : base(0x1413) => Weight = 2.0; - public PlateGorget(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -26,17 +23,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateHaidate.cs b/Projects/UOContent/Items/Armor/Plate/PlateHaidate.cs index 0115504b8..04e192ce2 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateHaidate.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateHaidate.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateHaidate : BaseArmor + [Serializable(0, false)] + public partial class PlateHaidate : BaseArmor { [Constructible] public PlateHaidate() : base(0x278D) => Weight = 7.0; - public PlateHaidate(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 3; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateHatsuburi.cs b/Projects/UOContent/Items/Armor/Plate/PlateHatsuburi.cs index 2b8c85d6b..7d0e43054 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateHatsuburi.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateHatsuburi.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateHatsuburi : BaseArmor + [Serializable(0, false)] + public partial class PlateHatsuburi : BaseArmor { [Constructible] public PlateHatsuburi() : base(0x2775) => Weight = 5.0; - public PlateHatsuburi(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 4; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateHiroSode.cs b/Projects/UOContent/Items/Armor/Plate/PlateHiroSode.cs index 12f757ce3..e565693f6 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateHiroSode.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateHiroSode.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateHiroSode : BaseArmor + [Serializable(0, false)] + public partial class PlateHiroSode : BaseArmor { [Constructible] public PlateHiroSode() : base(0x2780) => Weight = 3.0; - public PlateHiroSode(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 3; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateLegs.cs b/Projects/UOContent/Items/Armor/Plate/PlateLegs.cs index 697f94120..c633ca873 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateLegs.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1411, 0x141a)] - public class PlateLegs : BaseArmor + public partial class PlateLegs : BaseArmor { [Constructible] public PlateLegs() : base(0x1411) => Weight = 7.0; - public PlateLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -27,17 +24,5 @@ namespace Server.Items public override int ArmorBase => 40; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateMempo.cs b/Projects/UOContent/Items/Armor/Plate/PlateMempo.cs index 01bf698c7..c42e3c84b 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateMempo.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateMempo.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateMempo : BaseArmor + [Serializable(0, false)] + public partial class PlateMempo : BaseArmor { [Constructible] public PlateMempo() : base(0x2779) => Weight = 3.0; - public PlateMempo(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 4; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/PlateSuneate.cs b/Projects/UOContent/Items/Armor/Plate/PlateSuneate.cs index 984e0aff2..ae8298b63 100644 --- a/Projects/UOContent/Items/Armor/Plate/PlateSuneate.cs +++ b/Projects/UOContent/Items/Armor/Plate/PlateSuneate.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class PlateSuneate : BaseArmor + [Serializable(0, false)] + public partial class PlateSuneate : BaseArmor { [Constructible] public PlateSuneate() : base(0x2788) => Weight = 7.0; - public PlateSuneate(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 3; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/SmallPlateJingasa.cs b/Projects/UOContent/Items/Armor/Plate/SmallPlateJingasa.cs index 31f69e9b0..592cc447c 100644 --- a/Projects/UOContent/Items/Armor/Plate/SmallPlateJingasa.cs +++ b/Projects/UOContent/Items/Armor/Plate/SmallPlateJingasa.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class SmallPlateJingasa : BaseArmor + [Serializable(0, false)] + public partial class SmallPlateJingasa : BaseArmor { [Constructible] public SmallPlateJingasa() : base(0x2784) => Weight = 5.0; - public SmallPlateJingasa(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 7; public override int BaseFireResistance => 2; public override int BaseColdResistance => 2; @@ -24,17 +21,5 @@ namespace Server.Items public override int ArmorBase => 4; public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/StandardPlateKabuto.cs b/Projects/UOContent/Items/Armor/Plate/StandardPlateKabuto.cs index 9e581bed2..cf23240c3 100644 --- a/Projects/UOContent/Items/Armor/Plate/StandardPlateKabuto.cs +++ b/Projects/UOContent/Items/Armor/Plate/StandardPlateKabuto.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class StandardPlateKabuto : BaseArmor + [Serializable(0, false)] + public partial class StandardPlateKabuto : BaseArmor { [Constructible] public StandardPlateKabuto() : base(0x2789) => Weight = 6.0; - public StandardPlateKabuto(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 6; 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.Plate; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/WoodlandArms.cs b/Projects/UOContent/Items/Armor/Plate/WoodlandArms.cs index fcaa94ed9..2d207b52f 100644 --- a/Projects/UOContent/Items/Armor/Plate/WoodlandArms.cs +++ b/Projects/UOContent/Items/Armor/Plate/WoodlandArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B6C, 0x3163)] - public class WoodlandArms : BaseArmor + public partial class WoodlandArms : BaseArmor { [Constructible] public WoodlandArms() : base(0x2B6C) => Weight = 5.0; - public WoodlandArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -26,19 +23,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override Race RequiredRace => Race.Elf; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/WoodlandChest.cs b/Projects/UOContent/Items/Armor/Plate/WoodlandChest.cs index 44d90357c..f859c3399 100644 --- a/Projects/UOContent/Items/Armor/Plate/WoodlandChest.cs +++ b/Projects/UOContent/Items/Armor/Plate/WoodlandChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B67, 0x315E)] - public class WoodlandChest : BaseArmor + public partial class WoodlandChest : BaseArmor { [Constructible] public WoodlandChest() : base(0x2B67) => Weight = 8.0; - public WoodlandChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -26,19 +23,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override Race RequiredRace => Race.Elf; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/WoodlandGloves.cs b/Projects/UOContent/Items/Armor/Plate/WoodlandGloves.cs index cc7e28fb0..31dc3529b 100644 --- a/Projects/UOContent/Items/Armor/Plate/WoodlandGloves.cs +++ b/Projects/UOContent/Items/Armor/Plate/WoodlandGloves.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B6A, 0x3161)] - public class WoodlandGloves : BaseArmor + public partial class WoodlandGloves : BaseArmor { [Constructible] public WoodlandGloves() : base(0x2B6A) => Weight = 2.0; - public WoodlandGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -26,19 +23,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override Race RequiredRace => Race.Elf; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/WoodlandGorget.cs b/Projects/UOContent/Items/Armor/Plate/WoodlandGorget.cs index de3aa38ab..528d61686 100644 --- a/Projects/UOContent/Items/Armor/Plate/WoodlandGorget.cs +++ b/Projects/UOContent/Items/Armor/Plate/WoodlandGorget.cs @@ -1,17 +1,14 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B69, 0x3160)] - public class WoodlandGorget : BaseArmor + public partial class WoodlandGorget : BaseArmor { [Constructible] public WoodlandGorget() : base(0x2B69) { } - public WoodlandGorget(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -28,24 +25,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override Race RequiredRace => Race.Elf; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(1); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - - if (version == 0) - { - Weight = -1; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Plate/WoodlandLegs.cs b/Projects/UOContent/Items/Armor/Plate/WoodlandLegs.cs index 094ca3722..8d6610a14 100644 --- a/Projects/UOContent/Items/Armor/Plate/WoodlandLegs.cs +++ b/Projects/UOContent/Items/Armor/Plate/WoodlandLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B6B, 0x3162)] - public class WoodlandLegs : BaseArmor + public partial class WoodlandLegs : BaseArmor { [Constructible] public WoodlandLegs() : base(0x2B6B) => Weight = 8.0; - public WoodlandLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 5; public override int BaseFireResistance => 3; public override int BaseColdResistance => 2; @@ -26,19 +23,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Plate; public override Race RequiredRace => Race.Elf; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Ranger/RangerArms.cs b/Projects/UOContent/Items/Armor/Ranger/RangerArms.cs index c369c2288..5745de85a 100644 --- a/Projects/UOContent/Items/Armor/Ranger/RangerArms.cs +++ b/Projects/UOContent/Items/Armor/Ranger/RangerArms.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13dc, 0x13d4)] - public class RangerArms : BaseArmor + public partial class RangerArms : BaseArmor { [Constructible] public RangerArms() : base(0x13DC) @@ -10,10 +11,6 @@ namespace Server.Items Hue = 0x59C; } - public RangerArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -32,22 +29,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041493; // studded sleeves, ranger 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 = 4.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Ranger/RangerChest.cs b/Projects/UOContent/Items/Armor/Ranger/RangerChest.cs index 8b21b6e9b..2b573a11a 100644 --- a/Projects/UOContent/Items/Armor/Ranger/RangerChest.cs +++ b/Projects/UOContent/Items/Armor/Ranger/RangerChest.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13db, 0x13e2)] - public class RangerChest : BaseArmor + public partial class RangerChest : BaseArmor { [Constructible] public RangerChest() : base(0x13DB) @@ -10,10 +11,6 @@ namespace Server.Items Hue = 0x59C; } - public RangerChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -32,22 +29,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041497; // studded tunic, ranger 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 = 8.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Ranger/RangerGloves.cs b/Projects/UOContent/Items/Armor/Ranger/RangerGloves.cs index 918af1c94..2a42a14d3 100644 --- a/Projects/UOContent/Items/Armor/Ranger/RangerGloves.cs +++ b/Projects/UOContent/Items/Armor/Ranger/RangerGloves.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13d5, 0x13dd)] - public class RangerGloves : BaseArmor + public partial class RangerGloves : BaseArmor { [Constructible] public RangerGloves() : base(0x13D5) @@ -10,10 +11,6 @@ namespace Server.Items Hue = 0x59C; } - public RangerGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -32,17 +29,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041494; // studded gloves, ranger 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(); - } } } diff --git a/Projects/UOContent/Items/Armor/Ranger/RangerGorget.cs b/Projects/UOContent/Items/Armor/Ranger/RangerGorget.cs index d161fffac..13c751303 100644 --- a/Projects/UOContent/Items/Armor/Ranger/RangerGorget.cs +++ b/Projects/UOContent/Items/Armor/Ranger/RangerGorget.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class RangerGorget : BaseArmor + [Serializable(0, false)] + public partial class RangerGorget : BaseArmor { [Constructible] public RangerGorget() : base(0x13D6) @@ -9,10 +10,6 @@ namespace Server.Items Hue = 0x59C; } - public RangerGorget(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -31,17 +28,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041495; // studded gorget, ranger 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(); - } } } diff --git a/Projects/UOContent/Items/Armor/Ranger/RangerLegs.cs b/Projects/UOContent/Items/Armor/Ranger/RangerLegs.cs index 58c953874..39549df6e 100644 --- a/Projects/UOContent/Items/Armor/Ranger/RangerLegs.cs +++ b/Projects/UOContent/Items/Armor/Ranger/RangerLegs.cs @@ -1,7 +1,8 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13da, 0x13e1)] - public class RangerLegs : BaseArmor + public partial class RangerLegs : BaseArmor { [Constructible] public RangerLegs() : base(0x13DA) @@ -10,10 +11,6 @@ namespace Server.Items Hue = 0x59C; } - public RangerLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -32,22 +29,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override int LabelNumber => 1041496; // studded leggings, ranger 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 == 3.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Ring/RingmailArms.cs b/Projects/UOContent/Items/Armor/Ring/RingmailArms.cs index 814c9ca3d..b22ac9ca0 100644 --- a/Projects/UOContent/Items/Armor/Ring/RingmailArms.cs +++ b/Projects/UOContent/Items/Armor/Ring/RingmailArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13ee, 0x13ef)] - public class RingmailArms : BaseArmor + public partial class RingmailArms : BaseArmor { [Constructible] public RingmailArms() : base(0x13EE) => Weight = 15.0; - public RingmailArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 1; @@ -27,22 +24,5 @@ namespace Server.Items public override int ArmorBase => 22; public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; - - 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/Ring/RingmailChest.cs b/Projects/UOContent/Items/Armor/Ring/RingmailChest.cs index d1a0b5d79..3c43daf7d 100644 --- a/Projects/UOContent/Items/Armor/Ring/RingmailChest.cs +++ b/Projects/UOContent/Items/Armor/Ring/RingmailChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13ec, 0x13ed)] - public class RingmailChest : BaseArmor + public partial class RingmailChest : BaseArmor { [Constructible] public RingmailChest() : base(0x13EC) => Weight = 15.0; - public RingmailChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 1; @@ -27,22 +24,5 @@ namespace Server.Items public override int ArmorBase => 22; public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; - - 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/Ring/RingmailGloves.cs b/Projects/UOContent/Items/Armor/Ring/RingmailGloves.cs index 43d25497c..15f3ab0d2 100644 --- a/Projects/UOContent/Items/Armor/Ring/RingmailGloves.cs +++ b/Projects/UOContent/Items/Armor/Ring/RingmailGloves.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13eb, 0x13f2)] - public class RingmailGloves : BaseArmor + public partial class RingmailGloves : BaseArmor { [Constructible] public RingmailGloves() : base(0x13EB) => Weight = 2.0; - public RingmailGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 1; @@ -27,22 +24,5 @@ namespace Server.Items public override int ArmorBase => 22; public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; - - 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/Ring/RingmailLegs.cs b/Projects/UOContent/Items/Armor/Ring/RingmailLegs.cs index aa30dbd4b..1704cbf71 100644 --- a/Projects/UOContent/Items/Armor/Ring/RingmailLegs.cs +++ b/Projects/UOContent/Items/Armor/Ring/RingmailLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13f0, 0x13f1)] - public class RingmailLegs : BaseArmor + public partial class RingmailLegs : BaseArmor { [Constructible] public RingmailLegs() : base(0x13F0) => Weight = 15.0; - public RingmailLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 3; public override int BaseFireResistance => 3; public override int BaseColdResistance => 1; @@ -27,17 +24,5 @@ namespace Server.Items public override int ArmorBase => 22; public override ArmorMaterialType MaterialType => ArmorMaterialType.Ringmail; - - 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/Studded/FemaleStuddedChest.cs b/Projects/UOContent/Items/Armor/Studded/FemaleStuddedChest.cs index f4be23cce..5a378aeed 100644 --- a/Projects/UOContent/Items/Armor/Studded/FemaleStuddedChest.cs +++ b/Projects/UOContent/Items/Armor/Studded/FemaleStuddedChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1c02, 0x1c03)] - public class FemaleStuddedChest : BaseArmor + public partial class FemaleStuddedChest : BaseArmor { [Constructible] public FemaleStuddedChest() : base(0x1C02) => Weight = 6.0; - public FemaleStuddedChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -30,22 +27,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - - if (Weight == 1.0) - { - Weight = 6.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType1.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType1.cs index 3665b039e..d615f534c 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType1.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType1.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishStuddedArms")] - public class GargishStuddedArmsType1 : BaseArmor + public partial class GargishStuddedArmsType1 : BaseArmor { [Constructible] public GargishStuddedArmsType1() : base(0x284) => Weight = 10.0; - public GargishStuddedArmsType1(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -26,16 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType2.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType2.cs index b6c2cc7c5..db3259d83 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType2.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedArmsType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishStuddedArms")] - public class GargishStuddedArmsType2 : BaseArmor + public partial class GargishStuddedArmsType2 : BaseArmor { [Constructible] public GargishStuddedArmsType2() : base(0x283) => Weight = 10.0; - public GargishStuddedArmsType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -26,16 +24,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType1.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType1.cs index 79f8f5d6e..f068643e7 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType1.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType1.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishStuddedChest")] - public class GargishStuddedChestType1 : BaseArmor + public partial class GargishStuddedChestType1 : BaseArmor { [Constructible] public GargishStuddedChestType1() : base(0x286) => Weight = 15.0; - public GargishStuddedChestType1(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -28,16 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType2.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType2.cs index e1f3b65f0..40b16a3d1 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType2.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedChestType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishStuddedChest")] - public class GargishStuddedChestType2 : BaseArmor + public partial class GargishStuddedChestType2 : BaseArmor { [Constructible] public GargishStuddedChestType2() : base(0x285) => Weight = 15.0; - public GargishStuddedChestType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -27,16 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType1.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType1.cs index 32cd9d610..315b995fe 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType1.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType1.cs @@ -1,14 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishStuddedKilt")] - public class GargishStuddedKiltType1 : BaseArmor + public partial class GargishStuddedKiltType1 : BaseArmor { [Constructible] public GargishStuddedKiltType1() : base(0x288) => Weight = 10.0; - public GargishStuddedKiltType1(Serial serial) - : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -29,16 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType2.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType2.cs index de6d2c64a..d9d11ad43 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType2.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedKiltType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishStuddedKilt")] - public class GargishStuddedKiltType2 : BaseArmor + public partial class GargishStuddedKiltType2 : BaseArmor { [Constructible] public GargishStuddedKiltType2() : base(0x287) => Weight = 10.0; - public GargishStuddedKiltType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -27,16 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType1.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType1.cs index ddde0e988..ad5e9efc3 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType1.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType1.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.GargishStuddedLegs")] - public class GargishStuddedLegsType1 : BaseArmor + public partial class GargishStuddedLegsType1 : BaseArmor { [Constructible] public GargishStuddedLegsType1() : base(0x28A) => Weight = 15.0; - public GargishStuddedLegsType1(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -28,16 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType2.cs b/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType2.cs index 20cee220d..76b30eaea 100644 --- a/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType2.cs +++ b/Projects/UOContent/Items/Armor/Studded/GargishStuddedLegsType2.cs @@ -1,13 +1,11 @@ namespace Server.Items { + [Serializable(0, false)] [TypeAlias("Server.Items.FemaleGargishStuddedLegs")] - public class GargishStuddedLegsType2 : BaseArmor + public partial class GargishStuddedLegsType2 : BaseArmor { [Constructible] public GargishStuddedLegsType2() : base(0x289) => Weight = 15.0; - public GargishStuddedLegsType2(Serial serial) : base(serial) - { - } public override Race RequiredRace => Race.Gargoyle; public override int BasePhysicalResistance => 6; @@ -28,16 +26,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - int version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/HideChest.cs b/Projects/UOContent/Items/Armor/Studded/HideChest.cs index 5a1b0ca24..ec7275241 100644 --- a/Projects/UOContent/Items/Armor/Studded/HideChest.cs +++ b/Projects/UOContent/Items/Armor/Studded/HideChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B74, 0x316B)] - public class HideChest : BaseArmor + public partial class HideChest : BaseArmor { [Constructible] public HideChest() : base(0x2B74) => Weight = 6.0; - public HideChest(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 3; @@ -30,19 +27,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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/Studded/HideFemaleChest.cs b/Projects/UOContent/Items/Armor/Studded/HideFemaleChest.cs index 921ab37bd..9dc0da056 100644 --- a/Projects/UOContent/Items/Armor/Studded/HideFemaleChest.cs +++ b/Projects/UOContent/Items/Armor/Studded/HideFemaleChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B79, 0x3170)] - public class HideFemaleChest : BaseArmor + public partial class HideFemaleChest : BaseArmor { [Constructible] public HideFemaleChest() : base(0x2B79) => Weight = 6.0; - public HideFemaleChest(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 3; @@ -32,19 +29,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.WriteEncodedInt(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadEncodedInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/HideGloves.cs b/Projects/UOContent/Items/Armor/Studded/HideGloves.cs index b5e75569d..d655f8094 100644 --- a/Projects/UOContent/Items/Armor/Studded/HideGloves.cs +++ b/Projects/UOContent/Items/Armor/Studded/HideGloves.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B75, 0x316C)] - public class HideGloves : BaseArmor + public partial class HideGloves : BaseArmor { [Constructible] public HideGloves() : base(0x2B75) => Weight = 2.0; - public HideGloves(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 3; @@ -30,19 +27,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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/Studded/HideGorget.cs b/Projects/UOContent/Items/Armor/Studded/HideGorget.cs index 1858e8675..a1bbcf995 100644 --- a/Projects/UOContent/Items/Armor/Studded/HideGorget.cs +++ b/Projects/UOContent/Items/Armor/Studded/HideGorget.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x2B76, 0x316D)] - public class HideGorget : BaseArmor + public partial class HideGorget : BaseArmor { [Constructible] public HideGorget() : base(0x2B76) => Weight = 3.0; - public HideGorget(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 3; @@ -30,22 +27,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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 == 2.0) - { - Weight = 1.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/HidePants.cs b/Projects/UOContent/Items/Armor/Studded/HidePants.cs index 814cdb6cd..2d73fa1ff 100644 --- a/Projects/UOContent/Items/Armor/Studded/HidePants.cs +++ b/Projects/UOContent/Items/Armor/Studded/HidePants.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B78, 0x316F)] - public class HidePants : BaseArmor + public partial class HidePants : BaseArmor { [Constructible] public HidePants() : base(0x2B78) => Weight = 5.0; - public HidePants(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 3; @@ -30,19 +27,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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/Studded/HidePauldrons.cs b/Projects/UOContent/Items/Armor/Studded/HidePauldrons.cs index 5b02e8a84..3c4e838fb 100644 --- a/Projects/UOContent/Items/Armor/Studded/HidePauldrons.cs +++ b/Projects/UOContent/Items/Armor/Studded/HidePauldrons.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0)] [Flippable(0x2B77, 0x316E)] - public class HidePauldrons : BaseArmor + public partial class HidePauldrons : BaseArmor { [Constructible] public HidePauldrons() : base(0x2B77) => Weight = 4.0; - public HidePauldrons(Serial serial) : base(serial) - { - } - public override Race RequiredRace => Race.Elf; public override int BasePhysicalResistance => 3; @@ -30,19 +27,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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/Studded/StuddedArms.cs b/Projects/UOContent/Items/Armor/Studded/StuddedArms.cs index b1b8257a3..3d16400d2 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedArms.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13dc, 0x13d4)] - public class StuddedArms : BaseArmor + public partial class StuddedArms : BaseArmor { [Constructible] public StuddedArms() : base(0x13DC) => Weight = 4.0; - public StuddedArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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 = 4.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs b/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs index 0315eca90..5f55712ff 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedBustierArms.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x1c0c, 0x1c0d)] - public class StuddedBustierArms : BaseArmor + public partial class StuddedBustierArms : BaseArmor { [Constructible] public StuddedBustierArms() : base(0x1C0C) => Weight = 1.0; - public StuddedBustierArms(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -30,17 +27,5 @@ namespace Server.Items public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; public override bool AllowMaleWearer => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedChest.cs b/Projects/UOContent/Items/Armor/Studded/StuddedChest.cs index cead23e26..99d1ac8b8 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedChest.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedChest.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13db, 0x13e2)] - public class StuddedChest : BaseArmor + public partial class StuddedChest : BaseArmor { [Constructible] public StuddedChest() : base(0x13DB) => Weight = 8.0; - public StuddedChest(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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 = 8.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedDo.cs b/Projects/UOContent/Items/Armor/Studded/StuddedDo.cs index 7ea80dee7..adf62707a 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedDo.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedDo.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class StuddedDo : BaseArmor + [Serializable(0, false)] + public partial class StuddedDo : BaseArmor { [Constructible] public StuddedDo() : base(0x27C7) => Weight = 8.0; - public StuddedDo(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -25,17 +22,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; 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/Studded/StuddedGloves.cs b/Projects/UOContent/Items/Armor/Studded/StuddedGloves.cs index 88b436891..c6977efb1 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedGloves.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedGloves.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13d5, 0x13dd)] - public class StuddedGloves : BaseArmor + public partial class StuddedGloves : BaseArmor { [Constructible] public StuddedGloves() : base(0x13D5) => Weight = 1.0; - public StuddedGloves(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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 == 2.0) - { - Weight = 1.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs b/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs index 2df3a7655..d72ba4199 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedGorget.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class StuddedGorget : BaseArmor + [Serializable(0, false)] + public partial class StuddedGorget : BaseArmor { [Constructible] public StuddedGorget() : base(0x13D6) => Weight = 1.0; - public StuddedGorget(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -27,22 +24,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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 == 2.0) - { - Weight = 1.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedHaidate.cs b/Projects/UOContent/Items/Armor/Studded/StuddedHaidate.cs index b47742197..b719c1fe9 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedHaidate.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedHaidate.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class StuddedHaidate : BaseArmor + [Serializable(0, false)] + public partial class StuddedHaidate : BaseArmor { [Constructible] public StuddedHaidate() : base(0x278B) => Weight = 5.0; - public StuddedHaidate(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -25,17 +22,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; 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/Studded/StuddedHiroSode.cs b/Projects/UOContent/Items/Armor/Studded/StuddedHiroSode.cs index 981012223..145e1c7cb 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedHiroSode.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedHiroSode.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class StuddedHiroSode : BaseArmor + [Serializable(0, false)] + public partial class StuddedHiroSode : BaseArmor { [Constructible] public StuddedHiroSode() : base(0x277F) => Weight = 1.0; - public StuddedHiroSode(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -25,17 +22,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; 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/Studded/StuddedLegs.cs b/Projects/UOContent/Items/Armor/Studded/StuddedLegs.cs index 851950131..24a77c890 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedLegs.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedLegs.cs @@ -1,15 +1,12 @@ namespace Server.Items { + [Serializable(0, false)] [Flippable(0x13da, 0x13e1)] - public class StuddedLegs : BaseArmor + public partial class StuddedLegs : BaseArmor { [Constructible] public StuddedLegs() : base(0x13DA) => Weight = 5.0; - public StuddedLegs(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -28,22 +25,5 @@ namespace Server.Items public override CraftResource DefaultResource => CraftResource.RegularLeather; public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.Half; - - 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 == 3.0) - { - Weight = 5.0; - } - } } } diff --git a/Projects/UOContent/Items/Armor/Studded/StuddedMempo.cs b/Projects/UOContent/Items/Armor/Studded/StuddedMempo.cs index 2c0a76e5e..252c836e7 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedMempo.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedMempo.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class StuddedMempo : BaseArmor + [Serializable(0, false)] + public partial class StuddedMempo : BaseArmor { [Constructible] public StuddedMempo() : base(0x279D) => Weight = 2.0; - public StuddedMempo(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -25,17 +22,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; 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/Studded/StuddedSuneate.cs b/Projects/UOContent/Items/Armor/Studded/StuddedSuneate.cs index bd0e0a77f..55b77c2a5 100644 --- a/Projects/UOContent/Items/Armor/Studded/StuddedSuneate.cs +++ b/Projects/UOContent/Items/Armor/Studded/StuddedSuneate.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class StuddedSuneate : BaseArmor + [Serializable(0, false)] + public partial class StuddedSuneate : BaseArmor { [Constructible] public StuddedSuneate() : base(0x27D2) => Weight = 5.0; - public StuddedSuneate(Serial serial) : base(serial) - { - } - public override int BasePhysicalResistance => 2; public override int BaseFireResistance => 4; public override int BaseColdResistance => 3; @@ -25,17 +22,5 @@ namespace Server.Items public override ArmorMaterialType MaterialType => ArmorMaterialType.Studded; 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/Migrations/Server.Items.BaseArmor.v8.json b/Projects/UOContent/Migrations/Server.Items.BaseArmor.v8.json new file mode 100644 index 000000000..8d4626d0b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BaseArmor.v8.json @@ -0,0 +1,213 @@ +{ + "version": 8, + "type": "Server.Items.BaseArmor", + "properties": [ + { + "name": "Attributes", + "type": "Server.AosAttributes", + "usesSaveFlag": true, + "rule": "RawSerializableMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "ArmorAttributes", + "type": "Server.AosArmorAttributes", + "usesSaveFlag": true, + "rule": "RawSerializableMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "PhysicalBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "FireBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "ColdBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "PoisonBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "EnergyBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "Identified", + "type": "bool", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "MaxHitPoints", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "HitPoints", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "Crafter", + "type": "Server.Mobile", + "usesSaveFlag": true, + "rule": "SerializableInterfaceMigrationRule" + }, + { + "name": "Quality", + "type": "Server.Items.ArmorQuality", + "usesSaveFlag": true, + "rule": "EnumMigrationRule" + }, + { + "name": "Durability", + "type": "Server.Items.ArmorDurabilityLevel", + "usesSaveFlag": true, + "rule": "EnumMigrationRule" + }, + { + "name": "ProtectionLevel", + "type": "Server.Items.ArmorProtectionLevel", + "usesSaveFlag": true, + "rule": "EnumMigrationRule" + }, + { + "name": "Resource", + "type": "Server.Items.CraftResource", + "usesSaveFlag": true, + "rule": "EnumMigrationRule" + }, + { + "name": "BaseArmorRating", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "StrBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "DexBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "IntBonus", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "StrRequirement", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "DexRequirement", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "IntRequirement", + "type": "int", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "MeditationAllowance", + "type": "Server.Items.ArmorMeditationAllowance", + "usesSaveFlag": true, + "rule": "EnumMigrationRule" + }, + { + "name": "SkillBonuses", + "type": "Server.AosSkillBonuses", + "usesSaveFlag": true, + "rule": "RawSerializableMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "PlayerConstructed", + "type": "bool", + "usesSaveFlag": true, + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DecorativePlateKabuto.v0.json b/Projects/UOContent/Migrations/Server.Items.DecorativePlateKabuto.v0.json new file mode 100644 index 000000000..af38322b9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DecorativePlateKabuto.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.DecorativePlateKabuto" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FemaleElvenPlateChest.v0.json b/Projects/UOContent/Migrations/Server.Items.FemaleElvenPlateChest.v0.json new file mode 100644 index 000000000..80373efd4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FemaleElvenPlateChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.FemaleElvenPlateChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FemalePlateChest.v0.json b/Projects/UOContent/Migrations/Server.Items.FemalePlateChest.v0.json new file mode 100644 index 000000000..87ea3a677 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FemalePlateChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.FemalePlateChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FemaleStuddedChest.v0.json b/Projects/UOContent/Migrations/Server.Items.FemaleStuddedChest.v0.json new file mode 100644 index 000000000..6b63d3164 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FemaleStuddedChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.FemaleStuddedChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType1.v0.json new file mode 100644 index 000000000..6f1985513 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedArmsType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType2.v0.json new file mode 100644 index 000000000..950efabf6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedArmsType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedArmsType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType1.v0.json new file mode 100644 index 000000000..e86d5228c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedChestType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType2.v0.json new file mode 100644 index 000000000..f5573cf4f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedChestType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedChestType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType1.v0.json new file mode 100644 index 000000000..a594cdbf5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedKiltType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType2.v0.json new file mode 100644 index 000000000..7b4f0d36c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedKiltType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedKiltType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType1.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType1.v0.json new file mode 100644 index 000000000..af449de68 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType1.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedLegsType1" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType2.v0.json b/Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType2.v0.json new file mode 100644 index 000000000..2f286fc9a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GargishStuddedLegsType2.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GargishStuddedLegsType2" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HeavyPlateJingasa.v0.json b/Projects/UOContent/Migrations/Server.Items.HeavyPlateJingasa.v0.json new file mode 100644 index 000000000..fb8d582ff --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HeavyPlateJingasa.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.HeavyPlateJingasa" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HideChest.v0.json b/Projects/UOContent/Migrations/Server.Items.HideChest.v0.json new file mode 100644 index 000000000..adadee1b8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HideChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.HideChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HideFemaleChest.v0.json b/Projects/UOContent/Migrations/Server.Items.HideFemaleChest.v0.json new file mode 100644 index 000000000..28c6bb54c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HideFemaleChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.HideFemaleChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HideGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.HideGloves.v0.json new file mode 100644 index 000000000..ab6f2628f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HideGloves.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.HideGloves" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HideGorget.v0.json b/Projects/UOContent/Migrations/Server.Items.HideGorget.v0.json new file mode 100644 index 000000000..018eb89b2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HideGorget.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.HideGorget" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HidePants.v0.json b/Projects/UOContent/Migrations/Server.Items.HidePants.v0.json new file mode 100644 index 000000000..ae7e96542 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HidePants.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.HidePants" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.HidePauldrons.v0.json b/Projects/UOContent/Migrations/Server.Items.HidePauldrons.v0.json new file mode 100644 index 000000000..74162fac8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.HidePauldrons.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.HidePauldrons" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LightPlateJingasa.v0.json b/Projects/UOContent/Migrations/Server.Items.LightPlateJingasa.v0.json new file mode 100644 index 000000000..db5388d3a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LightPlateJingasa.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LightPlateJingasa" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateArms.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateArms.v0.json new file mode 100644 index 000000000..dae879b2c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateBattleKabuto.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateBattleKabuto.v0.json new file mode 100644 index 000000000..07ed059fd --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateBattleKabuto.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateBattleKabuto" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateChest.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateChest.v0.json new file mode 100644 index 000000000..e4a847178 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateDo.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateDo.v0.json new file mode 100644 index 000000000..d9827d7ba --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateDo.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateDo" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateGloves.v0.json new file mode 100644 index 000000000..d034a88ab --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateGloves.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateGloves" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateGorget.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateGorget.v0.json new file mode 100644 index 000000000..254e37ff2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateGorget.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateGorget" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateHaidate.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateHaidate.v0.json new file mode 100644 index 000000000..52c63230b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateHaidate.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateHaidate" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateHatsuburi.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateHatsuburi.v0.json new file mode 100644 index 000000000..03d330ec6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateHatsuburi.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateHatsuburi" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateHiroSode.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateHiroSode.v0.json new file mode 100644 index 000000000..c3b95926e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateHiroSode.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateHiroSode" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateLegs.v0.json new file mode 100644 index 000000000..96322ff06 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateLegs.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateLegs" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateMempo.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateMempo.v0.json new file mode 100644 index 000000000..2a3822c0c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateMempo.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateMempo" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.PlateSuneate.v0.json b/Projects/UOContent/Migrations/Server.Items.PlateSuneate.v0.json new file mode 100644 index 000000000..7d00c9ba7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.PlateSuneate.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.PlateSuneate" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RangerArms.v0.json b/Projects/UOContent/Migrations/Server.Items.RangerArms.v0.json new file mode 100644 index 000000000..b9e858f3a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RangerArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RangerArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RangerChest.v0.json b/Projects/UOContent/Migrations/Server.Items.RangerChest.v0.json new file mode 100644 index 000000000..d0779ce6e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RangerChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RangerChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RangerGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.RangerGloves.v0.json new file mode 100644 index 000000000..aa67c038a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RangerGloves.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RangerGloves" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RangerGorget.v0.json b/Projects/UOContent/Migrations/Server.Items.RangerGorget.v0.json new file mode 100644 index 000000000..e6802b815 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RangerGorget.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RangerGorget" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RangerLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.RangerLegs.v0.json new file mode 100644 index 000000000..1c72cbeb8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RangerLegs.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RangerLegs" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RingmailArms.v0.json b/Projects/UOContent/Migrations/Server.Items.RingmailArms.v0.json new file mode 100644 index 000000000..18d9bc80d --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RingmailArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RingmailArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RingmailChest.v0.json b/Projects/UOContent/Migrations/Server.Items.RingmailChest.v0.json new file mode 100644 index 000000000..65333d785 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RingmailChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RingmailChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RingmailGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.RingmailGloves.v0.json new file mode 100644 index 000000000..2adf1472b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RingmailGloves.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RingmailGloves" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RingmailLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.RingmailLegs.v0.json new file mode 100644 index 000000000..d0315574f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RingmailLegs.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RingmailLegs" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SmallPlateJingasa.v0.json b/Projects/UOContent/Migrations/Server.Items.SmallPlateJingasa.v0.json new file mode 100644 index 000000000..beb1738e8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SmallPlateJingasa.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.SmallPlateJingasa" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StandardPlateKabuto.v0.json b/Projects/UOContent/Migrations/Server.Items.StandardPlateKabuto.v0.json new file mode 100644 index 000000000..33b19594f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StandardPlateKabuto.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StandardPlateKabuto" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedArms.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedArms.v0.json new file mode 100644 index 000000000..f4376cf3e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedBustierArms.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedBustierArms.v0.json new file mode 100644 index 000000000..9c4c34441 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedBustierArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedBustierArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedChest.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedChest.v0.json new file mode 100644 index 000000000..79494f40e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedDo.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedDo.v0.json new file mode 100644 index 000000000..cf56a6fbb --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedDo.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedDo" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedGloves.v0.json new file mode 100644 index 000000000..58638c47e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedGloves.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedGloves" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedGorget.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedGorget.v0.json new file mode 100644 index 000000000..ef44ec956 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedGorget.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedGorget" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedHaidate.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedHaidate.v0.json new file mode 100644 index 000000000..fe3238f95 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedHaidate.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedHaidate" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedHiroSode.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedHiroSode.v0.json new file mode 100644 index 000000000..a74a18330 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedHiroSode.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedHiroSode" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedLegs.v0.json new file mode 100644 index 000000000..93295b654 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedLegs.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedLegs" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedMempo.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedMempo.v0.json new file mode 100644 index 000000000..63f636c93 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedMempo.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedMempo" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StuddedSuneate.v0.json b/Projects/UOContent/Migrations/Server.Items.StuddedSuneate.v0.json new file mode 100644 index 000000000..d51409677 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StuddedSuneate.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StuddedSuneate" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WoodlandArms.v0.json b/Projects/UOContent/Migrations/Server.Items.WoodlandArms.v0.json new file mode 100644 index 000000000..e31046c25 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WoodlandArms.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WoodlandArms" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WoodlandChest.v0.json b/Projects/UOContent/Migrations/Server.Items.WoodlandChest.v0.json new file mode 100644 index 000000000..d0319032b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WoodlandChest.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WoodlandChest" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WoodlandGloves.v0.json b/Projects/UOContent/Migrations/Server.Items.WoodlandGloves.v0.json new file mode 100644 index 000000000..3d9f19324 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WoodlandGloves.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WoodlandGloves" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WoodlandGorget.v0.json b/Projects/UOContent/Migrations/Server.Items.WoodlandGorget.v0.json new file mode 100644 index 000000000..70249b0f4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WoodlandGorget.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WoodlandGorget" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WoodlandLegs.v0.json b/Projects/UOContent/Migrations/Server.Items.WoodlandLegs.v0.json new file mode 100644 index 000000000..691a76dd0 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WoodlandLegs.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WoodlandLegs" +} \ No newline at end of file