From b4de631f969b7715d4aead7c5c044a5741ffeb60 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Thu, 5 Aug 2021 19:31:52 -0700 Subject: [PATCH] fix(quests): Removes ML quest spawners (#675) --- .../ML Quests/Definitions/AGhostOfCovetous.cs | 26 --- .../Engines/ML Quests/Definitions/Bedlam.cs | 15 -- .../ML Quests/Definitions/BlightedGrove.cs | 11 -- .../ML Quests/Definitions/Britannia.cs | 16 -- .../ML Quests/Definitions/Heartwood.cs | 102 ---------- .../Engines/ML Quests/Definitions/Heritage.cs | 130 ------------- .../ML Quests/Definitions/HonestBeggar.cs | 16 -- .../Engines/ML Quests/Definitions/Ilshenar.cs | 31 --- .../Engines/ML Quests/Definitions/Malas.cs | 7 - .../ML Quests/Definitions/MistakenIdentity.cs | 21 -- .../Definitions/NewHavenSkillTraining.cs | 182 ------------------ .../ML Quests/Definitions/NewHavenTraining.cs | 84 -------- .../ML Quests/Definitions/Sanctuary.cs | 26 --- .../ML Quests/Definitions/Spellweaving.cs | 68 +------ .../ML Quests/Definitions/TheAncientWorld.cs | 8 - .../ML Quests/Definitions/UnfadingMemories.cs | 16 -- 16 files changed, 1 insertion(+), 758 deletions(-) diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/AGhostOfCovetous.cs b/Projects/UOContent/Engines/ML Quests/Definitions/AGhostOfCovetous.cs index dc04966d8..9d0773c87 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/AGhostOfCovetous.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/AGhostOfCovetous.cs @@ -34,14 +34,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(SaveHisDad); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Ben"), new Point3D(2467, 402, 15), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Ben"), new Point3D(2467, 402, 15), Map.Felucca); - } } public class SaveHisDad : MLQuest @@ -75,14 +67,6 @@ namespace Server.Engines.MLQuests.Definitions public override Type NextQuest => typeof(AFathersGratitude); public override bool IsChainTriggered => true; - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Frederic"), new Point3D(2415, 887, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Frederic"), new Point3D(2415, 887, 0), Map.Felucca); - } } public class AFathersGratitude : MLQuest @@ -108,16 +92,6 @@ namespace Server.Engines.MLQuests.Definitions } public override bool IsChainTriggered => true; - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Leon"), new Point3D(2918, 851, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Leon"), new Point3D(2918, 851, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Andros"), new Point3D(2531, 581, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Andros"), new Point3D(2531, 581, 0), Map.Felucca); - } } public class Ben : BaseCreature diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Bedlam.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Bedlam.cs index 1019b5d9a..7dd87444c 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Bedlam.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Bedlam.cs @@ -23,14 +23,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.LargeBagOfTreasure); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Kia"), new Point3D(87, 1640, 0), Map.Malas); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Nythalia"), new Point3D(91, 1639, 0), Map.Malas); - } } public class CulinaryCrisis : MLQuest @@ -51,13 +43,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.BagOfTreasure); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Emerillo"), new Point3D(90, 1639, 0), Map.Malas); - } } public class GoneNative : MLQuest diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs b/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs index 626cf7dfe..7e4acbc5d 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs @@ -26,17 +26,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(ARockAndAHardPlace); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Jamal"), new Point3D(559, 1651, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Jamal"), new Point3D(559, 1651, 0), Map.Trammel); - - PutSpawner(new Spawner(1, 5, 10, 0, 2, "Iosep"), new Point3D(1354, 3754, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 2, "Iosep"), new Point3D(1354, 3754, 0), Map.Trammel); - } } public class ARockAndAHardPlace : MLQuest diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs index 41081f19a..4783c7a94 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs @@ -35,14 +35,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(Aemaeth2); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Aurelia"), new Point3D(1459, 3795, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Aurelia"), new Point3D(1459, 3795, 0), Map.Felucca); - } } public class Aemaeth2 : MLQuest @@ -74,14 +66,6 @@ namespace Server.Engines.MLQuests.Definitions } public override bool IsChainTriggered => true; - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 2, "SkeletonOfSzandor"), new Point3D(1277, 3731, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 2, "SkeletonOfSzandor"), new Point3D(1277, 3731, 0), Map.Felucca); - } } public class OddsAndEnds : MLQuest diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Heartwood.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Heartwood.cs index 9b26daed9..b2fc31830 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Heartwood.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Heartwood.cs @@ -22,108 +22,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.SmallBagOfTrinkets); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Saril"), new Point3D(7075, 376, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Saril"), new Point3D(7075, 376, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Cailla"), new Point3D(7075, 377, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Cailla"), new Point3D(7075, 377, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Tamm"), new Point3D(7075, 378, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Tamm"), new Point3D(7075, 378, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Landy"), new Point3D(7089, 390, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Landy"), new Point3D(7089, 390, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Alejaha"), new Point3D(7043, 387, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Alejaha"), new Point3D(7043, 387, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Mielan"), new Point3D(7063, 350, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Mielan"), new Point3D(7063, 350, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Ciala"), new Point3D(7031, 411, 7), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Ciala"), new Point3D(7031, 411, 7), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Aniel"), new Point3D(7034, 412, 6), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Aniel"), new Point3D(7034, 412, 6), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Aulan"), new Point3D(6986, 340, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Aulan"), new Point3D(6986, 340, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Brinnae"), new Point3D(6996, 351, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Brinnae"), new Point3D(6996, 351, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Caelas"), new Point3D(7039, 390, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Caelas"), new Point3D(7039, 390, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Clehin"), new Point3D(7092, 390, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Clehin"), new Point3D(7092, 390, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Cloorne"), new Point3D(7010, 364, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Cloorne"), new Point3D(7010, 364, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Salaenih"), new Point3D(7009, 362, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Salaenih"), new Point3D(7009, 362, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Vilo"), new Point3D(7029, 377, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Vilo"), new Point3D(7029, 377, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Tholef"), new Point3D(6986, 386, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Tholef"), new Point3D(6986, 386, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Tillanil"), new Point3D(6987, 388, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Tillanil"), new Point3D(6987, 388, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Waelian"), new Point3D(6996, 381, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Waelian"), new Point3D(6996, 381, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Sleen"), new Point3D(6997, 381, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Sleen"), new Point3D(6997, 381, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Unoelil"), new Point3D(7010, 388, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Unoelil"), new Point3D(7010, 388, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Anolly"), new Point3D(7009, 388, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Anolly"), new Point3D(7009, 388, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Jusae"), new Point3D(7042, 377, 2), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Jusae"), new Point3D(7042, 377, 2), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Cillitha"), new Point3D(7043, 377, 2), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Cillitha"), new Point3D(7043, 377, 2), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Lohn"), new Point3D(7062, 410, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Lohn"), new Point3D(7062, 410, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Olla"), new Point3D(7063, 410, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Olla"), new Point3D(7063, 410, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Thallary"), new Point3D(7032, 439, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Thallary"), new Point3D(7032, 439, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Ahie"), new Point3D(7033, 440, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Ahie"), new Point3D(7033, 440, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Tyeelor"), new Point3D(7010, 364, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Tyeelor"), new Point3D(7010, 364, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Athailon"), new Point3D(7011, 365, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Athailon"), new Point3D(7011, 365, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderTaellia"), new Point3D(7038, 387, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderTaellia"), new Point3D(7038, 387, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderMallew"), new Point3D(7047, 390, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderMallew"), new Point3D(7047, 390, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderAbbein"), new Point3D(7043, 390, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderAbbein"), new Point3D(7043, 390, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderVicaie"), new Point3D(7054, 390, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderVicaie"), new Point3D(7054, 390, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderJothan"), new Point3D(7056, 383, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderJothan"), new Point3D(7056, 383, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "ElderAlethanian"), new Point3D(7056, 380, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "ElderAlethanian"), new Point3D(7056, 380, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Rebinil"), new Point3D(7089, 380, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Rebinil"), new Point3D(7089, 380, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Aluniol"), new Point3D(7089, 383, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Aluniol"), new Point3D(7089, 383, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Olaeni"), new Point3D(7080, 363, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Olaeni"), new Point3D(7080, 363, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Bolaevin"), new Point3D(7066, 351, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Bolaevin"), new Point3D(7066, 351, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "LorekeeperAneen"), new Point3D(7053, 337, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "LorekeeperAneen"), new Point3D(7053, 337, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Daelas"), new Point3D(7036, 412, 7), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Daelas"), new Point3D(7036, 412, 7), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Alelle"), new Point3D(7028, 406, 7), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Alelle"), new Point3D(7028, 406, 7), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "LorekeeperNillaen"), new Point3D(7061, 370, 14), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "LorekeeperNillaen"), new Point3D(7061, 370, 14), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "LorekeeperRyal"), new Point3D(7009, 375, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "LorekeeperRyal"), new Point3D(7009, 375, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Braen"), new Point3D(7081, 366, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Braen"), new Point3D(7081, 366, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderAcob"), new Point3D(7037, 387, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "ElderAcob"), new Point3D(7037, 387, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "LorekeeperCalendor"), new Point3D(7062, 370, 14), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "LorekeeperCalendor"), new Point3D(7062, 370, 14), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "LorekeeperSiarra"), new Point3D(7051, 339, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "LorekeeperSiarra"), new Point3D(7051, 339, 0), Map.Felucca); - } } public class TheyllEatAnything : MLQuest diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Heritage.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Heritage.cs index 03e077ac6..abff80e08 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Heritage.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Heritage.cs @@ -1,7 +1,6 @@ using System; using Server.Engines.MLQuests.Objectives; using Server.Engines.MLQuests.Rewards; -using Server.Engines.Spawners; using Server.Items; using Server.Mobiles; @@ -35,17 +34,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have gained the boon of Maul! Your understanding of the seasons grows. You are one step closer to claiming your elven heritage. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Darius"), new Point3D(4310, 954, 10), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Darius"), new Point3D(4310, 954, 10), Map.Trammel); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "MaulTheBear"), new Point3D(1730, 257, 16), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "MaulTheBear"), new Point3D(1730, 257, 16), Map.Trammel); - } } public class CaretakerOfTheLand : MLQuest @@ -77,25 +65,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have gained the boon of Strongroot! You have been approved by one whose roots touch the bones of Sosaria. You are one step closer to claiming your elven heritage. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Strongroot"), new Point3D(597, 1744, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Strongroot"), new Point3D(597, 1744, 0), Map.Trammel); - - PutSpawner( - new Spawner(1, TimeSpan.FromSeconds(30), TimeSpan.FromMinutes(2), 0, 12, "SapOfSosaria"), - new Point3D(757, 1004, 0), - Map.Felucca - ); - PutSpawner( - new Spawner(1, TimeSpan.FromSeconds(30), TimeSpan.FromMinutes(2), 0, 12, "SapOfSosaria"), - new Point3D(757, 1004, 0), - Map.Trammel - ); - } } public class WisdomOfTheSphynx : MLQuest @@ -128,14 +97,6 @@ namespace Server.Engines.MLQuests.Definitions instance.ClaimRewards(); // skip gump } - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Enigma"), new Point3D(1828, 961, 7), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Enigma"), new Point3D(1828, 961, 7), Map.Trammel); - } - private class InternalObjective : CollectObjective { public InternalObjective() @@ -180,33 +141,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have gained the boon of Bravehorn! You have glimpsed the nobility of those that sacrifice themselves for their people. You are one step closer to claiming your elven heritage. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner( - new Spawner(1, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(90), 0, 5, "Bravehorn"), - new Point3D(1193, 2467, 0), - Map.Felucca - ); - PutSpawner( - new Spawner(1, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(90), 0, 5, "Bravehorn"), - new Point3D(1193, 2467, 0), - Map.Trammel - ); - - PutSpawner( - new Spawner(5, TimeSpan.FromSeconds(20), TimeSpan.FromSeconds(30), 0, 8, "BravehornsMate"), - new Point3D(1192, 2467, 0), - Map.Felucca - ); - PutSpawner( - new Spawner(5, TimeSpan.FromSeconds(20), TimeSpan.FromSeconds(30), 0, 8, "BravehornsMate"), - new Point3D(1192, 2467, 0), - Map.Trammel - ); - } } public class TheBalanceOfNature : MLQuest @@ -243,25 +177,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have gained the boon of the Huntsman! You have been given a taste of the bittersweet duty of those who guard the balance. You are one step closer to claiming your elven heritage. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Huntsman"), new Point3D(1676, 593, 16), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Huntsman"), new Point3D(1676, 593, 16), Map.Trammel); - - PutSpawner( - new Spawner(5, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(15), 0, 10, "TimberWolf"), - new Point3D(1671, 592, 16), - Map.Felucca - ); - PutSpawner( - new Spawner(5, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(15), 0, 10, "TimberWolf"), - new Point3D(1671, 592, 16), - Map.Trammel - ); - } } public class TheJoysOfLife : MLQuest @@ -292,24 +207,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have gained the boon of Arielle! You have been taught the importance of laughter and light spirits. You are one step closer to claiming your elven heritage. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Arielle"), new Point3D(1560, 1182, -27), Map.Ilshenar); - PutSpawner( - new Spawner(1, 5, 10, 0, 5, "Arielle"), - new Point3D(3366, 292, 9), - Map.Felucca - ); // Felucca spawn for reds - - PutSpawner( - new Spawner(6, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(30), 0, 20, "ABauble"), - new Point3D(1585, 1212, -13), - Map.Ilshenar - ); - } } [QuesterName("Maul")] @@ -604,17 +501,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have demonstrated your ingenuity! Humans are jacks of all trades and know a little about a lot of things. You are one step closer to achieving humanity. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Nedrick"), new Point3D(2958, 3466, 15), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Nedrick"), new Point3D(2958, 3466, 15), Map.Trammel); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Sledge"), new Point3D(2673, 2129, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Sledge"), new Point3D(2673, 2129, 0), Map.Trammel); - } } public class HeaveHo : MLQuest @@ -655,14 +541,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have demonstrated your physical strength! Humans can carry vast loads without complaint. You are one step closer to achieving humanity. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Patricus"), new Point3D(3007, 823, -2), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Patricus"), new Point3D(3007, 823, -2), Map.Trammel); - } } // This is not a real quest, it is only used as a reference @@ -732,14 +610,6 @@ namespace Server.Engines.MLQuests.Definitions ); // You have demonstrated your toughness! Humans are able to endure unimaginable hardships in pursuit of their goals. You are one step closer to achieving humanity. instance.ClaimRewards(); // skip gump } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Belulah"), new Point3D(3782, 1266, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Belulah"), new Point3D(3782, 1266, 0), Map.Trammel); - } } [QuesterName("Sledge (Buc's Den)")] diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/HonestBeggar.cs b/Projects/UOContent/Engines/ML Quests/Definitions/HonestBeggar.cs index 5fdba233c..32d15b41d 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/HonestBeggar.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/HonestBeggar.cs @@ -28,14 +28,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(ReginasThanks); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Evan"), new Point3D(1486, 1706, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Evan"), new Point3D(1486, 1706, 0), Map.Felucca); - } } public class ReginasThanks : MLQuest @@ -59,14 +51,6 @@ namespace Server.Engines.MLQuests.Definitions } public override bool IsChainTriggered => true; - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Regina"), new Point3D(1362, 1622, 50), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Regina"), new Point3D(1422, 1621, 20), Map.Felucca); - } } public class Evan : BaseCreature diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Ilshenar.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Ilshenar.cs index e28fda230..f0cb9361b 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Ilshenar.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Ilshenar.cs @@ -29,23 +29,6 @@ namespace Server.Engines.MLQuests.Definitions // { // instance.Player.SendLocalizedMessage( 1073775, "", 0x23 ); // Your quest is complete. Return for your reward. // } - - public override void Generate() - { - base.Generate(); - - PutSpawner( - new Spawner(1, TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(30), 0, 5, "Lissbet"), - new Point3D(1568, 1040, -7), - Map.Ilshenar - ); - PutSpawner(new Spawner(1, 5, 10, 0, 8, "GrandpaCharley"), new Point3D(1322, 1331, -14), Map.Ilshenar); - PutSpawner( - new Spawner(1, TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(30), 0, 3, "Sheep"), - new Point3D(1308, 1324, -14), - Map.Ilshenar - ); - } } public class SomethingToWailAbout : MLQuest @@ -63,13 +46,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.BagOfTreasure); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Jelrice"), new Point3D(1176, 1196, -25), Map.Ilshenar); - } } public class Runaways : MLQuest @@ -127,13 +103,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.Strongbox); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "Yorus"), new Point3D(1389, 423, -24), Map.Ilshenar); - } } public class Lissbet : BaseEscortable diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Malas.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Malas.cs index 43b968308..e871aa91b 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Malas.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Malas.cs @@ -22,13 +22,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.BagOfTrinkets); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Drithen"), new Point3D(1983, 1364, -80), Map.Malas); - } } [QuesterName("Drithen (Umbra)")] diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/MistakenIdentity.cs b/Projects/UOContent/Engines/ML Quests/Definitions/MistakenIdentity.cs index 4c49c25eb..5ff51e5e0 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/MistakenIdentity.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/MistakenIdentity.cs @@ -34,13 +34,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(YouScratchMyBack); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Aernya"), new Point3D(2095, 1380, -90), Map.Malas); - } } public class YouScratchMyBack : MLQuest @@ -67,13 +60,6 @@ namespace Server.Engines.MLQuests.Definitions public override Type NextQuest => typeof(FoolingAernya); public override bool IsChainTriggered => true; - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 4, "Gorrow"), new Point3D(993, 512, -50), Map.Malas); - } } public class FoolingAernya : MLQuest @@ -173,13 +159,6 @@ namespace Server.Engines.MLQuests.Definitions public override Type NextQuest => typeof(TuitionReimbursement); public override bool IsChainTriggered => true; - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "MasterGnosos"), new Point3D(87, 1639, 0), Map.Malas); - } } public class TuitionReimbursement : MLQuest diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenSkillTraining.cs b/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenSkillTraining.cs index 20f0a664d..1f63dfc43 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenSkillTraining.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenSkillTraining.cs @@ -28,13 +28,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077727, typeof(BulwarkLeggings))); // Bulwark Leggings } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Aelorn"), new Point3D(3527, 2516, 45), Map.Trammel); - } } public class TheRudimentsOfSelfDefense : MLQuest @@ -59,13 +52,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077614, typeof(GlovesOfSafeguarding))); // Gloves Of Safeguarding } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Dimethro"), new Point3D(3528, 2520, 25), Map.Trammel); - } } public class CrushingBonesAndTakingNames : MLQuest @@ -90,13 +76,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078062, typeof(ChurchillsWarMace))); // Churchill's War Mace } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Churchill"), new Point3D(3531, 2531, 20), Map.Trammel); - } } public class SwiftAsAnArrow : MLQuest @@ -120,13 +99,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078210, typeof(Heartseeker))); // Heartseeker } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Robyn"), new Point3D(3535, 2531, 20), Map.Trammel); - } } public class EnGuarde : MLQuest @@ -151,13 +123,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078195, typeof(RecarosRiposte))); // Recaro's Riposte } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Recaro"), new Point3D(3536, 2534, 20), Map.Trammel); - } } public class TheArtOfWar : MLQuest @@ -182,13 +147,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077675, typeof(ArmsOfArmstrong))); // Arms of Armstrong } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "AldenArmstrong"), new Point3D(3535, 2538, 20), Map.Trammel); - } } public class TheWayOfTheBlade : MLQuest @@ -213,13 +171,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077666, typeof(JocklesQuicksword))); // Jockles' Quicksword } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Jockles"), new Point3D(3535, 2544, 20), Map.Trammel); - } } public class ThouAndThineShield : MLQuest @@ -244,13 +195,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077694, typeof(EscutcheonDeAriadne))); // Escutcheon de Ariadne } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "TylAriadne"), new Point3D(3525, 2556, 20), Map.Trammel); - } } public class DefyingTheArcane : MLQuest @@ -275,13 +219,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077627, typeof(BraceletOfResilience))); // Bracelet of Resilience } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Alefian"), new Point3D(3473, 2497, 72), Map.Trammel); - } } public class StoppingTheWorld : MLQuest @@ -305,13 +242,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077602, typeof(PhilosophersHat))); // Philosopher's Hat } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Gustar"), new Point3D(3474, 2492, 91), Map.Trammel); - } } public class ScribingArcaneKnowledge : MLQuest @@ -336,13 +266,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077620, typeof(HallowedSpellbook))); // Hallowed Spellbook } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Jillian"), new Point3D(3465, 2490, 71), Map.Trammel); - } } public class TheMagesApprentice : MLQuest @@ -367,13 +290,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077582, typeof(EmberStaff))); // Ember Staff } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Kaelynna"), new Point3D(3486, 2491, 52), Map.Trammel); - } } public class ScholarlyTask : MLQuest @@ -397,13 +313,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077608, typeof(RingOfTheSavant))); // Ring of the Savant } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Mithneral"), new Point3D(3485, 2491, 71), Map.Trammel); - } } public class TheRightToolForTheJob : MLQuest @@ -428,13 +337,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077749, typeof(AmeliasToolbox))); // Amelia’s Toolbox } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "AmeliaYoungstone"), new Point3D(3459, 2529, 53), Map.Trammel); - } } public class KnowThineEnemy : MLQuest @@ -459,13 +361,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077693, typeof(TunicOfGuarding))); // Tunic of Guarding } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "AndreasVesalius"), new Point3D(3457, 2550, 35), Map.Trammel); - } } public class BruisesBandagesAndBlood : MLQuest @@ -490,13 +385,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077684, typeof(HealersTouch))); // Healer's Touch } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Avicenna"), new Point3D(3464, 2558, 35), Map.Trammel); - } } public class TheInnerWarrior : MLQuest @@ -521,13 +409,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077695, typeof(ClaspOfConcentration))); // Clasp of Concentration } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "SarsmeaSmythe"), new Point3D(3492, 2577, 15), Map.Trammel); - } } public class TheArtOfStealth : MLQuest @@ -551,13 +432,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078163, typeof(SilverSerpentBlade))); // Silver Serpent Blade } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Ryuichi"), new Point3D(3422, 2520, 21), Map.Trammel); - } } public class BecomingOneWithTheShadows : MLQuest @@ -581,13 +455,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078173, typeof(BagOfSmokeBombs))); // Bag of Smoke Bombs } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Chiyo"), new Point3D(3420, 2516, 21), Map.Trammel); - } } public class WalkingSilently : MLQuest @@ -611,13 +478,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078183, typeof(TwilightJacket))); // Twilight Jacket } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Jun"), new Point3D(3422, 2516, 21), Map.Trammel); - } } public class EyesOfARanger : MLQuest @@ -642,13 +502,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078222, typeof(WalkersLeggings))); // Walker's Leggings } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Walker"), new Point3D(3429, 2518, 19), Map.Trammel); - } } public class TheWayOfTheSamurai : MLQuest @@ -672,13 +525,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078015, typeof(TheDragonsTail))); // The Dragon's Tail } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Hamato"), new Point3D(3493, 2414, 55), Map.Trammel); - } } public class TheAllureOfDarkMagic : MLQuest @@ -703,13 +549,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new InternalReward()); } - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Mulcivikh"), new Point3D(3548, 2456, 15), Map.Trammel); - } - private class InternalReward : ItemReward { public InternalReward() @@ -753,13 +592,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1078053, typeof(BagOfNecromancerReagents))); // Bag of Necromancer Reagents } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Morganna"), new Point3D(3547, 2463, 15), Map.Trammel); - } } public class TheDeluciansLostMine : MLQuest @@ -784,13 +616,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077758, typeof(JacobsPickaxe))); // Jacob's Pickaxe } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "JacobWaltz"), new Point3D(3504, 2741, 0), Map.Trammel); - } } public class ItsHammerTime : MLQuest @@ -815,13 +640,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1077740, typeof(HammerOfHephaestus))); // Hammer of Hephaestus } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "GeorgeHephaestus"), new Point3D(3471, 2542, 36), Map.Trammel); - } } public class Aelorn : KeeperOfChivalry diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenTraining.cs b/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenTraining.cs index 6d8f3a6d6..e4a992b8b 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenTraining.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/NewHavenTraining.cs @@ -23,13 +23,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(AndricSatchel))); // Craftsmans's Satchel } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Andric"), new Point3D(3742, 2582, 40), Map.Trammel); - } } public class IShotAnArrowIntoTheAir : MLQuest @@ -47,13 +40,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.BagOfTrinkets); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Kashiel"), new Point3D(3744, 2586, 40), Map.Trammel); - } } public class BakersDozen : MLQuest @@ -74,13 +60,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(AsandosSatchel))); // Craftsmans's Satchel } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Asandos"), new Point3D(3505, 2513, 27), Map.Trammel); - } } public class AStitchInTime : MLQuest @@ -103,13 +82,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1075524, typeof(AnOldRing))); // an old ring Rewards.Add(new ItemReward(1075525, typeof(AnOldNecklace))); // an old necklace } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Clairesse"), new Point3D(3492, 2546, 20), Map.Trammel); - } } public class BatteredBucklers : MLQuest @@ -130,13 +102,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(GervisSatchel))); // Craftsmans's Satchel } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Gervis"), new Point3D(3505, 2749, 0), Map.Trammel); - } } public class MoreOrePlease : MLQuest @@ -159,13 +124,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(MuggSatchel))); // Craftsmans's Satchel } - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Mugg"), new Point3D(3507, 2747, 0), Map.Trammel); - } - private class InternalObjective : CollectObjective { // Any type of ore is allowed @@ -195,13 +153,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(LowelSatchel))); // Craftsmans's Satchel } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Lowel"), new Point3D(3440, 2645, 27), Map.Trammel); - } } public class ThePenIsMightier : MLQuest @@ -224,13 +175,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1075545, typeof(RedLeatherBook))); // a book bound in red leather } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Lyle"), new Point3D(3503, 2584, 14), Map.Trammel); - } } public class AClockworkPuzzle : MLQuest @@ -250,13 +194,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(NibbetSatchel))); // Craftsmans's Satchel } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Nibbet"), new Point3D(3459, 2525, 53), Map.Trammel); - } } public class DeliciousFishes : MLQuest @@ -279,13 +216,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1075557, typeof(PeppercornFishsteak), 3)); // peppercorn fishsteak } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Norton"), new Point3D(3502, 2603, 1), Map.Trammel); - } } public class FleeAndFatigue : MLQuest @@ -308,13 +238,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(SadrahSatchel))); // Craftsmans's Satchel } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Sadrah"), new Point3D(3742, 2731, 7), Map.Trammel); - } } public class ChopChopOnTheDouble : MLQuest @@ -335,13 +258,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(new ItemReward(1074282, typeof(HargroveSatchel))); // Craftsmans's Satchel } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Hargrove"), new Point3D(3445, 2633, 28), Map.Trammel); - } } public class Andric : BaseCreature diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Sanctuary.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Sanctuary.cs index 6444d5c94..df3f7ca28 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Sanctuary.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Sanctuary.cs @@ -25,32 +25,6 @@ namespace Server.Engines.MLQuests.Definitions Rewards.Add(ItemReward.FletchingSatchel); } - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Beotham"), new Point3D(6285, 114, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Beotham"), new Point3D(6285, 114, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Danoel"), new Point3D(6282, 116, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Danoel"), new Point3D(6282, 116, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Tallinin"), new Point3D(6279, 122, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Tallinin"), new Point3D(6279, 122, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Tiana"), new Point3D(6257, 112, -10), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Tiana"), new Point3D(6257, 112, -10), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "LorekeeperOolua"), new Point3D(6250, 124, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "LorekeeperOolua"), new Point3D(6250, 124, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "LorekeeperRollarn"), new Point3D(6244, 110, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "LorekeeperRollarn"), new Point3D(6244, 110, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Dallid"), new Point3D(6277, 104, -10), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Dallid"), new Point3D(6277, 104, -10), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Canir"), new Point3D(6274, 130, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Canir"), new Point3D(6274, 130, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Yellienir"), new Point3D(6257, 126, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Yellienir"), new Point3D(6257, 126, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "ElderOnallan"), new Point3D(6258, 108, -10), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "ElderOnallan"), new Point3D(6258, 108, -10), Map.Felucca); - } } public class BendingTheBow : MLQuest diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/Spellweaving.cs b/Projects/UOContent/Engines/ML Quests/Definitions/Spellweaving.cs index 6fb4371ed..a37d02218 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/Spellweaving.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/Spellweaving.cs @@ -114,48 +114,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(NeedsOfTheManyHeartwood1); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Aeluva"), new Point3D(7064, 349, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Aeluva"), new Point3D(7064, 349, 0), Map.Trammel); - - // Split up to prevent stacking on the spawner - PutSpawner( - new Spawner(20, TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), 0, 30, "MiniatureMushroom"), - new Point3D(7015, 366, 0), - Map.Felucca - ); - PutSpawner( - new Spawner(20, TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), 0, 30, "MiniatureMushroom"), - new Point3D(7015, 366, 0), - Map.Trammel - ); - - PutSpawner( - new Spawner(5, TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), 0, 20, "MiniatureMushroom"), - new Point3D(7081, 373, 0), - Map.Felucca - ); - PutSpawner( - new Spawner(5, TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), 0, 20, "MiniatureMushroom"), - new Point3D(7081, 373, 0), - Map.Trammel - ); - - PutSpawner( - new Spawner(15, TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), 0, 20, "MiniatureMushroom"), - new Point3D(7052, 414, 0), - Map.Felucca - ); - PutSpawner( - new Spawner(15, TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), 0, 20, "MiniatureMushroom"), - new Point3D(7052, 414, 0), - Map.Trammel - ); - } } public class NeedsOfTheManyHeartwood1 : MLQuest @@ -279,14 +237,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(NeedsOfTheManySanctuary); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Koole"), new Point3D(6257, 110, -10), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "Koole"), new Point3D(6257, 110, -10), Map.Trammel); - } } public class NeedsOfTheManySanctuary : MLQuest @@ -406,14 +356,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(TokenOfFriendship); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Synaeva"), new Point3D(7064, 350, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Synaeva"), new Point3D(7064, 350, 0), Map.Trammel); - } } public class TokenOfFriendship : MLQuest @@ -496,14 +438,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(CrackingTheWhipI); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 0, "ElderBrae"), new Point3D(6266, 124, 0), Map.Felucca); - PutSpawner(new Spawner(1, 5, 10, 0, 0, "ElderBrae"), new Point3D(6266, 124, 0), Map.Trammel); - } } // TODO: Verify @@ -604,7 +538,7 @@ namespace Server.Engines.MLQuests.Definitions { /* * 1074206 - Excuse me please traveler, might I have a little of your time? - * 1074207 - Good day to you friend! Allow me to offer you a fabulous opportunity!  Thrills and adventure await! + * 1074207 - Good day to you friend! Allow me to offer you a fabulous opportunity! Thrills and adventure await! */ MLQuestSystem.Tell(this, pm, Utility.Random(1074206, 2)); } diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/TheAncientWorld.cs b/Projects/UOContent/Engines/ML Quests/Definitions/TheAncientWorld.cs index 401754346..45e3cb12e 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/TheAncientWorld.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/TheAncientWorld.cs @@ -26,14 +26,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(TheGoldenHorn); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 5, "LorekeeperBroolol"), new Point3D(7011, 375, 0), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 5, "LorekeeperBroolol"), new Point3D(7011, 375, 0), Map.Felucca); - } } public class TheGoldenHorn : MLQuest diff --git a/Projects/UOContent/Engines/ML Quests/Definitions/UnfadingMemories.cs b/Projects/UOContent/Engines/ML Quests/Definitions/UnfadingMemories.cs index 57f208231..a63f309f4 100644 --- a/Projects/UOContent/Engines/ML Quests/Definitions/UnfadingMemories.cs +++ b/Projects/UOContent/Engines/ML Quests/Definitions/UnfadingMemories.cs @@ -32,14 +32,6 @@ namespace Server.Engines.MLQuests.Definitions } public override Type NextQuest => typeof(UnfadingMemoriesPartTwo); - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Emilio"), new Point3D(1447, 1664, 10), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Emilio"), new Point3D(1447, 1664, 10), Map.Felucca); - } } public class UnfadingMemoriesPartTwo : MLQuest @@ -89,14 +81,6 @@ namespace Server.Engines.MLQuests.Definitions } public override bool IsChainTriggered => true; - - public override void Generate() - { - base.Generate(); - - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Thalia"), new Point3D(3675, 1322, 20), Map.Trammel); - PutSpawner(new Spawner(1, 5, 10, 0, 3, "Thalia"), new Point3D(3675, 1322, 20), Map.Felucca); - } } [QuesterName("Emilio (Britain)")] // OSI's description is "Artist", not very helpful