From 0bcf7a8d01423f448da41e5d91b3154d68a77de9 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sun, 22 Aug 2021 15:36:26 -0700 Subject: [PATCH] fix: Fixes buying animals in UOR (#719) --- Projects/Server/Timer/Timer.Pool.cs | 2 +- .../Items/Special/Holiday/SnowGlobes.cs | 2 +- .../UOContent/Mobiles/Vendors/BaseVendor.cs | 2 ++ .../Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs | 24 +++++++++---------- .../Mobiles/Vendors/SBInfo/SBRancher.cs | 2 +- .../Mobiles/Vendors/SBInfo/SBRanger.cs | 8 +++---- .../Mobiles/Vendors/SBInfo/SBVeterinarian.cs | 8 +++---- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Projects/Server/Timer/Timer.Pool.cs b/Projects/Server/Timer/Timer.Pool.cs index 8c9864ae4..a7db9c273 100644 --- a/Projects/Server/Timer/Timer.Pool.cs +++ b/Projects/Server/Timer/Timer.Pool.cs @@ -49,7 +49,7 @@ namespace Server public static void ConfigureTimerPool() { - _poolCapacity = ServerConfiguration.GetOrUpdateSetting("timer.intialPoolCapacity", 1024); + _poolCapacity = ServerConfiguration.GetOrUpdateSetting("timer.initialPoolCapacity", 1024); _maxPoolCapacity = ServerConfiguration.GetOrUpdateSetting("timer.maxPoolCapacity", _poolCapacity * 16); RefillPool(_poolCapacity, out var head, out var tail); diff --git a/Projects/UOContent/Items/Special/Holiday/SnowGlobes.cs b/Projects/UOContent/Items/Special/Holiday/SnowGlobes.cs index 58086ff70..5f33ce97b 100644 --- a/Projects/UOContent/Items/Special/Holiday/SnowGlobes.cs +++ b/Projects/UOContent/Items/Special/Holiday/SnowGlobes.cs @@ -146,7 +146,7 @@ namespace Server.Items /* LakeofFire */ "Lake of Fire", /* Lakeshire */ "Lakeshire", /* PassofKarnaugh */ "Pass of Karnaugh", - /* TheEtherealFortress */ "The Etheral Fortress", + /* TheEtherealFortress */ "The Ethereal Fortress", /* TwinOaksTavern */ "Twin Oaks Tavern", /* ChaosShrine */ "Chaos Shrine", /* ShrineofHumility */ "Shrine of Humility", diff --git a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs index d60d3a6b6..1dffeb30d 100644 --- a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs +++ b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs @@ -865,6 +865,8 @@ namespace Server.Mobiles var list = new List(buyInfo.Length); var cont = BuyPack; + // If OPL is disabled and the item being purchased has the wrong name, then you must specify the name manually. + // Check SBAnimalTrainer for an example. var opls = ObjectPropertyList.Enabled ? new List(buyInfo.Length) : null; for (var idx = 0; idx < buyInfo.Length; idx++) diff --git a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs index 7f3155b3d..a76c24a75 100644 --- a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs +++ b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs @@ -12,21 +12,21 @@ namespace Server.Mobiles { public InternalBuyInfo() { - Add(new AnimalBuyInfo(1, typeof(Cat), 132, 10, 201, 0)); - Add(new AnimalBuyInfo(1, typeof(Dog), 170, 10, 217, 0)); - Add(new AnimalBuyInfo(1, typeof(Horse), 550, 10, 204, 0)); - Add(new AnimalBuyInfo(1, typeof(PackHorse), 631, 10, 291, 0)); - Add(new AnimalBuyInfo(1, typeof(PackLlama), 565, 10, 292, 0)); - Add(new AnimalBuyInfo(1, typeof(Rabbit), 106, 10, 205, 0)); + Add(new AnimalBuyInfo(1, "a cat", typeof(Cat), 132, 10, 201, 0)); + Add(new AnimalBuyInfo(1, "a dog", typeof(Dog), 170, 10, 217, 0)); + Add(new AnimalBuyInfo(1, "a horse", typeof(Horse), 550, 10, 204, 0)); + Add(new AnimalBuyInfo(1, "a pack horse", typeof(PackHorse), 631, 10, 291, 0)); + Add(new AnimalBuyInfo(1, "a pack llama", typeof(PackLlama), 565, 10, 292, 0)); + Add(new AnimalBuyInfo(1, "a rabbit", typeof(Rabbit), 106, 10, 205, 0)); if (!Core.AOS) { - Add(new AnimalBuyInfo(1, typeof(Eagle), 402, 10, 5, 0)); - Add(new AnimalBuyInfo(1, typeof(BrownBear), 855, 10, 167, 0)); - Add(new AnimalBuyInfo(1, typeof(GrizzlyBear), 1767, 10, 212, 0)); - Add(new AnimalBuyInfo(1, typeof(Panther), 1271, 10, 214, 0)); - Add(new AnimalBuyInfo(1, typeof(TimberWolf), 768, 10, 225, 0)); - Add(new AnimalBuyInfo(1, typeof(Rat), 107, 10, 238, 0)); + Add(new AnimalBuyInfo(1, "an eagle", typeof(Eagle), 402, 10, 5, 0)); + Add(new AnimalBuyInfo(1, "a brown bear", typeof(BrownBear), 855, 10, 167, 0)); + Add(new AnimalBuyInfo(1, "a grizzly bear", typeof(GrizzlyBear), 1767, 10, 212, 0)); + Add(new AnimalBuyInfo(1, "a panther", typeof(Panther), 1271, 10, 214, 0)); + Add(new AnimalBuyInfo(1, "a timber wolf", typeof(TimberWolf), 768, 10, 225, 0)); + Add(new AnimalBuyInfo(1, "a rat", typeof(Rat), 107, 10, 238, 0)); } } } diff --git a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRancher.cs b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRancher.cs index 209b161f2..8e4d01bde 100644 --- a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRancher.cs +++ b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRancher.cs @@ -12,7 +12,7 @@ namespace Server.Mobiles { public InternalBuyInfo() { - Add(new AnimalBuyInfo(1, typeof(PackHorse), 631, 10, 291, 0)); + Add(new AnimalBuyInfo(1, "a pack horse", typeof(PackHorse), 631, 10, 291, 0)); } } diff --git a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRanger.cs b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRanger.cs index ed1850589..c958ec728 100644 --- a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRanger.cs +++ b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBRanger.cs @@ -13,10 +13,10 @@ namespace Server.Mobiles { public InternalBuyInfo() { - Add(new AnimalBuyInfo(1, typeof(Cat), 138, 20, 201, 0)); - Add(new AnimalBuyInfo(1, typeof(Dog), 181, 20, 217, 0)); - Add(new AnimalBuyInfo(1, typeof(PackLlama), 491, 20, 292, 0)); - Add(new AnimalBuyInfo(1, typeof(PackHorse), 606, 20, 291, 0)); + Add(new AnimalBuyInfo(1, "a cat", typeof(Cat), 138, 20, 201, 0)); + Add(new AnimalBuyInfo(1, "a dog", typeof(Dog), 181, 20, 217, 0)); + Add(new AnimalBuyInfo(1, "a pack llama", typeof(PackLlama), 491, 20, 292, 0)); + Add(new AnimalBuyInfo(1, "a pack horse", typeof(PackHorse), 606, 20, 291, 0)); Add(new GenericBuyInfo(typeof(Bandage), 5, 20, 0xE21, 0)); } } diff --git a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBVeterinarian.cs b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBVeterinarian.cs index 146548533..0e693e9af 100644 --- a/Projects/UOContent/Mobiles/Vendors/SBInfo/SBVeterinarian.cs +++ b/Projects/UOContent/Mobiles/Vendors/SBInfo/SBVeterinarian.cs @@ -14,10 +14,10 @@ namespace Server.Mobiles public InternalBuyInfo() { Add(new GenericBuyInfo(typeof(Bandage), 6, 20, 0xE21, 0)); - Add(new AnimalBuyInfo(1, typeof(PackHorse), 616, 10, 291, 0)); - Add(new AnimalBuyInfo(1, typeof(PackLlama), 523, 10, 292, 0)); - Add(new AnimalBuyInfo(1, typeof(Dog), 158, 10, 217, 0)); - Add(new AnimalBuyInfo(1, typeof(Cat), 131, 10, 201, 0)); + Add(new AnimalBuyInfo(1, "a pack horse", typeof(PackHorse), 616, 10, 291, 0)); + Add(new AnimalBuyInfo(1, "a pack llama", typeof(PackLlama), 523, 10, 292, 0)); + Add(new AnimalBuyInfo(1, "a dog", typeof(Dog), 158, 10, 217, 0)); + Add(new AnimalBuyInfo(1, "a cat", typeof(Cat), 131, 10, 201, 0)); } }