From 2ff51dbeb69347bee13d5567a2f4478e33ff14b8 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:44:32 -0700
Subject: [PATCH] fix: Fixes quest messages so they are all clilocs (#1883)

---
 .../Ambitious Solen Queen/Conversations.cs    | 16 ++---
 .../Ambitious Solen Queen/Objectives.cs       |  8 +--
 .../Engines/Quests/Collector/Conversations.cs | 60 +++++++++----------
 .../Engines/Quests/Collector/Objectives.cs    | 28 ++++-----
 .../Engines/Quests/Core/QuestConversation.cs  |  2 +-
 .../Engines/Quests/Core/QuestObjective.cs     |  2 +-
 .../Quests/Dark Tides/Conversations.cs        | 30 +++++-----
 .../Engines/Quests/Dark Tides/Objectives.cs   | 40 ++++++-------
 .../Emino's Undertaking/Conversations.cs      | 40 ++++++-------
 .../Quests/Emino's Undertaking/Objectives.cs  | 26 ++++----
 .../Quests/Haochi's Trials/Conversations.cs   | 34 +++++------
 .../Quests/Haochi's Trials/Objectives.cs      | 38 ++++++------
 .../Quests/Solen Matriarch/Conversations.cs   | 18 +++---
 .../Quests/Solen Matriarch/Objectives.cs      | 12 ++--
 .../Study of the Solen Hive/Conversations.cs  | 12 ++--
 .../Study of the Solen Hive/Objectives.cs     |  4 +-
 .../Terrible Hatchlings/Conversations.cs      |  8 +--
 .../Quests/Terrible Hatchlings/Objectives.cs  |  8 +--
 .../Quests/The Summoning/Conversations.cs     |  4 +-
 .../Quests/The Summoning/Objectives.cs        |  4 +-
 .../Quests/Uzeraan Turmoil/Conversations.cs   | 53 ++++++----------
 .../Quests/Uzeraan Turmoil/Objectives.cs      | 30 +++++-----
 .../Quests/Witch Apprentice/Conversations.cs  | 30 +++++-----
 .../Quests/Witch Apprentice/Objectives.cs     | 14 ++---
 24 files changed, 253 insertions(+), 268 deletions(-)

diff --git a/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Conversations.cs b/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Conversations.cs
index e0fd86c5a..1225acafd 100644
--- a/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Conversations.cs	
@@ -2,14 +2,14 @@ namespace Server.Engines.Quests.Ambitious
 {
     public class DontOfferConversation : QuestConversation
     {
-        public override object Message => 1054059;
+        public override int Message => 1054059;
 
         public override bool Logged => false;
     }
 
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1054061;
+        public override int Message => 1054061;
 
         public override void OnRead()
         {
@@ -19,14 +19,14 @@ namespace Server.Engines.Quests.Ambitious
 
     public class DuringKillQueensConversation : QuestConversation
     {
-        public override object Message => 1054066;
+        public override int Message => 1054066;
 
         public override bool Logged => false;
     }
 
     public class GatherFungiConversation : QuestConversation
     {
-        public override object Message => 1054068;
+        public override int Message => 1054068;
 
         public override void OnRead()
         {
@@ -36,14 +36,14 @@ namespace Server.Engines.Quests.Ambitious
 
     public class DuringFungiGatheringConversation : QuestConversation
     {
-        public override object Message => 1054070;
+        public override int Message => 1054070;
 
         public override bool Logged => false;
     }
 
     public class EndConversation : QuestConversation
     {
-        public override object Message => 1054073;
+        public override int Message => 1054073;
 
         public override void OnRead()
         {
@@ -82,7 +82,7 @@ namespace Server.Engines.Quests.Ambitious
 
         public FullBackpackConversation() => m_Logged = true;
 
-        public override object Message => 1054077;
+        public override int Message => 1054077;
 
         public override bool Logged => m_Logged;
 
@@ -115,7 +115,7 @@ namespace Server.Engines.Quests.Ambitious
 
     public class End2Conversation : QuestConversation
     {
-        public override object Message => 1054078;
+        public override int Message => 1054078;
 
         public override void OnRead()
         {
diff --git a/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs b/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs
index bc1634b2f..326a9e8d4 100644
--- a/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Ambitious Solen Queen/Objectives.cs	
@@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Ambitious
 {
     public class KillQueensObjective : QuestObjective
     {
-        public override object Message => ((AmbitiousQueenQuest)System).RedSolen ? 1054062 : 1054063;
+        public override int Message => ((AmbitiousQueenQuest)System).RedSolen ? 1054062 : 1054063;
 
         public override int MaxProgress => 5;
 
@@ -77,7 +77,7 @@ namespace Server.Engines.Quests.Ambitious
 
     public class ReturnAfterKillsObjective : QuestObjective
     {
-        public override object Message => 1054067;
+        public override int Message => 1054067;
 
         public override void OnComplete()
         {
@@ -87,7 +87,7 @@ namespace Server.Engines.Quests.Ambitious
 
     public class GatherFungiObjective : QuestObjective
     {
-        public override object Message => 1054069;
+        public override int Message => 1054069;
 
         public override void OnComplete()
         {
@@ -108,7 +108,7 @@ namespace Server.Engines.Quests.Ambitious
         {
         }
 
-        public override object Message => 1054148;
+        public override int Message => 1054148;
 
         public bool BagOfSending { get; set; }
 
diff --git a/Projects/UOContent/Engines/Quests/Collector/Conversations.cs b/Projects/UOContent/Engines/Quests/Collector/Conversations.cs
index 68dece792..8245f7f71 100644
--- a/Projects/UOContent/Engines/Quests/Collector/Conversations.cs
+++ b/Projects/UOContent/Engines/Quests/Collector/Conversations.cs
@@ -2,21 +2,21 @@ namespace Server.Engines.Quests.Collector
 {
     public class DontOfferConversation : QuestConversation
     {
-        public override object Message => 1055080;
+        public override int Message => 1055080;
 
         public override bool Logged => false;
     }
 
     public class DeclineConversation : QuestConversation
     {
-        public override object Message => 1055082;
+        public override int Message => 1055082;
 
         public override bool Logged => false;
     }
 
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1055083;
+        public override int Message => 1055083;
 
         public override void OnRead()
         {
@@ -26,14 +26,14 @@ namespace Server.Engines.Quests.Collector
 
     public class ElwoodDuringFishConversation : QuestConversation
     {
-        public override object Message => 1055089;
+        public override int Message => 1055089;
 
         public override bool Logged => false;
     }
 
     public class ReturnPearlsConversation : QuestConversation
     {
-        public override object Message => 1055090;
+        public override int Message => 1055090;
 
         public override void OnRead()
         {
@@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Collector
 
     public class AlbertaPaintingConversation : QuestConversation
     {
-        public override object Message => 1055092;
+        public override int Message => 1055092;
 
         public override void OnRead()
         {
@@ -53,14 +53,14 @@ namespace Server.Engines.Quests.Collector
 
     public class AlbertaStoolConversation : QuestConversation
     {
-        public override object Message => 1055096;
+        public override int Message => 1055096;
 
         public override bool Logged => false;
     }
 
     public class AlbertaEndPaintingConversation : QuestConversation
     {
-        public override object Message => 1055098;
+        public override int Message => 1055098;
 
         public override void OnRead()
         {
@@ -70,28 +70,28 @@ namespace Server.Engines.Quests.Collector
 
     public class AlbertaAfterPaintingConversation : QuestConversation
     {
-        public override object Message => 1055102;
+        public override int Message => 1055102;
 
         public override bool Logged => false;
     }
 
     public class ElwoodDuringPainting1Conversation : QuestConversation
     {
-        public override object Message => 1055094;
+        public override int Message => 1055094;
 
         public override bool Logged => false;
     }
 
     public class ElwoodDuringPainting2Conversation : QuestConversation
     {
-        public override object Message => 1055097;
+        public override int Message => 1055097;
 
         public override bool Logged => false;
     }
 
     public class ReturnPaintingConversation : QuestConversation
     {
-        public override object Message => 1055100;
+        public override int Message => 1055100;
 
         public override void OnRead()
         {
@@ -101,7 +101,7 @@ namespace Server.Engines.Quests.Collector
 
     public class GabrielAutographConversation : QuestConversation
     {
-        public override object Message => 1055103;
+        public override int Message => 1055103;
 
         public override void OnRead()
         {
@@ -111,21 +111,21 @@ namespace Server.Engines.Quests.Collector
 
     public class GabrielNoSheetMusicConversation : QuestConversation
     {
-        public override object Message => 1055111;
+        public override int Message => 1055111;
 
         public override bool Logged => false;
     }
 
     public class NoSheetMusicConversation : QuestConversation
     {
-        public override object Message => 1055106;
+        public override int Message => 1055106;
 
         public override bool Logged => false;
     }
 
     public class GetSheetMusicConversation : QuestConversation
     {
-        public override object Message => 1055109;
+        public override int Message => 1055109;
 
         public override void OnRead()
         {
@@ -135,7 +135,7 @@ namespace Server.Engines.Quests.Collector
 
     public class GabrielSheetMusicConversation : QuestConversation
     {
-        public override object Message => 1055113;
+        public override int Message => 1055113;
 
         public override void OnRead()
         {
@@ -145,35 +145,35 @@ namespace Server.Engines.Quests.Collector
 
     public class GabrielIgnoreConversation : QuestConversation
     {
-        public override object Message => 1055118;
+        public override int Message => 1055118;
 
         public override bool Logged => false;
     }
 
     public class ElwoodDuringAutograph1Conversation : QuestConversation
     {
-        public override object Message => 1055105;
+        public override int Message => 1055105;
 
         public override bool Logged => false;
     }
 
     public class ElwoodDuringAutograph2Conversation : QuestConversation
     {
-        public override object Message => 1055112;
+        public override int Message => 1055112;
 
         public override bool Logged => false;
     }
 
     public class ElwoodDuringAutograph3Conversation : QuestConversation
     {
-        public override object Message => 1055115;
+        public override int Message => 1055115;
 
         public override bool Logged => false;
     }
 
     public class ReturnAutographConversation : QuestConversation
     {
-        public override object Message => 1055116;
+        public override int Message => 1055116;
 
         public override void OnRead()
         {
@@ -183,7 +183,7 @@ namespace Server.Engines.Quests.Collector
 
     public class TomasToysConversation : QuestConversation
     {
-        public override object Message => 1055119;
+        public override int Message => 1055119;
 
         public override void OnRead()
         {
@@ -193,14 +193,14 @@ namespace Server.Engines.Quests.Collector
 
     public class TomasDuringCollectingConversation : QuestConversation
     {
-        public override object Message => 1055129;
+        public override int Message => 1055129;
 
         public override bool Logged => false;
     }
 
     public class ReturnImagesConversation : QuestConversation
     {
-        public override object Message => 1055131;
+        public override int Message => 1055131;
 
         public override void OnRead()
         {
@@ -210,28 +210,28 @@ namespace Server.Engines.Quests.Collector
 
     public class ElwoodDuringToys1Conversation : QuestConversation
     {
-        public override object Message => 1055123;
+        public override int Message => 1055123;
 
         public override bool Logged => false;
     }
 
     public class ElwoodDuringToys2Conversation : QuestConversation
     {
-        public override object Message => 1055130;
+        public override int Message => 1055130;
 
         public override bool Logged => false;
     }
 
     public class ElwoodDuringToys3Conversation : QuestConversation
     {
-        public override object Message => 1055133;
+        public override int Message => 1055133;
 
         public override bool Logged => false;
     }
 
     public class EndConversation : QuestConversation
     {
-        public override object Message => 1055134;
+        public override int Message => 1055134;
 
         public override void OnRead()
         {
@@ -247,7 +247,7 @@ namespace Server.Engines.Quests.Collector
 
         public FullEndConversation() => m_Logged = true;
 
-        public override object Message => 1055135;
+        public override int Message => 1055135;
 
         public override bool Logged => m_Logged;
 
diff --git a/Projects/UOContent/Engines/Quests/Collector/Objectives.cs b/Projects/UOContent/Engines/Quests/Collector/Objectives.cs
index 1fa41bfe9..5dc87dfb7 100644
--- a/Projects/UOContent/Engines/Quests/Collector/Objectives.cs
+++ b/Projects/UOContent/Engines/Quests/Collector/Objectives.cs
@@ -4,7 +4,7 @@ namespace Server.Engines.Quests.Collector
 {
     public class FishPearlsObjective : QuestObjective
     {
-        public override object Message => 1055084;
+        public override int Message => 1055084;
 
         public override int MaxProgress => 6;
 
@@ -33,7 +33,7 @@ namespace Server.Engines.Quests.Collector
 
     public class ReturnPearlsObjective : QuestObjective
     {
-        public override object Message => 1055088;
+        public override int Message => 1055088;
 
         public override void OnComplete()
         {
@@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Collector
 
     public class FindAlbertaObjective : QuestObjective
     {
-        public override object Message => 1055091;
+        public override int Message => 1055091;
 
         public override void OnComplete()
         {
@@ -60,7 +60,7 @@ namespace Server.Engines.Quests.Collector
 
         public SitOnTheStoolObjective() => m_Begin = DateTime.MaxValue;
 
-        public override object Message => 1055093;
+        public override int Message => 1055093;
 
         public override void CheckProgress()
         {
@@ -96,7 +96,7 @@ namespace Server.Engines.Quests.Collector
 
     public class ReturnPaintingObjective : QuestObjective
     {
-        public override object Message => 1055099;
+        public override int Message => 1055099;
 
         public override void OnComplete()
         {
@@ -106,7 +106,7 @@ namespace Server.Engines.Quests.Collector
 
     public class FindGabrielObjective : QuestObjective
     {
-        public override object Message => 1055101;
+        public override int Message => 1055101;
 
         public override void OnComplete()
         {
@@ -137,7 +137,7 @@ namespace Server.Engines.Quests.Collector
         {
         }
 
-        public override object Message => 1055104;
+        public override int Message => 1055104;
 
         public void InitTheater()
         {
@@ -191,7 +191,7 @@ namespace Server.Engines.Quests.Collector
 
     public class ReturnSheetMusicObjective : QuestObjective
     {
-        public override object Message => 1055110;
+        public override int Message => 1055110;
 
         public override void OnComplete()
         {
@@ -201,7 +201,7 @@ namespace Server.Engines.Quests.Collector
 
     public class ReturnAutographObjective : QuestObjective
     {
-        public override object Message => 1055114;
+        public override int Message => 1055114;
 
         public override void OnComplete()
         {
@@ -211,7 +211,7 @@ namespace Server.Engines.Quests.Collector
 
     public class FindTomasObjective : QuestObjective
     {
-        public override object Message => 1055117;
+        public override int Message => 1055117;
 
         public override void OnComplete()
         {
@@ -244,7 +244,7 @@ namespace Server.Engines.Quests.Collector
         {
         }
 
-        public override object Message => 1055120;
+        public override int Message => 1055120;
 
         public override bool Completed
         {
@@ -376,7 +376,7 @@ namespace Server.Engines.Quests.Collector
 
     public class ReturnImagesObjective : QuestObjective
     {
-        public override object Message => 1055128;
+        public override int Message => 1055128;
 
         public override void OnComplete()
         {
@@ -386,11 +386,11 @@ namespace Server.Engines.Quests.Collector
 
     public class ReturnToysObjective : QuestObjective
     {
-        public override object Message => 1055132;
+        public override int Message => 1055132;
     }
 
     public class MakeRoomObjective : QuestObjective
     {
-        public override object Message => 1055136;
+        public override int Message => 1055136;
     }
 }
diff --git a/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs b/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs
index cf0baa192..e78b2a1dc 100644
--- a/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs
+++ b/Projects/UOContent/Engines/Quests/Core/QuestConversation.cs
@@ -6,7 +6,7 @@ namespace Server.Engines.Quests
 {
     public abstract class QuestConversation
     {
-        public abstract object Message { get; }
+        public abstract int Message { get; }
 
         public virtual QuestItemInfo[] Info => null;
         public virtual bool Logged => true;
diff --git a/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs b/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs
index 27fee278f..01f49da5a 100644
--- a/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs
+++ b/Projects/UOContent/Engines/Quests/Core/QuestObjective.cs
@@ -10,7 +10,7 @@ namespace Server.Engines.Quests
     {
         private int m_CurProgress;
 
-        public abstract object Message { get; }
+        public abstract int Message { get; }
 
         public virtual int MaxProgress => 1;
         public virtual QuestItemInfo[] Info => null;
diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Conversations.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Conversations.cs
index b6437837b..4e1f98ce6 100644
--- a/Projects/UOContent/Engines/Quests/Dark Tides/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Dark Tides/Conversations.cs	
@@ -2,7 +2,7 @@ namespace Server.Engines.Quests.Necro
 {
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1049092;
+        public override int Message => 1049092;
 
         public override void OnRead()
         {
@@ -25,7 +25,7 @@ namespace Server.Engines.Quests.Necro
             new(1048032, 3702)  // a bag
         };
 
-        public override object Message => 1060099;
+        public override int Message => 1060099;
 
         public override QuestItemInfo[] Info => m_Info;
 
@@ -42,7 +42,7 @@ namespace Server.Engines.Quests.Necro
             new(1026153, 6178) // teleporter
         };
 
-        public override object Message => 1060103;
+        public override int Message => 1060103;
 
         public override QuestItemInfo[] Info => m_Info;
 
@@ -54,7 +54,7 @@ namespace Server.Engines.Quests.Necro
 
     public class HorusConversation : QuestConversation
     {
-        public override object Message => 1060105;
+        public override int Message => 1060105;
 
         public override void OnRead()
         {
@@ -64,7 +64,7 @@ namespace Server.Engines.Quests.Necro
 
     public class MardothVaultConversation : QuestConversation
     {
-        public override object Message => 1060107;
+        public override int Message => 1060107;
 
         public override void OnRead()
         {
@@ -79,7 +79,7 @@ namespace Server.Engines.Quests.Necro
             new(1023643, 8787) // spellbook
         };
 
-        public override object Message => 1060110;
+        public override int Message => 1060110;
 
         public override QuestItemInfo[] Info => m_Info;
 
@@ -91,7 +91,7 @@ namespace Server.Engines.Quests.Necro
 
     public class ReadAbraxusScrollConversation : QuestConversation
     {
-        public override object Message => 1060114;
+        public override int Message => 1060114;
 
         public override void OnRead()
         {
@@ -101,7 +101,7 @@ namespace Server.Engines.Quests.Necro
 
     public class SecondHorusConversation : QuestConversation
     {
-        public override object Message => 1060118;
+        public override int Message => 1060118;
 
         public override void OnRead()
         {
@@ -111,12 +111,12 @@ namespace Server.Engines.Quests.Necro
 
     public class HealConversation : QuestConversation
     {
-        public override object Message => 1061610;
+        public override int Message => 1061610;
     }
 
     public class HorusRewardConversation : QuestConversation
     {
-        public override object Message => 1060717;
+        public override int Message => 1060717;
 
         public override bool Logged => false;
     }
@@ -132,7 +132,7 @@ namespace Server.Engines.Quests.Necro
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -168,7 +168,7 @@ namespace Server.Engines.Quests.Necro
 
     public class MardothKronusConversation : QuestConversation
     {
-        public override object Message => 1060121;
+        public override int Message => 1060121;
 
         public override void OnRead()
         {
@@ -178,7 +178,7 @@ namespace Server.Engines.Quests.Necro
 
     public class MardothEndConversation : QuestConversation
     {
-        public override object Message => 1060133;
+        public override int Message => 1060133;
 
         public override void OnRead()
         {
@@ -188,7 +188,7 @@ namespace Server.Engines.Quests.Necro
 
     public class BankerConversation : QuestConversation
     {
-        public override object Message => 1060137;
+        public override int Message => 1060137;
 
         public override void OnRead()
         {
@@ -198,7 +198,7 @@ namespace Server.Engines.Quests.Necro
 
     public class RadarConversation : QuestConversation
     {
-        public override object Message => 1061692;
+        public override int Message => 1061692;
 
         public override bool Logged => false;
     }
diff --git a/Projects/UOContent/Engines/Quests/Dark Tides/Objectives.cs b/Projects/UOContent/Engines/Quests/Dark Tides/Objectives.cs
index 68a2241e9..8972b430b 100644
--- a/Projects/UOContent/Engines/Quests/Dark Tides/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Dark Tides/Objectives.cs	
@@ -11,7 +11,7 @@ namespace Server.Engines.Quests.Necro
             new(1023643, 8787) // spellbook
         };
 
-        public override object Message => 1060102;
+        public override int Message => 1060102;
 
         public override QuestItemInfo[] Info => m_Info;
 
@@ -23,7 +23,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindCrystalCaveObjective : QuestObjective
     {
-        public override object Message => 1060104;
+        public override int Message => 1060104;
 
         public override void OnComplete()
         {
@@ -33,7 +33,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindMardothAboutVaultObjective : QuestObjective
     {
-        public override object Message => 1060106;
+        public override int Message => 1060106;
 
         public override void OnComplete()
         {
@@ -43,7 +43,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindMaabusTombObjective : QuestObjective
     {
-        public override object Message => 1060124;
+        public override int Message => 1060124;
 
         public override void CheckProgress()
         {
@@ -61,7 +61,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindMaabusCorpseObjective : QuestObjective
     {
-        public override object Message => 1061142;
+        public override int Message => 1061142;
 
         public override void CheckProgress()
         {
@@ -79,7 +79,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindCityOfLightObjective : QuestObjective
     {
-        public override object Message => 1060108;
+        public override int Message => 1060108;
 
         public override void CheckProgress()
         {
@@ -102,7 +102,7 @@ namespace Server.Engines.Quests.Necro
             new(1023676, 3679) // glowing rune
         };
 
-        public override object Message => 1060109;
+        public override int Message => 1060109;
 
         public override QuestItemInfo[] Info => m_Info;
 
@@ -122,7 +122,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FetchAbraxusScrollObjective : QuestObjective
     {
-        public override object Message => 1060196;
+        public override int Message => 1060196;
 
         public override void CheckProgress()
         {
@@ -147,7 +147,7 @@ namespace Server.Engines.Quests.Necro
 
     public class RetrieveAbraxusScrollObjective : QuestObjective
     {
-        public override object Message => 1060199;
+        public override int Message => 1060199;
 
         public override void OnComplete()
         {
@@ -157,7 +157,7 @@ namespace Server.Engines.Quests.Necro
 
     public class ReadAbraxusScrollObjective : QuestObjective
     {
-        public override object Message => 1060125;
+        public override int Message => 1060125;
 
         public override void OnComplete()
         {
@@ -172,7 +172,7 @@ namespace Server.Engines.Quests.Necro
             new(1026153, 6178) // teleporter
         };
 
-        public override object Message => 1060115;
+        public override int Message => 1060115;
 
         public override QuestItemInfo[] Info => m_Info;
 
@@ -184,7 +184,7 @@ namespace Server.Engines.Quests.Necro
 
     public class SpeakCavePasswordObjective : QuestObjective
     {
-        public override object Message => 1060117;
+        public override int Message => 1060117;
 
         public override void OnComplete()
         {
@@ -199,7 +199,7 @@ namespace Server.Engines.Quests.Necro
 
         private int m_SkitteringHoppersKilled;
 
-        public override object Message => 1060119;
+        public override int Message => 1060119;
 
         public override bool IgnoreYoungProtection(Mobile from) => !m_SkitteringHoppersDisposed && from is SkitteringHopper;
 
@@ -249,7 +249,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindHorusAboutRewardObjective : QuestObjective
     {
-        public override object Message => 1060126;
+        public override int Message => 1060126;
 
         public override void OnComplete()
         {
@@ -259,7 +259,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindMardothAboutKronusObjective : QuestObjective
     {
-        public override object Message => 1060127;
+        public override int Message => 1060127;
 
         public override void OnComplete()
         {
@@ -273,7 +273,7 @@ namespace Server.Engines.Quests.Necro
 
         private bool m_Inside;
 
-        public override object Message => 1060128;
+        public override int Message => 1060128;
 
         public override void CheckProgress()
         {
@@ -307,7 +307,7 @@ namespace Server.Engines.Quests.Necro
 
     public class UseCallingScrollObjective : QuestObjective
     {
-        public override object Message => 1060130;
+        public override int Message => 1060130;
     }
 
     public class FindMardothEndObjective : QuestObjective
@@ -321,7 +321,7 @@ namespace Server.Engines.Quests.Necro
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -360,7 +360,7 @@ namespace Server.Engines.Quests.Necro
 
     public class FindBankObjective : QuestObjective
     {
-        public override object Message => 1060134;
+        public override int Message => 1060134;
 
         public override void CheckProgress()
         {
@@ -378,7 +378,7 @@ namespace Server.Engines.Quests.Necro
 
     public class CashBankCheckObjective : QuestObjective
     {
-        public override object Message => 1060644;
+        public override int Message => 1060644;
 
         public override void OnComplete()
         {
diff --git a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Conversations.cs b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Conversations.cs
index b97c730e3..21e4e4629 100644
--- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Conversations.cs	
@@ -2,7 +2,7 @@ namespace Server.Engines.Quests.Ninja
 {
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1049092;
+        public override int Message => 1049092;
 
         public override void OnRead()
         {
@@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class FindZoelConversation : QuestConversation
     {
-        public override object Message => 1063175;
+        public override int Message => 1063175;
 
         public override void OnRead()
         {
@@ -22,14 +22,14 @@ namespace Server.Engines.Quests.Ninja
 
     public class RadarConversation : QuestConversation
     {
-        public override object Message => 1063033;
+        public override int Message => 1063033;
 
         public override bool Logged => false;
     }
 
     public class EnterCaveConversation : QuestConversation
     {
-        public override object Message => 1063177;
+        public override int Message => 1063177;
 
         public override void OnRead()
         {
@@ -39,7 +39,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class SneakPastGuardiansConversation : QuestConversation
     {
-        public override object Message => 1063180;
+        public override int Message => 1063180;
 
         public override void OnRead()
         {
@@ -49,12 +49,12 @@ namespace Server.Engines.Quests.Ninja
 
     public class NeedToHideConversation : QuestConversation
     {
-        public override object Message => 1063181;
+        public override int Message => 1063181;
     }
 
     public class UseTeleporterConversation : QuestConversation
     {
-        public override object Message => 1063182;
+        public override int Message => 1063182;
 
         public override void OnRead()
         {
@@ -64,7 +64,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class GiveZoelNoteConversation : QuestConversation
     {
-        public override object Message => 1063184;
+        public override int Message => 1063184;
 
         public override void OnRead()
         {
@@ -74,14 +74,14 @@ namespace Server.Engines.Quests.Ninja
 
     public class LostNoteConversation : QuestConversation
     {
-        public override object Message => 1063187;
+        public override int Message => 1063187;
 
         public override bool Logged => false;
     }
 
     public class GainInnInformationConversation : QuestConversation
     {
-        public override object Message => 1063189;
+        public override int Message => 1063189;
 
         public override void OnRead()
         {
@@ -91,7 +91,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class ReturnFromInnConversation : QuestConversation
     {
-        public override object Message => 1063196;
+        public override int Message => 1063196;
 
         public override void OnRead()
         {
@@ -101,7 +101,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class SearchForSwordConversation : QuestConversation
     {
-        public override object Message => 1063199;
+        public override int Message => 1063199;
 
         public override void OnRead()
         {
@@ -111,7 +111,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class HallwayWalkConversation : QuestConversation
     {
-        public override object Message => 1063201;
+        public override int Message => 1063201;
 
         public override void OnRead()
         {
@@ -121,7 +121,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class ReturnSwordConversation : QuestConversation
     {
-        public override object Message => 1063203;
+        public override int Message => 1063203;
 
         public override void OnRead()
         {
@@ -131,7 +131,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class SlayHenchmenConversation : QuestConversation
     {
-        public override object Message => 1063205;
+        public override int Message => 1063205;
 
         public override void OnRead()
         {
@@ -141,14 +141,14 @@ namespace Server.Engines.Quests.Ninja
 
     public class ContinueSlayHenchmenConversation : QuestConversation
     {
-        public override object Message => 1063208;
+        public override int Message => 1063208;
 
         public override bool Logged => false;
     }
 
     public class GiveEminoSwordConversation : QuestConversation
     {
-        public override object Message => 1063211;
+        public override int Message => 1063211;
 
         public override void OnRead()
         {
@@ -158,14 +158,14 @@ namespace Server.Engines.Quests.Ninja
 
     public class LostSwordConversation : QuestConversation
     {
-        public override object Message => 1063212;
+        public override int Message => 1063212;
 
         public override bool Logged => false;
     }
 
     public class EarnGiftsConversation : QuestConversation
     {
-        public override object Message => 1063216;
+        public override int Message => 1063216;
 
         public override void OnRead()
         {
@@ -175,7 +175,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class EarnLessGiftsConversation : QuestConversation
     {
-        public override object Message => 1063217;
+        public override int Message => 1063217;
 
         public override void OnRead()
         {
diff --git a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Objectives.cs b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Objectives.cs
index 942095497..184c89546 100644
--- a/Projects/UOContent/Engines/Quests/Emino's Undertaking/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Emino's Undertaking/Objectives.cs	
@@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Ninja
 {
     public class FindEminoBeginObjective : QuestObjective
     {
-        public override object Message => 1063174;
+        public override int Message => 1063174;
 
         public override void OnComplete()
         {
@@ -15,7 +15,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class FindZoelObjective : QuestObjective
     {
-        public override object Message => 1063176;
+        public override int Message => 1063176;
 
         public override void OnComplete()
         {
@@ -25,7 +25,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class EnterCaveObjective : QuestObjective
     {
-        public override object Message => 1063179;
+        public override int Message => 1063179;
 
         public override void CheckProgress()
         {
@@ -45,7 +45,7 @@ namespace Server.Engines.Quests.Ninja
     {
         public bool TaughtHowToUseSkills { get; set; }
 
-        public override object Message => 1063261;
+        public override int Message => 1063261;
 
         public override void CheckProgress()
         {
@@ -77,7 +77,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class UseTeleporterObjective : QuestObjective
     {
-        public override object Message => 1063183;
+        public override int Message => 1063183;
 
         public override void OnComplete()
         {
@@ -87,7 +87,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class GiveZoelNoteObjective : QuestObjective
     {
-        public override object Message => 1063185;
+        public override int Message => 1063185;
 
         public override void OnComplete()
         {
@@ -97,7 +97,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class GainInnInformationObjective : QuestObjective
     {
-        public override object Message => 1063190;
+        public override int Message => 1063190;
 
         public override void CheckProgress()
         {
@@ -117,7 +117,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class ReturnFromInnObjective : QuestObjective
     {
-        public override object Message => 1063197;
+        public override int Message => 1063197;
 
         public override void OnComplete()
         {
@@ -127,7 +127,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class SearchForSwordObjective : QuestObjective
     {
-        public override object Message => 1063200;
+        public override int Message => 1063200;
 
         public override void OnComplete()
         {
@@ -139,7 +139,7 @@ namespace Server.Engines.Quests.Ninja
     {
         public bool StolenTreasure { get; set; }
 
-        public override object Message => 1063202;
+        public override int Message => 1063202;
 
         public override void OnComplete()
         {
@@ -163,7 +163,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class ReturnSwordObjective : QuestObjective
     {
-        public override object Message => 1063204;
+        public override int Message => 1063204;
 
         public override void CheckProgress()
         {
@@ -183,7 +183,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class SlayHenchmenObjective : QuestObjective
     {
-        public override object Message => 1063206;
+        public override int Message => 1063206;
 
         public override int MaxProgress => 3;
 
@@ -219,7 +219,7 @@ namespace Server.Engines.Quests.Ninja
 
     public class GiveEminoSwordObjective : QuestObjective
     {
-        public override object Message => 1063210;
+        public override int Message => 1063210;
 
         public override void OnComplete()
         {
diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Conversations.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Conversations.cs
index 1ff8e26b0..1c69faa50 100644
--- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Conversations.cs	
@@ -2,7 +2,7 @@ namespace Server.Engines.Quests.Samurai
 {
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1049092;
+        public override int Message => 1049092;
 
         public override void OnRead()
         {
@@ -12,14 +12,14 @@ namespace Server.Engines.Quests.Samurai
 
     public class RadarConversation : QuestConversation
     {
-        public override object Message => 1063033;
+        public override int Message => 1063033;
 
         public override bool Logged => false;
     }
 
     public class FirstTrialIntroConversation : QuestConversation
     {
-        public override object Message => 1063029;
+        public override int Message => 1063029;
 
         public override void OnRead()
         {
@@ -29,7 +29,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FirstTrialKillConversation : QuestConversation
     {
-        public override object Message => 1063031;
+        public override int Message => 1063031;
 
         public override void OnRead()
         {
@@ -47,7 +47,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -88,7 +88,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -131,7 +131,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class SecondTrialAttackConversation : QuestConversation
     {
-        public override object Message => 1063057;
+        public override int Message => 1063057;
 
         public override void OnRead()
         {
@@ -149,7 +149,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -198,7 +198,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class ThirdTrialKillConversation : QuestConversation
     {
-        public override object Message => 1063062;
+        public override int Message => 1063062;
 
         public override void OnRead()
         {
@@ -208,7 +208,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FourthTrialIntroConversation : QuestConversation
     {
-        public override object Message => 1063065;
+        public override int Message => 1063065;
 
         public override void OnRead()
         {
@@ -218,7 +218,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FourthTrialCatsConversation : QuestConversation
     {
-        public override object Message => 1063067;
+        public override int Message => 1063067;
 
         public override void OnRead()
         {
@@ -236,7 +236,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -285,7 +285,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FifthTrialReturnConversation : QuestConversation
     {
-        public override object Message => 1063248;
+        public override int Message => 1063248;
 
         public override void OnRead()
         {
@@ -295,7 +295,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class LostSwordConversation : QuestConversation
     {
-        public override object Message => 1063074;
+        public override int Message => 1063074;
 
         public override bool Logged => false;
     }
@@ -310,7 +310,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -359,7 +359,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class SeventhTrialIntroConversation : QuestConversation
     {
-        public override object Message => 1063079;
+        public override int Message => 1063079;
 
         public override void OnRead()
         {
@@ -369,7 +369,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class EndConversation : QuestConversation
     {
-        public override object Message => 1063125;
+        public override int Message => 1063125;
 
         public override void OnRead()
         {
diff --git a/Projects/UOContent/Engines/Quests/Haochi's Trials/Objectives.cs b/Projects/UOContent/Engines/Quests/Haochi's Trials/Objectives.cs
index 8f5dfe9a5..1bef438bb 100644
--- a/Projects/UOContent/Engines/Quests/Haochi's Trials/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Haochi's Trials/Objectives.cs	
@@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Samurai
 {
     public class FindHaochiObjective : QuestObjective
     {
-        public override object Message => 1063026;
+        public override int Message => 1063026;
 
         public override void OnComplete()
         {
@@ -16,7 +16,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FirstTrialIntroObjective : QuestObjective
     {
-        public override object Message => 1063030;
+        public override int Message => 1063030;
 
         public override void OnComplete()
         {
@@ -29,7 +29,7 @@ namespace Server.Engines.Quests.Samurai
         private int m_CursedSoulsKilled;
         private int m_YoungRoninKilled;
 
-        public override object Message => 1063032;
+        public override int Message => 1063032;
 
         public override int MaxProgress => 3;
 
@@ -95,7 +95,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message => 1063044;
+        public override int Message => 1063044;
 
         public override void OnComplete()
         {
@@ -119,7 +119,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class SecondTrialIntroObjective : QuestObjective
     {
-        public override object Message => 1063047;
+        public override int Message => 1063047;
 
         public override void OnComplete()
         {
@@ -129,7 +129,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class SecondTrialAttackObjective : QuestObjective
     {
-        public override object Message => 1063058;
+        public override int Message => 1063058;
     }
 
     public class SecondTrialReturnObjective : QuestObjective
@@ -140,7 +140,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message => 1063229;
+        public override int Message => 1063229;
 
         public bool Dragon { get; private set; }
 
@@ -166,7 +166,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class ThirdTrialIntroObjective : QuestObjective
     {
-        public override object Message => 1063061;
+        public override int Message => 1063061;
 
         public override void OnComplete()
         {
@@ -176,7 +176,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class ThirdTrialKillObjective : QuestObjective
     {
-        public override object Message => 1063063;
+        public override int Message => 1063063;
 
         public override void OnKill(BaseCreature creature, Container corpse)
         {
@@ -194,7 +194,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class ThirdTrialReturnObjective : QuestObjective
     {
-        public override object Message => 1063064;
+        public override int Message => 1063064;
 
         public override void OnComplete()
         {
@@ -204,7 +204,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FourthTrialIntroObjective : QuestObjective
     {
-        public override object Message => 1063066;
+        public override int Message => 1063066;
 
         public override void OnComplete()
         {
@@ -214,7 +214,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FourthTrialCatsObjective : QuestObjective
     {
-        public override object Message => 1063068;
+        public override int Message => 1063068;
 
         public override void OnKill(BaseCreature creature, Container corpse)
         {
@@ -234,7 +234,7 @@ namespace Server.Engines.Quests.Samurai
         {
         }
 
-        public override object Message => 1063242;
+        public override int Message => 1063242;
 
         public bool KilledCat { get; private set; }
 
@@ -260,7 +260,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class FifthTrialIntroObjective : QuestObjective
     {
-        public override object Message => 1063072;
+        public override int Message => 1063072;
 
         public bool StolenTreasure { get; set; }
 
@@ -286,12 +286,12 @@ namespace Server.Engines.Quests.Samurai
 
     public class FifthTrialReturnObjective : QuestObjective
     {
-        public override object Message => 1063073;
+        public override int Message => 1063073;
     }
 
     public class SixthTrialIntroObjective : QuestObjective
     {
-        public override object Message => 1063078;
+        public override int Message => 1063078;
 
         public override void OnComplete()
         {
@@ -301,7 +301,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class SixthTrialReturnObjective : QuestObjective
     {
-        public override object Message => 1063252;
+        public override int Message => 1063252;
 
         public override void OnComplete()
         {
@@ -311,7 +311,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class SeventhTrialIntroObjective : QuestObjective
     {
-        public override object Message => 1063080;
+        public override int Message => 1063080;
 
         public override int MaxProgress => 3;
 
@@ -331,7 +331,7 @@ namespace Server.Engines.Quests.Samurai
 
     public class SeventhTrialReturnObjective : QuestObjective
     {
-        public override object Message => 1063253;
+        public override int Message => 1063253;
 
         public override void OnComplete()
         {
diff --git a/Projects/UOContent/Engines/Quests/Solen Matriarch/Conversations.cs b/Projects/UOContent/Engines/Quests/Solen Matriarch/Conversations.cs
index e00eaa566..cfb2cd4d2 100644
--- a/Projects/UOContent/Engines/Quests/Solen Matriarch/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Solen Matriarch/Conversations.cs	
@@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Matriarch
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -50,7 +50,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1054084;
+        public override int Message => 1054084;
 
         public override void OnRead()
         {
@@ -60,14 +60,14 @@ namespace Server.Engines.Quests.Matriarch
 
     public class DuringKillInfiltratorsConversation : QuestConversation
     {
-        public override object Message => 1054089;
+        public override int Message => 1054089;
 
         public override bool Logged => false;
     }
 
     public class GatherWaterConversation : QuestConversation
     {
-        public override object Message => 1054091;
+        public override int Message => 1054091;
 
         public override void OnRead()
         {
@@ -77,7 +77,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class DuringWaterGatheringConversation : QuestConversation
     {
-        public override object Message => 1054094;
+        public override int Message => 1054094;
 
         public override bool Logged => false;
     }
@@ -92,7 +92,7 @@ namespace Server.Engines.Quests.Matriarch
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -141,7 +141,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class DuringFungiProcessConversation : QuestConversation
     {
-        public override object Message => 1054099;
+        public override int Message => 1054099;
 
         public override bool Logged => false;
     }
@@ -154,7 +154,7 @@ namespace Server.Engines.Quests.Matriarch
 
         public FullBackpackConversation() => m_Logged = true;
 
-        public override object Message => 1054102;
+        public override int Message => 1054102;
 
         public override bool Logged => m_Logged;
 
@@ -169,7 +169,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class EndConversation : QuestConversation
     {
-        public override object Message => 1054101;
+        public override int Message => 1054101;
 
         public override void OnRead()
         {
diff --git a/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs b/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs
index 6a4bf5b37..224a8f233 100644
--- a/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Solen Matriarch/Objectives.cs	
@@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Matriarch
 {
     public class KillInfiltratorsObjective : QuestObjective
     {
-        public override object Message => ((SolenMatriarchQuest)System).RedSolen ? 1054086 : 1054085;
+        public override int Message => ((SolenMatriarchQuest)System).RedSolen ? 1054086 : 1054085;
 
         public override int MaxProgress => 7;
 
@@ -77,7 +77,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class ReturnAfterKillsObjective : QuestObjective
     {
-        public override object Message => 1054090;
+        public override int Message => 1054090;
 
         public override void OnComplete()
         {
@@ -87,7 +87,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class GatherWaterObjective : QuestObjective
     {
-        public override object Message => 1054092;
+        public override int Message => 1054092;
 
         public override int MaxProgress => 40;
 
@@ -114,7 +114,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class ReturnAfterWaterObjective : QuestObjective
     {
-        public override object Message => 1054095;
+        public override int Message => 1054095;
 
         public override void OnComplete()
         {
@@ -138,7 +138,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class ProcessFungiObjective : QuestObjective
     {
-        public override object Message => 1054098;
+        public override int Message => 1054098;
 
         public override void OnComplete()
         {
@@ -155,7 +155,7 @@ namespace Server.Engines.Quests.Matriarch
 
     public class GetRewardObjective : QuestObjective
     {
-        public override object Message => 1054149;
+        public override int Message => 1054149;
 
         public override void OnComplete()
         {
diff --git a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Conversations.cs b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Conversations.cs
index 318096d5e..ff06aba4a 100644
--- a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Conversations.cs	
@@ -2,14 +2,14 @@ namespace Server.Engines.Quests.Naturalist
 {
     public class DontOfferConversation : QuestConversation
     {
-        public override object Message => 1054052;
+        public override int Message => 1054052;
 
         public override bool Logged => false;
     }
 
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1054043;
+        public override int Message => 1054043;
 
         public override void OnRead()
         {
@@ -19,14 +19,14 @@ namespace Server.Engines.Quests.Naturalist
 
     public class NaturalistDuringStudyConversation : QuestConversation
     {
-        public override object Message => 1054049;
+        public override int Message => 1054049;
 
         public override bool Logged => false;
     }
 
     public class EndConversation : QuestConversation
     {
-        public override object Message => 1054050;
+        public override int Message => 1054050;
 
         public override void OnRead()
         {
@@ -36,7 +36,7 @@ namespace Server.Engines.Quests.Naturalist
 
     public class SpecialEndConversation : QuestConversation
     {
-        public override object Message => 1054051;
+        public override int Message => 1054051;
 
         public override void OnRead()
         {
@@ -46,7 +46,7 @@ namespace Server.Engines.Quests.Naturalist
 
     public class FullBackpackConversation : QuestConversation
     {
-        public override object Message => 1054053;
+        public override int Message => 1054053;
 
         public override bool Logged => false;
     }
diff --git a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs
index 7f63dfa96..7dbb8b6f9 100644
--- a/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Study of the Solen Hive/Objectives.cs	
@@ -10,7 +10,7 @@ namespace Server.Engines.Quests.Naturalist
         private DateTime m_StudyBegin;
         private StudyState m_StudyState;
 
-        public override object Message => 1054044;
+        public override int Message => 1054044;
 
         public override int MaxProgress => NestArea.NonSpecialCount;
 
@@ -174,7 +174,7 @@ namespace Server.Engines.Quests.Naturalist
 
     public class ReturnToNaturalistObjective : QuestObjective
     {
-        public override object Message => 1054048;
+        public override int Message => 1054048;
 
         public override void RenderProgress(BaseQuestGump gump)
         {
diff --git a/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Conversations.cs b/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Conversations.cs
index ae8a44c64..6d2686f94 100644
--- a/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Conversations.cs	
@@ -2,7 +2,7 @@ namespace Server.Engines.Quests.Zento
 {
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1049092;
+        public override int Message => 1049092;
 
         public override void OnRead()
         {
@@ -12,21 +12,21 @@ namespace Server.Engines.Quests.Zento
 
     public class DirectionConversation : QuestConversation
     {
-        public override object Message => 1063323;
+        public override int Message => 1063323;
 
         public override bool Logged => false;
     }
 
     public class TakeCareConversation : QuestConversation
     {
-        public override object Message => 1063324;
+        public override int Message => 1063324;
 
         public override bool Logged => false;
     }
 
     public class EndConversation : QuestConversation
     {
-        public override object Message => 1063321;
+        public override int Message => 1063321;
 
         public override void OnRead()
         {
diff --git a/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Objectives.cs b/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Objectives.cs
index ec9d3de95..53e56da91 100644
--- a/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Terrible Hatchlings/Objectives.cs	
@@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Zento
 {
     public class FirstKillObjective : QuestObjective
     {
-        public override object Message => 1063316;
+        public override int Message => 1063316;
 
         public override void RenderProgress(BaseQuestGump gump)
         {
@@ -40,7 +40,7 @@ namespace Server.Engines.Quests.Zento
 
     public class SecondKillObjective : QuestObjective
     {
-        public override object Message => 1063320;
+        public override int Message => 1063320;
 
         public override void RenderProgress(BaseQuestGump gump)
         {
@@ -86,7 +86,7 @@ namespace Server.Engines.Quests.Zento
         {
         }
 
-        public override object Message => 1063319;
+        public override int Message => 1063319;
 
         public override int MaxProgress => 10;
 
@@ -123,7 +123,7 @@ namespace Server.Engines.Quests.Zento
 
     public class ReturnObjective : QuestObjective
     {
-        public override object Message => 1063313;
+        public override int Message => 1063313;
 
         public override void OnComplete()
         {
diff --git a/Projects/UOContent/Engines/Quests/The Summoning/Conversations.cs b/Projects/UOContent/Engines/Quests/The Summoning/Conversations.cs
index 5d830010d..9931511da 100644
--- a/Projects/UOContent/Engines/Quests/The Summoning/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/The Summoning/Conversations.cs	
@@ -4,7 +4,7 @@ namespace Server.Engines.Quests.Doom
 {
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1050027;
+        public override int Message => 1050027;
 
         public override void OnRead()
         {
@@ -14,7 +14,7 @@ namespace Server.Engines.Quests.Doom
 
     public class VanquishDaemonConversation : QuestConversation
     {
-        public override object Message => 1050021;
+        public override int Message => 1050021;
 
         public override void OnRead()
         {
diff --git a/Projects/UOContent/Engines/Quests/The Summoning/Objectives.cs b/Projects/UOContent/Engines/Quests/The Summoning/Objectives.cs
index d4a2cfed7..879d95921 100644
--- a/Projects/UOContent/Engines/Quests/The Summoning/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/The Summoning/Objectives.cs	
@@ -5,7 +5,7 @@ namespace Server.Engines.Quests.Doom
 {
     public class CollectBonesObjective : QuestObjective
     {
-        public override object Message => 1050026;
+        public override int Message => 1050026;
 
         public override int MaxProgress => 1000;
 
@@ -86,7 +86,7 @@ namespace Server.Engines.Quests.Doom
 
         public Corpse CorpseWithSkull { get; set; }
 
-        public override object Message => 1050037;
+        public override int Message => 1050037;
 
         public override void CheckProgress()
         {
diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Conversations.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Conversations.cs
index 7cbeb257b..9f3cbfc71 100644
--- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Conversations.cs	
@@ -2,7 +2,7 @@ namespace Server.Engines.Quests.Haven
 {
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1049092;
+        public override int Message => 1049092;
 
         public override void OnRead()
         {
@@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Haven
 
     public class UzeraanTitheConversation : QuestConversation
     {
-        public override object Message => 1060209;
+        public override int Message => 1060209;
 
         public override void OnRead()
         {
@@ -27,7 +27,7 @@ namespace Server.Engines.Quests.Haven
             new(1023676, 0xE68) // glowing rune
         };
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -84,7 +84,7 @@ namespace Server.Engines.Quests.Haven
             new(1048032, 0xE76)   // a bag
         };
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -138,7 +138,7 @@ namespace Server.Engines.Quests.Haven
             new(1023637, 0xE34) // scroll
         };
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -185,7 +185,7 @@ namespace Server.Engines.Quests.Haven
             new(1049117, 0xFC4)   // Horn of Retreat
         };
 
-        public override object Message => 1049325;
+        public override int Message => 1049325;
 
         public override QuestItemInfo[] Info => m_Info;
 
@@ -197,7 +197,7 @@ namespace Server.Engines.Quests.Haven
 
     public class DryadConversation : QuestConversation
     {
-        public override object Message => 1049326;
+        public override int Message => 1049326;
 
         public override void OnRead()
         {
@@ -213,7 +213,7 @@ namespace Server.Engines.Quests.Haven
             new(1022581, 0xA22)  // lantern
         };
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -267,28 +267,13 @@ namespace Server.Engines.Quests.Haven
             new(1060577, 0x1F14) // Recall Rune
         };
 
-        public override object Message
+        public override int Message
         {
             get
             {
                 if (System.From.Profession == 2) // magician
                 {
-                    return "<I>You hand Uzeraan the Vial of Blood, which he hastily accepts...</I><BR>"
-                           + "<BR>"
-                           + "Excellent work!  Only one reagent remains and the spell is complete!  The final "
-                           + "requirement is a <I>Daemon Bone</I>, which will not be as easily acquired as the "
-                           + "previous two components.<BR>"
-                           + "<BR>"
-                           + "There is a haunted graveyard on this island, which is the home to many undead "
-                           + "creatures.   Dispose of the undead as you see fit.  Be sure to search their remains "
-                           + "after you have smitten them, to check for a <I>Daemon Bone</I>.  I'm quite sure "
-                           + "that you will find what we seek, if you are thorough enough with your "
-                           + "extermination.<BR>"
-                           + "<BR>"
-                           + "Take these explosion spell scrolls and  magical wizard's hat to aid you in your "
-                           + "battle.  The scrolls should help you make short work of the undead.<BR>"
-                           + "<BR>"
-                           + "Return here when you have found a <I>Daemon Bone</I>.";
+                    return 1049389;
                 }
 
                 /* <I>You hand Uzeraan the Vial of Blood, which he hastily accepts...</I><BR><BR>
@@ -333,7 +318,7 @@ namespace Server.Engines.Quests.Haven
 
     public class UzeraanDaemonBoneConversation : QuestConversation
     {
-        public override object Message => 1049335;
+        public override int Message => 1049335;
 
         public override void OnRead()
         {
@@ -343,7 +328,7 @@ namespace Server.Engines.Quests.Haven
 
     public class BankerConversation : QuestConversation
     {
-        public override object Message => 1060137;
+        public override int Message => 1060137;
 
         public override void OnRead()
         {
@@ -353,7 +338,7 @@ namespace Server.Engines.Quests.Haven
 
     public class RadarConversation : QuestConversation
     {
-        public override object Message => 1049660;
+        public override int Message => 1049660;
 
         public override bool Logged => false;
     }
@@ -368,7 +353,7 @@ namespace Server.Engines.Quests.Haven
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -417,7 +402,7 @@ namespace Server.Engines.Quests.Haven
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -466,28 +451,28 @@ namespace Server.Engines.Quests.Haven
 
     public class DryadAppleConversation : QuestConversation
     {
-        public override object Message => 1049360;
+        public override int Message => 1049360;
 
         public override bool Logged => false;
     }
 
     public class LostDaemonBloodConversation : QuestConversation
     {
-        public override object Message => 1049375;
+        public override int Message => 1049375;
 
         public override bool Logged => false;
     }
 
     public class LostDaemonBoneConversation : QuestConversation
     {
-        public override object Message => 1049376;
+        public override int Message => 1049376;
 
         public override bool Logged => false;
     }
 
     public class FewReagentsConversation : QuestConversation
     {
-        public override object Message => 1049390;
+        public override int Message => 1049390;
 
         public override bool Logged => false;
     }
diff --git a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Objectives.cs b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Objectives.cs
index f4bb5e076..e69e4c14a 100644
--- a/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Objectives.cs	
@@ -6,7 +6,7 @@ namespace Server.Engines.Quests.Haven
 {
     public class FindUzeraanBeginObjective : QuestObjective
     {
-        public override object Message => 1046039;
+        public override int Message => 1046039;
 
         public override void OnComplete()
         {
@@ -27,7 +27,7 @@ namespace Server.Engines.Quests.Haven
 
         public TitheGoldObjective() => m_OldTithingPoints = -1;
 
-        public override object Message => 1060386;
+        public override int Message => 1060386;
 
         public override void CheckProgress()
         {
@@ -58,7 +58,7 @@ namespace Server.Engines.Quests.Haven
 
     public class FindUzeraanFirstTaskObjective : QuestObjective
     {
-        public override object Message => 1060387;
+        public override int Message => 1060387;
 
         public override void OnComplete()
         {
@@ -83,7 +83,7 @@ namespace Server.Engines.Quests.Haven
 
         public KillHordeMinionsStep Step { get; private set; }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -232,7 +232,7 @@ namespace Server.Engines.Quests.Haven
 
     public class FindUzeraanAboutReportObjective : QuestObjective
     {
-        public override object Message => 1049091;
+        public override int Message => 1049091;
 
         public override void OnComplete()
         {
@@ -242,7 +242,7 @@ namespace Server.Engines.Quests.Haven
 
     public class FindSchmendrickObjective : QuestObjective
     {
-        public override object Message => 1049120;
+        public override int Message => 1049120;
 
         public override bool IgnoreYoungProtection(Mobile from)
         {
@@ -264,7 +264,7 @@ namespace Server.Engines.Quests.Haven
 
     public class FindApprenticeObjective : QuestObjective
     {
-        public override object Message => 1049323;
+        public override int Message => 1049323;
 
         public override void OnComplete()
         {
@@ -274,7 +274,7 @@ namespace Server.Engines.Quests.Haven
 
     public class ReturnScrollOfPowerObjective : QuestObjective
     {
-        public override object Message => 1049324;
+        public override int Message => 1049324;
 
         public override void OnComplete()
         {
@@ -284,7 +284,7 @@ namespace Server.Engines.Quests.Haven
 
     public class FindDryadObjective : QuestObjective
     {
-        public override object Message => 1049358;
+        public override int Message => 1049358;
 
         public override void OnComplete()
         {
@@ -294,7 +294,7 @@ namespace Server.Engines.Quests.Haven
 
     public class ReturnFertileDirtObjective : QuestObjective
     {
-        public override object Message => 1049327;
+        public override int Message => 1049327;
 
         public override void OnComplete()
         {
@@ -306,7 +306,7 @@ namespace Server.Engines.Quests.Haven
     {
         private bool m_Ambushed;
 
-        public override object Message => 1049361;
+        public override int Message => 1049361;
 
         public override void CheckProgress()
         {
@@ -357,7 +357,7 @@ namespace Server.Engines.Quests.Haven
 
     public class ReturnDaemonBloodObjective : QuestObjective
     {
-        public override object Message => 1049332;
+        public override int Message => 1049332;
 
         public override void OnComplete()
         {
@@ -369,7 +369,7 @@ namespace Server.Engines.Quests.Haven
     {
         public Container CorpseWithBone { get; set; }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -447,7 +447,7 @@ namespace Server.Engines.Quests.Haven
 
     public class ReturnDaemonBoneObjective : QuestObjective
     {
-        public override object Message => 1049334;
+        public override int Message => 1049334;
 
         public override void OnComplete()
         {
@@ -457,7 +457,7 @@ namespace Server.Engines.Quests.Haven
 
     public class CashBankCheckObjective : QuestObjective
     {
-        public override object Message => 1049336;
+        public override int Message => 1049336;
 
         public override void OnComplete()
         {
diff --git a/Projects/UOContent/Engines/Quests/Witch Apprentice/Conversations.cs b/Projects/UOContent/Engines/Quests/Witch Apprentice/Conversations.cs
index 6b74cbae1..f8b9ebadb 100644
--- a/Projects/UOContent/Engines/Quests/Witch Apprentice/Conversations.cs	
+++ b/Projects/UOContent/Engines/Quests/Witch Apprentice/Conversations.cs	
@@ -4,14 +4,14 @@ namespace Server.Engines.Quests.Hag
 {
     public class DontOfferConversation : QuestConversation
     {
-        public override object Message => 1055000;
+        public override int Message => 1055000;
 
         public override bool Logged => false;
     }
 
     public class AcceptConversation : QuestConversation
     {
-        public override object Message => 1055002;
+        public override int Message => 1055002;
 
         public override void OnRead()
         {
@@ -21,14 +21,14 @@ namespace Server.Engines.Quests.Hag
 
     public class HagDuringCorpseSearchConversation : QuestConversation
     {
-        public override object Message => 1055003;
+        public override int Message => 1055003;
 
         public override bool Logged => false;
     }
 
     public class ApprenticeCorpseConversation : QuestConversation
     {
-        public override object Message => 1055004;
+        public override int Message => 1055004;
 
         public override void OnRead()
         {
@@ -38,7 +38,7 @@ namespace Server.Engines.Quests.Hag
 
     public class MurderConversation : QuestConversation
     {
-        public override object Message => 1055005;
+        public override int Message => 1055005;
 
         public override void OnRead()
         {
@@ -48,7 +48,7 @@ namespace Server.Engines.Quests.Hag
 
     public class HagDuringImpSearchConversation : QuestConversation
     {
-        public override object Message => 1055006;
+        public override int Message => 1055006;
 
         public override bool Logged => false;
     }
@@ -63,7 +63,7 @@ namespace Server.Engines.Quests.Hag
         {
         }
 
-        public override object Message => 1055007;
+        public override int Message => 1055007;
 
         public override void OnRead()
         {
@@ -87,7 +87,7 @@ namespace Server.Engines.Quests.Hag
 
     public class ZeefzorpulConversation : QuestConversation
     {
-        public override object Message => 1055008;
+        public override int Message => 1055008;
 
         public override void OnRead()
         {
@@ -97,7 +97,7 @@ namespace Server.Engines.Quests.Hag
 
     public class RecipeConversation : QuestConversation
     {
-        public override object Message => 1055009;
+        public override int Message => 1055009;
 
         public override void OnRead()
         {
@@ -107,14 +107,14 @@ namespace Server.Engines.Quests.Hag
 
     public class HagDuringIngredientsConversation : QuestConversation
     {
-        public override object Message => 1055012;
+        public override int Message => 1055012;
 
         public override bool Logged => false;
     }
 
     public class BlackheartFirstConversation : QuestConversation
     {
-        public override object Message => 1055010;
+        public override int Message => 1055010;
 
         public override void OnRead()
         {
@@ -141,7 +141,7 @@ namespace Server.Engines.Quests.Hag
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -226,7 +226,7 @@ namespace Server.Engines.Quests.Hag
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -281,7 +281,7 @@ namespace Server.Engines.Quests.Hag
 
     public class EndConversation : QuestConversation
     {
-        public override object Message => 1055013;
+        public override int Message => 1055013;
 
         public override void OnRead()
         {
@@ -291,7 +291,7 @@ namespace Server.Engines.Quests.Hag
 
     public class RecentlyFinishedConversation : QuestConversation
     {
-        public override object Message => 1055064;
+        public override int Message => 1055064;
 
         public override bool Logged => false;
     }
diff --git a/Projects/UOContent/Engines/Quests/Witch Apprentice/Objectives.cs b/Projects/UOContent/Engines/Quests/Witch Apprentice/Objectives.cs
index d5d0cf64f..723a129f0 100644
--- a/Projects/UOContent/Engines/Quests/Witch Apprentice/Objectives.cs	
+++ b/Projects/UOContent/Engines/Quests/Witch Apprentice/Objectives.cs	
@@ -29,7 +29,7 @@ namespace Server.Engines.Quests.Hag
         {
         }
 
-        public override object Message => 1055014;
+        public override int Message => 1055014;
 
         public Corpse Corpse { get; private set; }
 
@@ -117,7 +117,7 @@ namespace Server.Engines.Quests.Hag
 
     public class FindGrizeldaAboutMurderObjective : QuestObjective
     {
-        public override object Message => 1055015;
+        public override int Message => 1055015;
 
         public override void OnComplete()
         {
@@ -141,7 +141,7 @@ namespace Server.Engines.Quests.Hag
         {
         }
 
-        public override object Message => 1055016;
+        public override int Message => 1055016;
 
         public override int MaxProgress => m_MaxProgress;
 
@@ -204,7 +204,7 @@ namespace Server.Engines.Quests.Hag
         {
         }
 
-        public override object Message => 1055017;
+        public override int Message => 1055017;
 
         public Point3D ImpLocation { get; private set; }
 
@@ -256,7 +256,7 @@ namespace Server.Engines.Quests.Hag
 
     public class ReturnRecipeObjective : QuestObjective
     {
-        public override object Message => 1055018;
+        public override int Message => 1055018;
 
         public override void OnComplete()
         {
@@ -296,7 +296,7 @@ namespace Server.Engines.Quests.Hag
         {
         }
 
-        public override object Message
+        public override int Message
         {
             get
             {
@@ -453,7 +453,7 @@ namespace Server.Engines.Quests.Hag
 
     public class ReturnIngredientsObjective : QuestObjective
     {
-        public override object Message => 1055050;
+        public override int Message => 1055050;
 
         public override void OnComplete()
         {