diff --git a/Projects/UOContent/Engines/BulkOrders/Books/BOBGump.cs b/Projects/UOContent/Engines/BulkOrders/Books/BOBGump.cs index d7fdbbd9e..85037be65 100644 --- a/Projects/UOContent/Engines/BulkOrders/Books/BOBGump.cs +++ b/Projects/UOContent/Engines/BulkOrders/Books/BOBGump.cs @@ -192,12 +192,12 @@ namespace Server.Engines.BulkOrders else AddHtmlLocalized(235, y, 80, 20, 1011542, LabelColor); // normal - object name = GetMaterialName(entry.Material, entry.DeedType, sub.ItemType); + TextDefinition name = GetMaterialName(entry.Material, entry.DeedType, sub.ItemType); - if (name is int intName) - AddHtmlLocalized(316, y, 100, 20, intName, LabelColor); + if (name.Number > 0) + AddHtmlLocalized(316, y, 100, 20, name, LabelColor); else - AddLabel(316, y, 1152, name.ToString()); + AddLabel(316, y, 1152, name); AddLabel(421, y, 1152, $"{sub.AmountCur} / {entry.AmountMax}"); @@ -229,12 +229,12 @@ namespace Server.Engines.BulkOrders else AddHtmlLocalized(235, y, 80, 20, 1011542, LabelColor); // normal - object name = GetMaterialName(smallEntry.Material, smallEntry.DeedType, smallEntry.ItemType); + TextDefinition name = GetMaterialName(smallEntry.Material, smallEntry.DeedType, smallEntry.ItemType); - if (name is int intName) - AddHtmlLocalized(316, y, 100, 20, intName, LabelColor); + if (name.Number > 0) + AddHtmlLocalized(316, y, 100, 20, name, LabelColor); else - AddLabel(316, y, 1152, name.ToString()); + AddLabel(316, y, 1152, name); AddLabel(421, y, 1152, $"{smallEntry.AmountCur} / {smallEntry.AmountMax}"); } @@ -391,7 +391,7 @@ namespace Server.Engines.BulkOrders return page; } - public object GetMaterialName(BulkMaterialType mat, BODType type, Type itemType) + public TextDefinition GetMaterialName(BulkMaterialType mat, BODType type, Type itemType) { switch (type) { diff --git a/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs b/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs index dad691252..33467ad76 100644 --- a/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs +++ b/Projects/UOContent/Engines/Harvest/Core/HarvestDefinition.cs @@ -81,12 +81,12 @@ namespace Server.Engines.Harvest public Dictionary> Banks { get; } = new Dictionary>(); - public void SendMessageTo(Mobile from, object message) + public void SendMessageTo(Mobile from, TextDefinition message) { - if (message is int messageInt) - from.SendLocalizedMessage(messageInt); + if (message.Number > 0) + from.SendLocalizedMessage(message.Number); else - from.SendMessage(message.ToString()); + from.SendMessage(message); } public HarvestBank GetBank(Map map, int x, int y) diff --git a/Projects/UOContent/Gumps/ViewHousesGump.cs b/Projects/UOContent/Gumps/ViewHousesGump.cs index 7fee93eb1..5bda4aea9 100644 --- a/Projects/UOContent/Gumps/ViewHousesGump.cs +++ b/Projects/UOContent/Gumps/ViewHousesGump.cs @@ -56,14 +56,14 @@ namespace Server.Gumps AddButton(190, 17, 0x15E3, 0x15E7, 0, GumpButtonType.Page, page - 1); } - object name = FindHouseName(list[i]); + TextDefinition name = FindHouseName(list[i]); AddHtml(15, 40 + i % 15 * 20, 20, 20, Color($"{i + 1}.", White)); - if (name is int nameInt) - AddHtmlLocalized(35, 40 + i % 15 * 20, 160, 20, nameInt, White16); + if (name.Number > 0) + AddHtmlLocalized(35, 40 + i % 15 * 20, 160, 20, name, White16); else - AddHtml(35, 40 + i % 15 * 20, 160, 20, Color(name.ToString(), White)); + AddHtml(35, 40 + i % 15 * 20, 160, 20, Color(name, White)); AddButton(198, 39 + i % 15 * 20, 4005, 4007, i + 1); } @@ -230,7 +230,7 @@ namespace Server.Gumps } } - public object FindHouseName(BaseHouse house) + public static TextDefinition FindHouseName(BaseHouse house) { int multiID = house.ItemID; HousePlacementEntry[] entries = HousePlacementEntry.ClassicHouses;