warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Changes on Vendors>NPC>Guildmasters to use code generation (#1307)

Browse source
This commit is contained in:
Arutosio 2022-12-22 05:35:18 +01:00 • committed by GitHub
parent 6eebf358da
commit 75d8a5147c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 126 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Migrations/Server.Mobiles.BardGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.BardGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.BaseGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.BaseGuildmaster"
}

24
Projects/UOContent/Migrations/Server.Mobiles.BaseMount.v0.json Normal file
View file

@ -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"
}
]
}

4
Projects/UOContent/Migrations/Server.Mobiles.BlacksmithGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.BlacksmithGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.FisherGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.FisherGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.HealerGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.HealerGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.MageGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.MageGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.MerchantGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.MerchantGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.MinerGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.MinerGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.RangerGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.RangerGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.SkeletalMount.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SkeletalMount"
}

4
Projects/UOContent/Migrations/Server.Mobiles.TailorGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.TailorGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.ThiefGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.ThiefGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.TinkerGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.TinkerGuildmaster"
}

4
Projects/UOContent/Migrations/Server.Mobiles.WarriorGuildmaster.v0.json Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.WarriorGuildmaster"
}

22
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BardGuildmaster.cs
View file

@ -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();
}
}
}

22
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -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<SBInfo> 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();
}
}
}

22
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs
View file

@ -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();
}
}
}

23
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/FisherGuildmaster.cs
View file

@ -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();
}
}
}

22
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs
View file

@ -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();
}
}
}

22
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs
View file

@ -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();
}
}
}

23
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MerchantGuildmaster.cs
View file

@ -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();
}
}
}

25
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/MinerGuildmaster.cs
View file

@ -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();
}
}
}

23
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/RangerGuildmaster.cs
View file

@ -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();
}
}
}

23
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TailorGuildmaster.cs
View file

@ -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();
}
}
}

22
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs
View file

@ -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();
}
}
}

22
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs
View file

@ -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<ContextMenuEntry> list)
{
if (Core.ML && from.Alive)

23
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/WarriorGuildmaster.cs
View file

@ -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();
}
}
}