From 75d8a5147ce21e191e85996612cbd94fb801c167 Mon Sep 17 00:00:00 2001 From: Arutosio <30377429+Arutosio@users.noreply.github.com> Date: Thu, 22 Dec 2022 05:35:18 +0100 Subject: [PATCH] fix: Changes on Vendors>NPC>Guildmasters to use code generation (#1307) --- .../Server.Mobiles.BardGuildmaster.v0.json | 4 +++ .../Server.Mobiles.BaseGuildmaster.v0.json | 4 +++ .../Server.Mobiles.BaseMount.v0.json | 24 ++++++++++++++++++ ...rver.Mobiles.BlacksmithGuildmaster.v0.json | 4 +++ .../Server.Mobiles.FisherGuildmaster.v0.json | 4 +++ .../Server.Mobiles.HealerGuildmaster.v0.json | 4 +++ .../Server.Mobiles.MageGuildmaster.v0.json | 4 +++ ...Server.Mobiles.MerchantGuildmaster.v0.json | 4 +++ .../Server.Mobiles.MinerGuildmaster.v0.json | 4 +++ .../Server.Mobiles.RangerGuildmaster.v0.json | 4 +++ .../Server.Mobiles.SkeletalMount.v0.json | 4 +++ .../Server.Mobiles.TailorGuildmaster.v0.json | 4 +++ .../Server.Mobiles.ThiefGuildmaster.v0.json | 4 +++ .../Server.Mobiles.TinkerGuildmaster.v0.json | 4 +++ .../Server.Mobiles.WarriorGuildmaster.v0.json | 4 +++ .../NPC/Guildmasters/BardGuildmaster.cs | 22 +++------------- .../NPC/Guildmasters/BaseGuildmaster.cs | 22 +++------------- .../NPC/Guildmasters/BlacksmithGuildmaster.cs | 22 +++------------- .../NPC/Guildmasters/FisherGuildmaster.cs | 23 +++-------------- .../NPC/Guildmasters/HealerGuildmaster.cs | 22 +++------------- .../NPC/Guildmasters/MageGuildmaster.cs | 22 +++------------- .../NPC/Guildmasters/MerchantGuildmaster.cs | 23 +++-------------- .../NPC/Guildmasters/MinerGuildmaster.cs | 25 +++---------------- .../NPC/Guildmasters/RangerGuildmaster.cs | 23 +++-------------- .../NPC/Guildmasters/TailorGuildmaster.cs | 23 +++-------------- .../NPC/Guildmasters/ThiefGuildmaster.cs | 22 +++------------- .../NPC/Guildmasters/TinkerGuildmaster.cs | 22 +++------------- .../NPC/Guildmasters/WarriorGuildmaster.cs | 23 +++-------------- 28 files changed, 126 insertions(+), 248 deletions(-) create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.BardGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.BaseGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.BaseMount.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.BlacksmithGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.FisherGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.HealerGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.MageGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.MerchantGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.MinerGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.RangerGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.SkeletalMount.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.TailorGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.ThiefGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.TinkerGuildmaster.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Mobiles.WarriorGuildmaster.v0.json diff --git a/Projects/UOContent/Migrations/Server.Mobiles.BardGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.BardGuildmaster.v0.json new file mode 100644 index 000000000..09668f6e7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.BardGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.BardGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.BaseGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.BaseGuildmaster.v0.json new file mode 100644 index 000000000..f15a6ed10 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.BaseGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.BaseGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.BaseMount.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.BaseMount.v0.json new file mode 100644 index 000000000..b91c775a4 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.BaseMount.v0.json @@ -0,0 +1,24 @@ +{ + "version": 0, + "type": "Server.Mobiles.BaseMount", + "properties": [ + { + "name": "NextMountAbility", + "type": "System.DateTime", + "rule": "PrimitiveTypeMigrationRule", + "ruleArguments": [ + "" + ] + }, + { + "name": "Rider", + "type": "Server.Mobile", + "rule": "SerializableInterfaceMigrationRule" + }, + { + "name": "InternalItem", + "type": "Server.Item", + "rule": "SerializableInterfaceMigrationRule" + } + ] +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.BlacksmithGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.BlacksmithGuildmaster.v0.json new file mode 100644 index 000000000..98b3a250c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.BlacksmithGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.BlacksmithGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.FisherGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.FisherGuildmaster.v0.json new file mode 100644 index 000000000..486bf5629 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.FisherGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.FisherGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.HealerGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.HealerGuildmaster.v0.json new file mode 100644 index 000000000..e1f78b010 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.HealerGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.HealerGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.MageGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.MageGuildmaster.v0.json new file mode 100644 index 000000000..5119fa9d1 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.MageGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.MageGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.MerchantGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.MerchantGuildmaster.v0.json new file mode 100644 index 000000000..de7804b98 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.MerchantGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.MerchantGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.MinerGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.MinerGuildmaster.v0.json new file mode 100644 index 000000000..a11c6a692 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.MinerGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.MinerGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.RangerGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.RangerGuildmaster.v0.json new file mode 100644 index 000000000..b80775d7c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.RangerGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.RangerGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.SkeletalMount.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.SkeletalMount.v0.json new file mode 100644 index 000000000..cb97d933d --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.SkeletalMount.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.SkeletalMount" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.TailorGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.TailorGuildmaster.v0.json new file mode 100644 index 000000000..96941114f --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.TailorGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.TailorGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.ThiefGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.ThiefGuildmaster.v0.json new file mode 100644 index 000000000..9267c1aa7 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.ThiefGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.ThiefGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.TinkerGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.TinkerGuildmaster.v0.json new file mode 100644 index 000000000..7a16e4dd9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.TinkerGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.TinkerGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Mobiles.WarriorGuildmaster.v0.json b/Projects/UOContent/Migrations/Server.Mobiles.WarriorGuildmaster.v0.json new file mode 100644 index 000000000..0f43aa659 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Mobiles.WarriorGuildmaster.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Mobiles.WarriorGuildmaster" +} \ No newline at end of file diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs index 1df1f50fc..64fa99762 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs @@ -1,6 +1,9 @@ +using ModernUO.Serialization; + namespace Server.Mobiles { - public class BardGuildmaster : BaseGuildmaster + [SerializationGenerator(0,false)] + public partial class BardGuildmaster : BaseGuildmaster { [Constructible] public BardGuildmaster() : base("bard") @@ -13,24 +16,7 @@ namespace Server.Mobiles SetSkill(SkillName.Swords, 80.0, 100.0); } - public BardGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.BardsGuild; - 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/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs index 4a8666ec0..0003d144b 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs @@ -2,18 +2,16 @@ using System; using System.Collections.Generic; using Server.Items; using Server.Network; +using ModernUO.Serialization; namespace Server.Mobiles { - public abstract class BaseGuildmaster : BaseVendor + [SerializationGenerator(0, false)] + public abstract partial class BaseGuildmaster : BaseVendor { public BaseGuildmaster(string title) : base(title) => Title = $"the {title} {(Female ? "guildmistress" : "guildmaster")}"; - public BaseGuildmaster(Serial serial) : base(serial) - { - } - protected override List SBInfos { get; } = new(); public override bool IsActiveVendor => false; @@ -162,19 +160,5 @@ namespace Server.Mobiles return base.OnGoldGiven(from, dropped); } - - 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/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs index 9c4e59811..cfc6baf8c 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs @@ -1,8 +1,10 @@ +using ModernUO.Serialization; using Server.Items; namespace Server.Mobiles { - public class BlacksmithGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class BlacksmithGuildmaster : BaseGuildmaster { [Constructible] public BlacksmithGuildmaster() : base("blacksmith") @@ -13,10 +15,6 @@ namespace Server.Mobiles SetSkill(SkillName.Parry, 36.0, 68.0); } - public BlacksmithGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.BlacksmithsGuild; public override bool IsActiveVendor => true; @@ -50,19 +48,5 @@ namespace Server.Mobiles AddItem(new Bascinet()); AddItem(new SmithHammer()); } - - 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/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs index 03a4ff217..ee6d69a6d 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs @@ -1,6 +1,9 @@ +using ModernUO.Serialization; + namespace Server.Mobiles { - public class FisherGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class FisherGuildmaster : BaseGuildmaster { [Constructible] public FisherGuildmaster() : base("fisher") @@ -8,24 +11,6 @@ namespace Server.Mobiles SetSkill(SkillName.Fishing, 80.0, 100.0); } - public FisherGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.FishermensGuild; - - 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/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs index 0b19e11bf..453cc8ba3 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs @@ -1,8 +1,10 @@ +using ModernUO.Serialization; using Server.Items; namespace Server.Mobiles { - public class HealerGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class HealerGuildmaster : BaseGuildmaster { [Constructible] public HealerGuildmaster() : base("healer") @@ -14,10 +16,6 @@ namespace Server.Mobiles SetSkill(SkillName.SpiritSpeak, 65.0, 88.0); } - public HealerGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.HealersGuild; public override VendorShoeType ShoeType => VendorShoeType.Sandals; @@ -28,19 +26,5 @@ namespace Server.Mobiles AddItem(new Robe(Utility.RandomYellowHue())); } - - 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/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs index c4e65addd..7af705a37 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs @@ -1,8 +1,10 @@ +using ModernUO.Serialization; using Server.Items; namespace Server.Mobiles { - public class MageGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class MageGuildmaster : BaseGuildmaster { [Constructible] public MageGuildmaster() : base("mage") @@ -16,10 +18,6 @@ namespace Server.Mobiles SetSkill(SkillName.Macing, 36.0, 68.0); } - public MageGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.MagesGuild; public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; @@ -31,19 +29,5 @@ namespace Server.Mobiles AddItem(new Robe(Utility.RandomBlueHue())); AddItem(new GnarledStaff()); } - - 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/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs index 64ddbebde..1d7c28dc6 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs @@ -1,6 +1,9 @@ +using ModernUO.Serialization; + namespace Server.Mobiles { - public class MerchantGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class MerchantGuildmaster : BaseGuildmaster { [Constructible] public MerchantGuildmaster() : base("merchant") @@ -9,24 +12,6 @@ namespace Server.Mobiles SetSkill(SkillName.ArmsLore, 85.0, 100.0); } - public MerchantGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.MerchantsGuild; - - 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/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs index a0cfdcc2f..bffa7e2f7 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs @@ -1,6 +1,9 @@ +using ModernUO.Serialization; + namespace Server.Mobiles { - public class MinerGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class MinerGuildmaster : BaseGuildmaster { [Constructible] public MinerGuildmaster() : base("miner") @@ -8,25 +11,5 @@ namespace Server.Mobiles SetSkill(SkillName.ItemID, 60.0, 83.0); SetSkill(SkillName.Mining, 90.0, 100.0); } - - public MinerGuildmaster(Serial serial) : base(serial) - { - } - - public override NpcGuild NpcGuild => NpcGuild.MinersGuild; - - 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/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs index f77318d54..3c1b31d7e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs @@ -1,6 +1,9 @@ +using ModernUO.Serialization; + namespace Server.Mobiles { - public class RangerGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class RangerGuildmaster : BaseGuildmaster { [Constructible] public RangerGuildmaster() : base("ranger") @@ -18,24 +21,6 @@ namespace Server.Mobiles SetSkill(SkillName.Swords, 45.0, 68.0); } - public RangerGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.RangersGuild; - - 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/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs index 713afdf80..2a639841c 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs @@ -1,6 +1,9 @@ +using ModernUO.Serialization; + namespace Server.Mobiles { - public class TailorGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class TailorGuildmaster : BaseGuildmaster { [Constructible] public TailorGuildmaster() : base("tailor") @@ -8,24 +11,6 @@ namespace Server.Mobiles SetSkill(SkillName.Tailoring, 90.0, 100.0); } - public TailorGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.TailorsGuild; - - 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/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs index f9712f7c2..cf9036299 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs @@ -1,9 +1,11 @@ +using ModernUO.Serialization; using System; using Server.Items; namespace Server.Mobiles { - public class ThiefGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class ThiefGuildmaster : BaseGuildmaster { [Constructible] public ThiefGuildmaster() : base("thief") @@ -19,10 +21,6 @@ namespace Server.Mobiles SetSkill(SkillName.RemoveTrap, 85.0, 100.0); } - public ThiefGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.ThievesGuild; public override TimeSpan JoinAge => TimeSpan.FromDays(7.0); @@ -115,19 +113,5 @@ namespace Server.Mobiles return base.OnGoldGiven(from, dropped); } - - 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/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs index 312ec5695..01331944e 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs @@ -1,10 +1,12 @@ +using ModernUO.Serialization; using System.Collections.Generic; using Server.ContextMenus; using Server.Items; namespace Server.Mobiles { - public class TinkerGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class TinkerGuildmaster : BaseGuildmaster { [Constructible] public TinkerGuildmaster() : base("tinker") @@ -14,26 +16,8 @@ namespace Server.Mobiles SetSkill(SkillName.RemoveTrap, 85.0, 100.0); } - public TinkerGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.TinkersGuild; - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } - public override void AddCustomContextEntries(Mobile from, List list) { if (Core.ML && from.Alive) diff --git a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs index 4b9be9a1e..5d571db05 100644 --- a/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs +++ b/Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs @@ -1,6 +1,9 @@ +using ModernUO.Serialization; + namespace Server.Mobiles { - public class WarriorGuildmaster : BaseGuildmaster + [SerializationGenerator(0, false)] + public partial class WarriorGuildmaster : BaseGuildmaster { [Constructible] public WarriorGuildmaster() : base("warrior") @@ -14,24 +17,6 @@ namespace Server.Mobiles SetSkill(SkillName.Fencing, 60.0, 83.0); } - public WarriorGuildmaster(Serial serial) : base(serial) - { - } - public override NpcGuild NpcGuild => NpcGuild.WarriorsGuild; - - 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(); - } } }