From 957e5fd4e18d3b4b693788588ab09d528b136c2d Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sat, 21 Aug 2021 13:03:05 -0700 Subject: [PATCH] fix(codegen): Codegens champion artifacts (#713) --- .../Decorative/ArtifactLargeVase.cs | 21 ++----------- .../Decorative/ArtifactVase.cs | 21 ++----------- .../Decorative/DemonSkull.cs | 21 ++----------- .../Decorative/DirtPatch.cs | 21 ++----------- .../Decorative/EvilIdolSkull.cs | 21 ++----------- .../Champion Artifacts/Decorative/Futon.cs | 19 ++---------- .../Champion Artifacts/Decorative/LavaTile.cs | 21 ++----------- .../Champion Artifacts/Decorative/Pier.cs | 30 +++---------------- .../Decorative/SkullPole.cs | 21 ++----------- .../Decorative/SwampTile.cs | 21 ++----------- .../TatteredAncientMummyWrapping.cs | 21 ++----------- .../Decorative/WallBlood.cs | 21 ++----------- .../Decorative/WaterTile.cs | 21 ++----------- .../Champion Artifacts/Decorative/Web.cs | 27 +++-------------- .../Decorative/WindSpirit.cs | 21 ++----------- .../Shared/ANecromancerShroud.cs | 21 ++----------- .../Shared/BraveKnightOfTheBritannia.cs | 21 ++----------- .../Shared/CaptainJohnsHat.cs | 21 ++----------- .../Shared/DetectiveBoots.cs | 21 +++---------- .../Champion Artifacts/Shared/DjinnisRing.cs | 21 ++----------- .../Shared/EmbroideredOakLeafCloak.cs | 21 ++----------- .../Shared/GauntletsOfAnger.cs | 21 ++----------- .../LieutenantOfTheBritannianRoyalGuard.cs | 21 ++----------- .../Shared/OblivionsNeedle.cs | 21 ++----------- .../Shared/RoyalGuardSurvivalKnife.cs | 21 ++----------- .../Shared/SamaritanRobe.cs | 21 ++----------- .../Shared/TheMostKnowledgePerson.cs | 21 ++----------- .../Shared/TheRobeOfBritanniaAri.cs | 21 ++----------- .../Unique/AcidProofRobe.cs | 26 ++-------------- .../Items/Champion Artifacts/Unique/Calm.cs | 21 ++----------- .../Unique/CrownOfTalKeesh.cs | 21 ++----------- .../Champion Artifacts/Unique/FangOfRactus.cs | 21 ++----------- .../Unique/GladiatorsCollar.cs | 21 ++----------- .../Unique/OrcChieftainHelm.cs | 26 ++-------------- .../Items/Champion Artifacts/Unique/Pacify.cs | 21 ++----------- .../Items/Champion Artifacts/Unique/Quell.cs | 21 ++----------- .../Unique/ShroudOfDeceit.cs | 21 ++----------- .../Items/Champion Artifacts/Unique/Subdue.cs | 21 ++----------- .../Server.Items.ANecromancerShroud.v0.json | 4 +++ .../Server.Items.AcidProofRobe.v0.json | 4 +++ .../Server.Items.ArtifactLargeVase.v0.json | 4 +++ .../Server.Items.ArtifactVase.v0.json | 4 +++ ...er.Items.BraveKnightOfTheBritannia.v0.json | 4 +++ .../Migrations/Server.Items.Calm.v0.json | 4 +++ .../Server.Items.CaptainJohnsHat.v0.json | 4 +++ .../Server.Items.CrownOfTalKeesh.v0.json | 4 +++ .../Server.Items.DemonSkull.v0.json | 4 +++ .../Server.Items.DetectiveBoots.v0.json | 4 +++ .../Migrations/Server.Items.DirtPatch.v0.json | 4 +++ .../Server.Items.DjinnisRing.v0.json | 4 +++ ...rver.Items.EmbroideredOakLeafCloak.v0.json | 4 +++ .../Server.Items.EvilIdolSkull.v0.json | 4 +++ .../Server.Items.FangOfRactus.v0.json | 4 +++ .../Migrations/Server.Items.Futon.v0.json | 4 +++ .../Server.Items.GladiatorsCollar.v0.json | 4 +++ .../Server.Items.GuantletsOfAnger.v0.json | 4 +++ .../Migrations/Server.Items.LavaTile.v0.json | 4 +++ ...ieutenantOfTheBritannianRoyalGuard.v0.json | 4 +++ .../Server.Items.OblivionsNeedle.v0.json | 4 +++ .../Server.Items.OrcChieftainHelm.v0.json | 4 +++ .../Migrations/Server.Items.Pacify.v0.json | 4 +++ .../Migrations/Server.Items.Pier.v0.json | 4 +++ .../Migrations/Server.Items.Quell.v0.json | 4 +++ ...rver.Items.RoyalGuardSurvivalKnife.v0.json | 4 +++ .../Server.Items.SamaritanRobe.v0.json | 4 +++ .../Server.Items.ShroudOfDeciet.v0.json | 4 +++ .../Migrations/Server.Items.SkullPole.v0.json | 4 +++ .../Migrations/Server.Items.Subdue.v0.json | 4 +++ .../Migrations/Server.Items.SwampTile.v0.json | 4 +++ ...Items.TatteredAncientMummyWrapping.v0.json | 4 +++ ...erver.Items.TheMostKnowledgePerson.v0.json | 4 +++ ...Server.Items.TheRobeOfBritanniaAri.v0.json | 4 +++ .../Migrations/Server.Items.WallBlood.v0.json | 4 +++ .../Migrations/Server.Items.WaterTile.v0.json | 4 +++ .../Migrations/Server.Items.Web.v0.json | 4 +++ .../Server.Items.WindSpirit.v0.json | 4 +++ 76 files changed, 234 insertions(+), 739 deletions(-) create mode 100644 Projects/UOContent/Migrations/Server.Items.ANecromancerShroud.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.AcidProofRobe.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.ArtifactLargeVase.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.ArtifactVase.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.BraveKnightOfTheBritannia.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Calm.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.CaptainJohnsHat.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.CrownOfTalKeesh.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.DemonSkull.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.DetectiveBoots.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.DirtPatch.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.DjinnisRing.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.EmbroideredOakLeafCloak.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.EvilIdolSkull.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.FangOfRactus.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Futon.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GladiatorsCollar.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.GuantletsOfAnger.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.LavaTile.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.LieutenantOfTheBritannianRoyalGuard.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.OblivionsNeedle.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.OrcChieftainHelm.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Pacify.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Pier.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Quell.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.RoyalGuardSurvivalKnife.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.SamaritanRobe.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.ShroudOfDeciet.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.SkullPole.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Subdue.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.SwampTile.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.TatteredAncientMummyWrapping.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.TheMostKnowledgePerson.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.TheRobeOfBritanniaAri.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WallBlood.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WaterTile.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Web.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.WindSpirit.v0.json diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactLargeVase.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactLargeVase.cs index 2794f5198..8c54e75c3 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactLargeVase.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactLargeVase.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class ArtifactLargeVase : Item + [Serializable(0, false)] + public partial class ArtifactLargeVase : Item { [Constructible] public ArtifactLargeVase() : base(0x0B47) { } - - public ArtifactLargeVase(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactVase.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactVase.cs index 7c901f142..183fb8dd8 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactVase.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/ArtifactVase.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class ArtifactVase : Item + [Serializable(0, false)] + public partial class ArtifactVase : Item { [Constructible] public ArtifactVase() : base(0x0B48) { } - - public ArtifactVase(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/DemonSkull.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/DemonSkull.cs index 89fa7907c..2b80cff4a 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/DemonSkull.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/DemonSkull.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class DemonSkull : Item + [Serializable(0, false)] + public partial class DemonSkull : Item { [Constructible] public DemonSkull() : base(0x224e + Utility.Random(4)) { } - - public DemonSkull(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/DirtPatch.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/DirtPatch.cs index e15f2db6f..20ba1d3d0 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/DirtPatch.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/DirtPatch.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class DirtPatch : Item + [Serializable(0, false)] + public partial class DirtPatch : Item { [Constructible] public DirtPatch() : base(0x0913) { } - - public DirtPatch(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs index 1074e8a4e..1f04c447a 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/EvilIdolSkull.cs @@ -1,30 +1,13 @@ namespace Server.Items { - public class EvilIdolSkull : Item + [Serializable(0, false)] + public partial class EvilIdolSkull : Item { [Constructible] public EvilIdolSkull() : base(0x1F18) { } - public EvilIdolSkull(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1095237; // Evil Idol - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/Futon.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/Futon.cs index 8cf907157..6b60903b0 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/Futon.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/Futon.cs @@ -1,17 +1,14 @@ namespace Server.Items { [Flippable] - public class Futon : Item + [Serializable(0, false)] + public partial class Futon : Item { [Constructible] public Futon() : base(Utility.RandomDouble() > 0.5 ? 0x295C : 0x295E) { } - public Futon(Serial serial) : base(serial) - { - } - public void Flip() { ItemID = ItemID switch @@ -23,17 +20,5 @@ namespace Server.Items _ => ItemID }; } - - 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/Champion Artifacts/Decorative/LavaTile.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/LavaTile.cs index ad3caa8ef..1c5fa4861 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/LavaTile.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/LavaTile.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class LavaTile : Item + [Serializable(0, false)] + public partial class LavaTile : Item { [Constructible] public LavaTile() : base(0x12EE) { } - - public LavaTile(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/Pier.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/Pier.cs index ee6ef0d94..ab0fc2255 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/Pier.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/Pier.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class Pier : Item + [Serializable(0, false)] + public partial class Pier : Item { /* * This does not make a lot of sense, being a "Pier" @@ -15,15 +16,10 @@ namespace Server.Items * is kind of senseless, so it is what it is. * */ - - private static readonly int[] m_itemids = - { - 0x3486, 0x348b, 0x3ae - }; + private static readonly int[] ItemIds = { 0x3486, 0x348b, 0x3ae }; [Constructible] - public Pier() - : base(m_itemids[Utility.Random(3)]) + public Pier() : base(ItemIds[Utility.Random(3)]) { } @@ -31,23 +27,5 @@ namespace Server.Items : base(itemid) { } - - public Pier(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/SkullPole.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/SkullPole.cs index 5062e4b90..4263727e9 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/SkullPole.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/SkullPole.cs @@ -1,26 +1,9 @@ namespace Server.Items { - public class SkullPole : Item + [Serializable(0, false)] + public partial class SkullPole : Item { [Constructible] public SkullPole() : base(0x2204) => Weight = 5; - - public SkullPole(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/SwampTile.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/SwampTile.cs index 76e3e5899..40121b44b 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/SwampTile.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/SwampTile.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class SwampTile : Item + [Serializable(0, false)] + public partial class SwampTile : Item { [Constructible] public SwampTile() : base(0x320D) { } - - public SwampTile(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs index 81ea05fce..fbb942680 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/TatteredAncientMummyWrapping.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class TatteredAncientMummyWrapping : Item + [Serializable(0, false)] + public partial class TatteredAncientMummyWrapping : Item { [Constructible] public TatteredAncientMummyWrapping() : base(0xE21) => Hue = 0x909; - public TatteredAncientMummyWrapping(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094912; // Tattered Ancient Mummy Wrapping [Replica] - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/WallBlood.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/WallBlood.cs index 4f32ded0a..8c0aecbc0 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/WallBlood.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/WallBlood.cs @@ -1,29 +1,12 @@ namespace Server.Items { - public class WallBlood : Item + [Serializable(0, false)] + public partial class WallBlood : Item { [Constructible] public WallBlood() : base(Utility.RandomBool() ? 0x1D95 : 0x1D94) { } - - public WallBlood(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/WaterTile.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/WaterTile.cs index 786e4b1df..313491582 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/WaterTile.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/WaterTile.cs @@ -1,28 +1,11 @@ namespace Server.Items { - public class WaterTile : Item + [Serializable(0, false)] + public partial class WaterTile : Item { [Constructible] public WaterTile() : base(0x346E) { } - - public WaterTile(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/Web.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/Web.cs index 27d6c1332..75758ccfd 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/Web.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/Web.cs @@ -1,15 +1,12 @@ namespace Server.Items { - public class Web : Item + [Serializable(0, false)] + public partial class Web : Item { - private static readonly int[] m_itemids = - { - 0x10d7, 0x10d8, 0x10dd - }; + private static readonly int[] ItemIds = { 0x10d7, 0x10d8, 0x10dd }; [Constructible] - public Web() - : base(m_itemids[Utility.Random(3)]) + public Web() : base(ItemIds[Utility.Random(3)]) { } @@ -17,21 +14,5 @@ namespace Server.Items public Web(int itemid) : base(itemid) { } - - public Web(Serial serial) : base(serial) - { - } - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Decorative/WindSpirit.cs b/Projects/UOContent/Items/Champion Artifacts/Decorative/WindSpirit.cs index 3d48234dc..4fd415434 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Decorative/WindSpirit.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Decorative/WindSpirit.cs @@ -1,30 +1,13 @@ namespace Server.Items { - public class WindSpirit : Item + [Serializable(0, false)] + public partial class WindSpirit : Item { [Constructible] public WindSpirit() : base(0x1F1F) { } - public WindSpirit(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094925; // Wind Spirit [Replica] - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Shared/ANecromancerShroud.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/ANecromancerShroud.cs index 193021910..d668d63df 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/ANecromancerShroud.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/ANecromancerShroud.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class ANecromancerShroud : Robe + [Serializable(0, false)] + public partial class ANecromancerShroud : Robe { [Constructible] public ANecromancerShroud() => Hue = 0x455; - public ANecromancerShroud(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094913; // A Necromancer Shroud [Replica] public override int BaseColdResistance => 5; @@ -17,19 +14,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs index 8505b0508..bbcf01a26 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/BraveKnightOfTheBritannia.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class BraveKnightOfTheBritannia : Katana + [Serializable(0, false)] + public partial class BraveKnightOfTheBritannia : Katana { [Constructible] public BraveKnightOfTheBritannia() @@ -15,10 +16,6 @@ namespace Server.Items WeaponAttributes.HitLeechHits = 22; } - public BraveKnightOfTheBritannia(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094909; // Brave Knight of The Britannia [Replica] public override int InitMinHits => 150; @@ -37,19 +34,5 @@ namespace Server.Items pois = 10; nrgy = 20; } - - 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/Champion Artifacts/Shared/CaptainJohnsHat.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs index 2b719831d..08b0a775d 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/CaptainJohnsHat.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class CaptainJohnsHat : TricorneHat + [Serializable(0, false)] + public partial class CaptainJohnsHat : TricorneHat { [Constructible] public CaptainJohnsHat() @@ -15,10 +16,6 @@ namespace Server.Items SkillBonuses.Skill_1_Value = 20; } - public CaptainJohnsHat(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094911; // Captain John's Hat [Replica] public override int BasePhysicalResistance => 2; @@ -31,19 +28,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/DetectiveBoots.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/DetectiveBoots.cs index d4d62bc1f..5654d2f2d 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/DetectiveBoots.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/DetectiveBoots.cs @@ -2,7 +2,8 @@ using System; namespace Server.Items { - public class DetectiveBoots : Boots + [Serializable(0, false)] + public partial class DetectiveBoots : Boots { private int m_Level; @@ -13,10 +14,6 @@ namespace Server.Items Level = Utility.RandomMinMax(0, 2); } - public DetectiveBoots(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094894 + m_Level; // [Quality] Detective of the Royal Guard [Replica] public override int InitMinHits => 150; @@ -36,19 +33,9 @@ namespace Server.Items } } - public override void Serialize(IGenericWriter writer) + [AfterDeserialization] + private void AfterDeserialize() { - base.Serialize(writer); - - writer.Write(0); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - Level = Attributes.BonusInt - 2; } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Shared/DjinnisRing.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/DjinnisRing.cs index 01e9b84a3..b43cf24eb 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/DjinnisRing.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/DjinnisRing.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class DjinnisRing : SilverRing + [Serializable(0, false)] + public partial class DjinnisRing : SilverRing { [Constructible] public DjinnisRing() @@ -10,27 +11,9 @@ namespace Server.Items Attributes.CastSpeed = 2; } - public DjinnisRing(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094927; // Djinni's Ring [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; - - 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/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs index 229b64778..0b7e24153 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/EmbroideredOakLeafCloak.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class EmbroideredOakLeafCloak : BaseOuterTorso + [Serializable(0, false)] + public partial class EmbroideredOakLeafCloak : BaseOuterTorso { [Constructible] public EmbroideredOakLeafCloak() : base(0x2684) @@ -12,29 +13,11 @@ namespace Server.Items SkillBonuses.Skill_1_Value = 5; } - public EmbroideredOakLeafCloak(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094901; // Embroidered Oak Leaf Cloak [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/GauntletsOfAnger.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs index badc1fe8b..2c5bc40ec 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/GauntletsOfAnger.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class GuantletsOfAnger : PlateGloves + [Serializable(0, false)] + public partial class GuantletsOfAnger : PlateGloves { [Constructible] public GuantletsOfAnger() @@ -12,10 +13,6 @@ namespace Server.Items Attributes.DefendChance = 10; } - public GuantletsOfAnger(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094902; // Gauntlets of Anger [Replica] public override int BasePhysicalResistance => 4; @@ -28,19 +25,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs index 4bad9d370..5dad1988a 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/LieutenantOfTheBritannianRoyalGuard.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class LieutenantOfTheBritannianRoyalGuard : BodySash + [Serializable(0, false)] + public partial class LieutenantOfTheBritannianRoyalGuard : BodySash { [Constructible] public LieutenantOfTheBritannianRoyalGuard() @@ -12,29 +13,11 @@ namespace Server.Items Attributes.LowerRegCost = 10; } - public LieutenantOfTheBritannianRoyalGuard(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094910; // Lieutenant of the Britannian Royal Guard [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/OblivionsNeedle.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/OblivionsNeedle.cs index 91d2cb40b..38413d3a5 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/OblivionsNeedle.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/OblivionsNeedle.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class OblivionsNeedle : Dagger + [Serializable(0, false)] + public partial class OblivionsNeedle : Dagger { [Constructible] public OblivionsNeedle() @@ -13,29 +14,11 @@ namespace Server.Items WeaponAttributes.HitLeechStam = 50; } - public OblivionsNeedle(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094916; // Oblivion's Needle [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs index 51694f6f4..386d03981 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/RoyalGuardSurvivalKnife.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class RoyalGuardSurvivalKnife : SkinningKnife + [Serializable(0, false)] + public partial class RoyalGuardSurvivalKnife : SkinningKnife { [Constructible] public RoyalGuardSurvivalKnife() @@ -13,29 +14,11 @@ namespace Server.Items WeaponAttributes.LowerStatReq = 50; } - public RoyalGuardSurvivalKnife(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094918; // Royal Guard Survival Knife [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/SamaritanRobe.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/SamaritanRobe.cs index ec082ea30..05d33aff1 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/SamaritanRobe.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/SamaritanRobe.cs @@ -1,14 +1,11 @@ namespace Server.Items { - public class SamaritanRobe : Robe + [Serializable(0, false)] + public partial class SamaritanRobe : Robe { [Constructible] public SamaritanRobe() => Hue = 0x2a3; - public SamaritanRobe(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094926; // Good Samaritan of Britannia [Replica] public override int BasePhysicalResistance => 5; @@ -17,19 +14,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Shared/TheMostKnowledgePerson.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs index b861a0b97..26e825c14 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/TheMostKnowledgePerson.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class TheMostKnowledgePerson : BaseOuterTorso + [Serializable(0, false)] + public partial class TheMostKnowledgePerson : BaseOuterTorso { [Constructible] public TheMostKnowledgePerson() : base(0x2684) @@ -11,10 +12,6 @@ namespace Server.Items Attributes.BonusHits = 3 + Utility.RandomMinMax(0, 2); } - public TheMostKnowledgePerson(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094893; // The Most Knowledge Person [Replica] public override int InitMinHits => 150; @@ -23,19 +20,5 @@ namespace Server.Items public override bool CanFortify => false; public override bool CanBeBlessed => 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/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs b/Projects/UOContent/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs index e05eda4c6..c9ebf2fa5 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Shared/TheRobeOfBritanniaAri.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class TheRobeOfBritanniaAri : BaseOuterTorso + [Serializable(0, false)] + public partial class TheRobeOfBritanniaAri : BaseOuterTorso { [Constructible] public TheRobeOfBritanniaAri() : base(0x2684) @@ -9,10 +10,6 @@ namespace Server.Items StrRequirement = 0; } - public TheRobeOfBritanniaAri(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094931; // The Robe of Britannia "Ari" [Replica] public override int BasePhysicalResistance => 10; @@ -21,19 +18,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/AcidProofRobe.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/AcidProofRobe.cs index 202241f2a..5da7d1c85 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/AcidProofRobe.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/AcidProofRobe.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class AcidProofRobe : Robe + [Serializable(0, false)] + public partial class AcidProofRobe : Robe { [Constructible] public AcidProofRobe() @@ -9,10 +10,6 @@ namespace Server.Items LootType = LootType.Blessed; } - public AcidProofRobe(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1095236; // Acid-Proof Robe [Replica] public override int BaseFireResistance => 4; @@ -21,24 +18,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1 && Hue == 1) - { - Hue = 0x455; - } - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Unique/Calm.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/Calm.cs index 070ffb035..7c22325c7 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/Calm.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/Calm.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class Calm : Halberd + [Serializable(0, false)] + public partial class Calm : Halberd { [Constructible] public Calm() @@ -15,29 +16,11 @@ namespace Server.Items WeaponAttributes.UseBestSkill = 1; } - public Calm(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094915; // Calm [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/CrownOfTalKeesh.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs index 113febe03..483529384 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/CrownOfTalKeesh.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class CrownOfTalKeesh : Bandana + [Serializable(0, false)] + public partial class CrownOfTalKeesh : Bandana { [Constructible] public CrownOfTalKeesh() @@ -12,10 +13,6 @@ namespace Server.Items Attributes.SpellDamage = 10; } - public CrownOfTalKeesh(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094903; // Crown of Tal'Keesh [Replica] public override int BasePhysicalResistance => 0; @@ -28,19 +25,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/FangOfRactus.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/FangOfRactus.cs index 3cd5a85a5..6586b7216 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/FangOfRactus.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/FangOfRactus.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class FangOfRactus : Kryss + [Serializable(0, false)] + public partial class FangOfRactus : Kryss { [Constructible] public FangOfRactus() @@ -16,29 +17,11 @@ namespace Server.Items WeaponAttributes.ResistPoisonBonus = 15; } - public FangOfRactus(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094892; // Fang of Ractus [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/GladiatorsCollar.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/GladiatorsCollar.cs index 6e6d345cc..197b7f9af 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/GladiatorsCollar.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/GladiatorsCollar.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class GladiatorsCollar : PlateGorget + [Serializable(0, false)] + public partial class GladiatorsCollar : PlateGorget { [Constructible] public GladiatorsCollar() @@ -13,10 +14,6 @@ namespace Server.Items ArmorAttributes.MageArmor = 1; } - public GladiatorsCollar(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094917; // Gladiator's Collar [Replica] public override int BasePhysicalResistance => 18; @@ -29,19 +26,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/OrcChieftainHelm.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs index 2552b27c1..ebd3a5c79 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/OrcChieftainHelm.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class OrcChieftainHelm : OrcHelm + [Serializable(0, false)] + public partial class OrcChieftainHelm : OrcHelm { [Constructible] public OrcChieftainHelm() @@ -20,10 +21,6 @@ namespace Server.Items } } - public OrcChieftainHelm(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094924; // Orc Chieftain Helm [Replica] public override int BasePhysicalResistance => 23; @@ -36,24 +33,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => false; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(1); - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - - if (version < 1 && Hue == 0x3f) /* Pigmented? */ - { - Hue = 0x2a3; - } - } } } diff --git a/Projects/UOContent/Items/Champion Artifacts/Unique/Pacify.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/Pacify.cs index 5b9ec9a68..c78ac17f7 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/Pacify.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/Pacify.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class Pacify : Pike + [Serializable(0, false)] + public partial class Pacify : Pike { [Constructible] public Pacify() @@ -16,29 +17,11 @@ namespace Server.Items WeaponAttributes.UseBestSkill = 1; } - public Pacify(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094929; // Pacify [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/Quell.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/Quell.cs index cff8535eb..821c2b5f6 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/Quell.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/Quell.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class Quell : Bardiche + [Serializable(0, false)] + public partial class Quell : Bardiche { [Constructible] public Quell() @@ -16,29 +17,11 @@ namespace Server.Items WeaponAttributes.UseBestSkill = 1; } - public Quell(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094928; // Quell [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/ShroudOfDeceit.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs index a8b21b825..83c94194c 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/ShroudOfDeceit.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class ShroudOfDeciet : BoneChest + [Serializable(0, false)] + public partial class ShroudOfDeciet : BoneChest { [Constructible] public ShroudOfDeciet() @@ -15,10 +16,6 @@ namespace Server.Items SkillBonuses.Skill_1_Value = 10; } - public ShroudOfDeciet(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094914; // Shroud of Deceit [Replica] public override int BasePhysicalResistance => 11; @@ -31,19 +28,5 @@ namespace Server.Items public override int InitMaxHits => 150; public override bool CanFortify => 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/Champion Artifacts/Unique/Subdue.cs b/Projects/UOContent/Items/Champion Artifacts/Unique/Subdue.cs index c19278b08..61b3efc9e 100644 --- a/Projects/UOContent/Items/Champion Artifacts/Unique/Subdue.cs +++ b/Projects/UOContent/Items/Champion Artifacts/Unique/Subdue.cs @@ -1,6 +1,7 @@ namespace Server.Items { - public class Subdue : Scythe + [Serializable(0, false)] + public partial class Subdue : Scythe { [Constructible] public Subdue() @@ -16,29 +17,11 @@ namespace Server.Items WeaponAttributes.UseBestSkill = 1; } - public Subdue(Serial serial) : base(serial) - { - } - public override int LabelNumber => 1094930; // Subdue [Replica] public override int InitMinHits => 150; public override int InitMaxHits => 150; public override bool CanFortify => 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/Migrations/Server.Items.ANecromancerShroud.v0.json b/Projects/UOContent/Migrations/Server.Items.ANecromancerShroud.v0.json new file mode 100644 index 000000000..71f78209c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ANecromancerShroud.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.ANecromancerShroud" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.AcidProofRobe.v0.json b/Projects/UOContent/Migrations/Server.Items.AcidProofRobe.v0.json new file mode 100644 index 000000000..a45f543f4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.AcidProofRobe.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.AcidProofRobe" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ArtifactLargeVase.v0.json b/Projects/UOContent/Migrations/Server.Items.ArtifactLargeVase.v0.json new file mode 100644 index 000000000..e112ff3fc --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ArtifactLargeVase.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.ArtifactLargeVase" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ArtifactVase.v0.json b/Projects/UOContent/Migrations/Server.Items.ArtifactVase.v0.json new file mode 100644 index 000000000..0bc233434 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ArtifactVase.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.ArtifactVase" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.BraveKnightOfTheBritannia.v0.json b/Projects/UOContent/Migrations/Server.Items.BraveKnightOfTheBritannia.v0.json new file mode 100644 index 000000000..02de9ab5e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.BraveKnightOfTheBritannia.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.BraveKnightOfTheBritannia" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Calm.v0.json b/Projects/UOContent/Migrations/Server.Items.Calm.v0.json new file mode 100644 index 000000000..67bafa646 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Calm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Calm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.CaptainJohnsHat.v0.json b/Projects/UOContent/Migrations/Server.Items.CaptainJohnsHat.v0.json new file mode 100644 index 000000000..65dd740a8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.CaptainJohnsHat.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.CaptainJohnsHat" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.CrownOfTalKeesh.v0.json b/Projects/UOContent/Migrations/Server.Items.CrownOfTalKeesh.v0.json new file mode 100644 index 000000000..fa6a7514f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.CrownOfTalKeesh.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.CrownOfTalKeesh" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DemonSkull.v0.json b/Projects/UOContent/Migrations/Server.Items.DemonSkull.v0.json new file mode 100644 index 000000000..fe5583699 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DemonSkull.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.DemonSkull" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DetectiveBoots.v0.json b/Projects/UOContent/Migrations/Server.Items.DetectiveBoots.v0.json new file mode 100644 index 000000000..f318039b9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DetectiveBoots.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.DetectiveBoots" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DirtPatch.v0.json b/Projects/UOContent/Migrations/Server.Items.DirtPatch.v0.json new file mode 100644 index 000000000..a9f5c9d57 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DirtPatch.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.DirtPatch" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.DjinnisRing.v0.json b/Projects/UOContent/Migrations/Server.Items.DjinnisRing.v0.json new file mode 100644 index 000000000..4ea8ea857 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.DjinnisRing.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.DjinnisRing" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.EmbroideredOakLeafCloak.v0.json b/Projects/UOContent/Migrations/Server.Items.EmbroideredOakLeafCloak.v0.json new file mode 100644 index 000000000..db4e977d5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.EmbroideredOakLeafCloak.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.EmbroideredOakLeafCloak" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.EvilIdolSkull.v0.json b/Projects/UOContent/Migrations/Server.Items.EvilIdolSkull.v0.json new file mode 100644 index 000000000..8d14ff422 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.EvilIdolSkull.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.EvilIdolSkull" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.FangOfRactus.v0.json b/Projects/UOContent/Migrations/Server.Items.FangOfRactus.v0.json new file mode 100644 index 000000000..1444d22a5 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.FangOfRactus.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.FangOfRactus" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Futon.v0.json b/Projects/UOContent/Migrations/Server.Items.Futon.v0.json new file mode 100644 index 000000000..ff86a098f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Futon.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Futon" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GladiatorsCollar.v0.json b/Projects/UOContent/Migrations/Server.Items.GladiatorsCollar.v0.json new file mode 100644 index 000000000..2af8ee0fb --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GladiatorsCollar.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GladiatorsCollar" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.GuantletsOfAnger.v0.json b/Projects/UOContent/Migrations/Server.Items.GuantletsOfAnger.v0.json new file mode 100644 index 000000000..e532ff63b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.GuantletsOfAnger.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.GuantletsOfAnger" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LavaTile.v0.json b/Projects/UOContent/Migrations/Server.Items.LavaTile.v0.json new file mode 100644 index 000000000..a082b6d8f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LavaTile.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LavaTile" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.LieutenantOfTheBritannianRoyalGuard.v0.json b/Projects/UOContent/Migrations/Server.Items.LieutenantOfTheBritannianRoyalGuard.v0.json new file mode 100644 index 000000000..c350f8650 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.LieutenantOfTheBritannianRoyalGuard.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.LieutenantOfTheBritannianRoyalGuard" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.OblivionsNeedle.v0.json b/Projects/UOContent/Migrations/Server.Items.OblivionsNeedle.v0.json new file mode 100644 index 000000000..9461e6e1a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.OblivionsNeedle.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.OblivionsNeedle" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.OrcChieftainHelm.v0.json b/Projects/UOContent/Migrations/Server.Items.OrcChieftainHelm.v0.json new file mode 100644 index 000000000..d4176cff9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.OrcChieftainHelm.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.OrcChieftainHelm" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Pacify.v0.json b/Projects/UOContent/Migrations/Server.Items.Pacify.v0.json new file mode 100644 index 000000000..2477b91db --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Pacify.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Pacify" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Pier.v0.json b/Projects/UOContent/Migrations/Server.Items.Pier.v0.json new file mode 100644 index 000000000..892ff157a --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Pier.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Pier" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Quell.v0.json b/Projects/UOContent/Migrations/Server.Items.Quell.v0.json new file mode 100644 index 000000000..adec8293b --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Quell.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Quell" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.RoyalGuardSurvivalKnife.v0.json b/Projects/UOContent/Migrations/Server.Items.RoyalGuardSurvivalKnife.v0.json new file mode 100644 index 000000000..362ad2755 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.RoyalGuardSurvivalKnife.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.RoyalGuardSurvivalKnife" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SamaritanRobe.v0.json b/Projects/UOContent/Migrations/Server.Items.SamaritanRobe.v0.json new file mode 100644 index 000000000..8f06caf2c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SamaritanRobe.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.SamaritanRobe" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.ShroudOfDeciet.v0.json b/Projects/UOContent/Migrations/Server.Items.ShroudOfDeciet.v0.json new file mode 100644 index 000000000..e43b24b96 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.ShroudOfDeciet.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.ShroudOfDeciet" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SkullPole.v0.json b/Projects/UOContent/Migrations/Server.Items.SkullPole.v0.json new file mode 100644 index 000000000..efea04842 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SkullPole.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.SkullPole" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Subdue.v0.json b/Projects/UOContent/Migrations/Server.Items.Subdue.v0.json new file mode 100644 index 000000000..7027144a4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Subdue.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Subdue" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.SwampTile.v0.json b/Projects/UOContent/Migrations/Server.Items.SwampTile.v0.json new file mode 100644 index 000000000..f72721d6f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.SwampTile.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.SwampTile" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TatteredAncientMummyWrapping.v0.json b/Projects/UOContent/Migrations/Server.Items.TatteredAncientMummyWrapping.v0.json new file mode 100644 index 000000000..7bb3de600 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TatteredAncientMummyWrapping.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.TatteredAncientMummyWrapping" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TheMostKnowledgePerson.v0.json b/Projects/UOContent/Migrations/Server.Items.TheMostKnowledgePerson.v0.json new file mode 100644 index 000000000..0d197fdf3 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TheMostKnowledgePerson.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.TheMostKnowledgePerson" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.TheRobeOfBritanniaAri.v0.json b/Projects/UOContent/Migrations/Server.Items.TheRobeOfBritanniaAri.v0.json new file mode 100644 index 000000000..408032c54 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.TheRobeOfBritanniaAri.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.TheRobeOfBritanniaAri" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WallBlood.v0.json b/Projects/UOContent/Migrations/Server.Items.WallBlood.v0.json new file mode 100644 index 000000000..62c328bdb --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WallBlood.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WallBlood" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WaterTile.v0.json b/Projects/UOContent/Migrations/Server.Items.WaterTile.v0.json new file mode 100644 index 000000000..e31e6424c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WaterTile.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WaterTile" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Web.v0.json b/Projects/UOContent/Migrations/Server.Items.Web.v0.json new file mode 100644 index 000000000..0756ff3bb --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Web.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Web" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.WindSpirit.v0.json b/Projects/UOContent/Migrations/Server.Items.WindSpirit.v0.json new file mode 100644 index 000000000..58a6233e2 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.WindSpirit.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.WindSpirit" +} \ No newline at end of file