Browse Source

Update Server scripts

Devn00b 1 year ago
parent
commit
9b446730f8
100 changed files with 1992 additions and 232 deletions
  1. 19 0
      server/ItemScripts/AutomaticBook.lua
  2. 14 5
      server/ItemScripts/CastleviewHamletcitizenshiptask.lua
  3. 5 3
      server/ItemScripts/GraystoneYardcitizenshiptask.lua
  4. 14 3
      server/ItemScripts/Nettlevillecitizenshiptask.lua
  5. 5 3
      server/ItemScripts/StarcrestCommunecitizenshiptask.lua
  6. 7 4
      server/ItemScripts/TheBaubbleshirecitizenshiptask.lua
  7. 104 0
      server/ItemScripts/WelcometoQeynosCitizen.lua
  8. 6 4
      server/ItemScripts/WillowWoodcitizenshiptask.lua
  9. 1 1
      server/ItemScripts/asandyboneshardClassic.lua
  10. 2 1
      server/Quests/Baubbleshire/a_budding_prankster.lua
  11. 1 1
      server/Quests/Baubbleshire/a_tattered_journal_for_valean.lua
  12. 4 3
      server/Quests/Baubbleshire/badger_pelts_for_diggs.lua
  13. 3 2
      server/Quests/Baubbleshire/embers_for_xoort.lua
  14. 3 3
      server/Quests/Baubbleshire/fight_the_forgotten_guardians.lua
  15. 1 1
      server/Quests/Baubbleshire/in_search_of_the_shrine_of_estle.lua
  16. 2 2
      server/Quests/Baubbleshire/in_search_of_the_tower_of_the_order_of_three.lua
  17. 2 1
      server/Quests/Baubbleshire/oro_rootforlozoria.lua
  18. 8 1
      server/Quests/Castleview/faeadaens_dinner_message.lua
  19. 10 3
      server/Quests/CastleviewHamlet/a_jug_of_water_for_the_hole_in_the_wall_.lua
  20. 10 3
      server/Quests/CastleviewHamlet/badger_claws_for_yanari_.lua
  21. 9 2
      server/Quests/CastleviewHamlet/bog_exploring_for_grommluk.lua
  22. 11 4
      server/Quests/CastleviewHamlet/food_for_kruuprum.lua
  23. 8 1
      server/Quests/CastleviewHamlet/gathering_elddar_leaves.lua
  24. 8 4
      server/Quests/CastleviewHamlet/jewelry_delivery_to_taneran.lua
  25. 9 2
      server/Quests/CastleviewHamlet/mystail_tails_for_fevalin.lua
  26. 8 6
      server/Quests/CastleviewHamlet/new_etching_tool_for_froptubs_smithy.lua
  27. 8 2
      server/Quests/CastleviewHamlet/proving_myself_to_captain_gerathalas.lua
  28. 10 6
      server/Quests/CastleviewHamlet/reservations_for_a_visitor.lua
  29. 7 1
      server/Quests/CastleviewHamlet/substance_extract_for_yanari.lua
  30. 9 3
      server/Quests/CastleviewHamlet/sword_for_aadalian.lua
  31. 10 23
      server/Quests/CastleviewHamlet/the_lost_book_of_arbos.lua
  32. 1 1
      server/Quests/Graystone/finding_bait.lua
  33. 7 0
      server/Quests/GraystoneYard/graystone_bank_tally_delivery.lua
  34. 1 1
      server/Quests/GraystoneYard/inform_tracker_kelnis.lua
  35. 2 2
      server/Quests/GraystoneYard/shrillers_for_tillheel.lua
  36. 1 1
      server/Quests/Hallmark/baubbleshire_citizenship_task.lua
  37. 3 3
      server/Quests/Hallmark/castleview_citizenship_task.lua
  38. 7 4
      server/Quests/Hallmark/cellar_cleanup.lua
  39. 25 0
      server/Quests/Hallmark/freeport_alignment.lua
  40. 1 1
      server/Quests/Hallmark/graystone_citizenship_task.lua
  41. 1 1
      server/Quests/Hallmark/gruttooth_invasion_fighter.lua
  42. 1 1
      server/Quests/Hallmark/gruttooth_invasion_mage.lua
  43. 1 1
      server/Quests/Hallmark/gruttooth_invasion_priest.lua
  44. 1 1
      server/Quests/Hallmark/gruttooth_invasion_scout.lua
  45. 123 0
      server/Quests/Hallmark/mage_training_part_1.lua
  46. 80 0
      server/Quests/Hallmark/mage_training_part_2.lua
  47. 1 1
      server/Quests/Hallmark/nettleville_citizenship_task.lua
  48. 43 0
      server/Quests/Hallmark/path_of_the_enchanter(Q).lua
  49. 42 0
      server/Quests/Hallmark/path_of_the_sorcerer(Q).lua
  50. 43 0
      server/Quests/Hallmark/path_of_the_summoner.lua
  51. 1 1
      server/Quests/Hallmark/starcrest_citizenship_task.lua
  52. 165 0
      server/Quests/Hallmark/welcome_to_qeynos_Baubbleshire.lua
  53. 165 0
      server/Quests/Hallmark/welcome_to_qeynos_Castleivew.lua
  54. 165 0
      server/Quests/Hallmark/welcome_to_qeynos_Graystone.lua
  55. 165 0
      server/Quests/Hallmark/welcome_to_qeynos_Nettleville.lua
  56. 165 0
      server/Quests/Hallmark/welcome_to_qeynos_Starcrest.lua
  57. 165 0
      server/Quests/Hallmark/welcome_to_qeynos_WillowWood.lua
  58. 43 0
      server/Quests/Hallmark/welcome_to_qeynos_citizen.lua
  59. 1 1
      server/Quests/Hallmark/willow_wood_citizenship_task.lua
  60. 1 0
      server/Quests/IsleofRefuge/hunting_the_orcish_leader.lua
  61. 32 2
      server/Quests/MultipleZones/qeynos_alignment.lua
  62. 1 1
      server/Quests/Nettleville/refill_the_oakmyst_spider_silk_jars.lua
  63. 1 1
      server/Quests/Nettleville/restocking_bog_faerie_wings.lua
  64. 1 1
      server/Quests/Nettleville/scalies_for_shinies.lua
  65. 1 1
      server/Quests/Nettleville/toxic_glands_for_erollisis_bane.lua
  66. 1 1
      server/Quests/NorthQeynos/bear_fashion.lua
  67. 1 1
      server/Quests/OakmystForest/cleaning_supplies_for_findlebop.lua
  68. 9 8
      server/Quests/OakmystForest/destroy_the_corruption.lua
  69. 3 3
      server/Quests/OakmystForest/druids_legacy.lua
  70. 3 3
      server/Quests/OakmystForest/far_seas_requisition_okf050.lua
  71. 1 1
      server/Quests/OakmystForest/far_seas_requisition_okf063.lua
  72. 10 9
      server/Quests/OakmystForest/feed_the_sapling.lua
  73. 8 7
      server/Quests/OakmystForest/judgement_of_the_dryads.lua
  74. 13 11
      server/Quests/OakmystForest/proof_of_poachers.lua
  75. 1 1
      server/Quests/OakmystForest/runed_acorn.lua
  76. 2 2
      server/Quests/PeatBog/FarSeasDirectRequisitionPBG0162.lua
  77. 3 3
      server/Quests/PeatBog/FarSeasDirectRequisitionPBG0295.lua
  78. 2 2
      server/Quests/QeynosHarbor/taking_the_bait.lua
  79. 1 1
      server/Quests/SouthQeynos/corrupted_dryad_nuisance.lua
  80. 3 3
      server/Quests/SouthQeynos/gathering_components.lua
  81. 6 5
      server/Quests/SouthQeynos/oakmyst_minerals.lua
  82. 1 1
      server/Quests/SouthQeynos/stop_the_mischievous_tricksters.lua
  83. 1 1
      server/Quests/StarcrestCommune/BogSludgeHunt.lua
  84. 1 1
      server/Quests/StarcrestCommune/EruditeDebate.lua
  85. 1 1
      server/Quests/StarcrestCommune/GatheringGlowmyst.lua
  86. 3 3
      server/Quests/StarcrestCommune/SoberingRemedy.lua
  87. 2 2
      server/Quests/StarcrestCommune/batwing_crunchies_for_jerben.lua
  88. 1 1
      server/Quests/StarcrestCommune/essence_hunting_for_obidudyn.lua
  89. 1 1
      server/Quests/StarcrestCommune/tanairas_picnic_spot.lua
  90. 2 2
      server/Quests/TheElddarGrove/hawk_hunt.lua
  91. 9 6
      server/Quests/TheElddarGrove/pelles_manuscript.lua
  92. 2 1
      server/Quests/TheElddarGrove/visiting_the_windstalker_grave.lua
  93. 1 1
      server/Quests/TheForestRuins/far_seas_direct_requisition_frn0378.lua
  94. 2 2
      server/Quests/TheForestRuins/far_seas_direct_requisition_frn0931.lua
  95. 13 9
      server/Quests/TheForestRuins/forest_ruins_volunteer.lua
  96. 6 1
      server/Quests/TheForestRuins/letter_for_hunter_forestdeep.lua
  97. 5 5
      server/Quests/TheForestRuins/vaughns_stuff.lua
  98. 92 0
      server/Quests/TheForestRuins/vaughns_stuff_CLASSIC.lua
  99. 7 7
      server/Quests/ThePeatBog/the_path_of_the_sun_wolf_.lua
  100. 1 2
      server/Quests/TheWillowWood/baynors_bent_tongs.lua

+ 19 - 0
server/ItemScripts/AutomaticBook.lua

@@ -0,0 +1,19 @@
+--[[
+    Script Name    : ItemScripts/AutomaticBook.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.21 04:10:19
+    Script Purpose : 
+                   : 
+--]]
+
+function examined(Item, Player)
+
+end
+
+function obtained(Item, Spawn)    
+    target = GetTarget(Spawn)
+    if target ~= nil then
+--        CastEntityCommand(Spawn, target, 1, "Scribe")
+end
+end
+    

+ 14 - 5
server/ItemScripts/CastleviewHamletcitizenshiptask.lua

@@ -21,23 +21,32 @@ AddConversationOption(conversation, "[read about where tokens are found]","Dialo
 StartDialogConversation(conversation, 2, Item, Player, "Tokens are scattered throughout the surrounding area. You must find five of these tokens to earn the right to speak to a city official.")
 end
 
+function Dialog3(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "[read more]","Dialog4")
+
+StartDialogConversation(conversation, 2, Item, Player, "Each village has been assigned an area in which to hunt for their tokens. Only tokens from within that area will be accepted.")
+end
+
 function Dialog4(Item, Player)
 conversation = CreateConversation()
-if not HasQuest(Player,5719) and not HasCompletedQuest(Player,5719)then
+ if GetLevel(Player)<6 then
+ AddConversationOption(conversation, "[I need more experience to pursue Citizenship]","CloseItemConversation")
+ elseif not HasQuest(Player,5719) and not HasCompletedQuest(Player,5719)then
 AddConversationOption(conversation, "[write this in your quest journal]","StartQuest")
 end
 if HasQuest(Player,5719) or  HasCompletedQuest(Player,5719) then
 AddConversationOption(conversation, "[continue]","StartQuest")
 end
 AddConversationOption(conversation, "[put the note away]","CloseItemConversation")
-StartDialogConversation(conversation, 2, Item, Player, "Castleview Hamlet residents must gather five tokens from the Oakmyst Forest.")
+StartDialogConversation(conversation, 2, Item, Player, "Castleview Hamlet residents must gather five tokens from the Down Below.")
 end
 
 function StartQuest(Item,Player)
- if not HasQuest(Player,5719) and not HasCompletedQuest(Player,5719)then
-   OfferQuest(Item,Player,5719)
-end
 conversation = CreateConversation()
+if not HasQuest(Player,5719) and not HasCompletedQuest(Player,5719)then
+   OfferQuest(nil,Player,5719)
+end
 AddConversationOption(conversation, "[put the note]","CloseItemConversation")
 StartDialogConversation(conversation, 2, Item, Player, "After you complete your task, report to Marshal Glorfel using the citizenship sign.")
 end

+ 5 - 3
server/ItemScripts/GraystoneYardcitizenshiptask.lua

@@ -29,7 +29,9 @@ end
 
 function Dialog4(Item, Player)
 conversation = CreateConversation()
-if not HasQuest(Player,5720) and not HasCompletedQuest(Player,5720)then
+ if GetLevel(Player)<6 then
+ AddConversationOption(conversation, "[I need more experience to pursue Citizenship]","CloseItemConversation")
+ elseif not HasQuest(Player,5720) and not HasCompletedQuest(Player,5720)then
 AddConversationOption(conversation, "[write this in your quest journal]","StartQuest")
 end
 if HasQuest(Player,5720) or  HasCompletedQuest(Player,5720) then
@@ -40,8 +42,8 @@ StartDialogConversation(conversation, 2, Item, Player, "Graystone Yard residents
 end
 
 function StartQuest(Item,Player)
- if not HasQuest(Player,5720) and not HasCompletedQuest(Player,5720)then
-   OfferQuest(Item,Player,5720)
+if not HasQuest(Player,5720) and not HasCompletedQuest(Player,5720)then
+   OfferQuest(nil,Player,5720)
 end
 conversation = CreateConversation()
 AddConversationOption(conversation, "[put the note]","CloseItemConversation")

+ 14 - 3
server/ItemScripts/Nettlevillecitizenshiptask.lua

@@ -20,9 +20,19 @@ AddConversationOption(conversation, "[read about where tokens are found]","Dialo
 StartDialogConversation(conversation, 2, Item, Player, "Tokens are scattered throughout the surrounding area. You must find five of these tokens to earn the right to speak to a city official.")
 end
 
+
+function Dialog3(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "[read more]","Dialog4")
+
+StartDialogConversation(conversation, 2, Item, Player, "Each village has been assigned an area in which to hunt for their tokens. Only tokens from within that area will be accepted.")
+end
+
 function Dialog4(Item, Player)
 conversation = CreateConversation()
-if not HasQuest(Player,5721) and not HasCompletedQuest(Player,5721)then
+if GetLevel(Player)<6 then
+ AddConversationOption(conversation, "[I need more experience to pursue Citizenship]","CloseItemConversation")
+elseif not HasQuest(Player,5721) and not HasCompletedQuest(Player,5721)then
 AddConversationOption(conversation, "[write this in your quest journal]","StartQuest")
 end
 if HasQuest(Player,5721) or  HasCompletedQuest(Player,5721) then
@@ -33,8 +43,9 @@ StartDialogConversation(conversation, 2, Item, Player, "Nettleville Hovel reside
 end
 
 function StartQuest(Item,Player)
- if not HasQuest(Player,5721) and not HasCompletedQuest(Player,5721)then
-   OfferQuest(Item,Player,5721)
+conversation = CreateConversation()
+if not HasQuest(Player,5721) and not HasCompletedQuest(Player,5721)then
+   OfferQuest(nil,Player,5721)
 end
 AddConversationOption(conversation, "[put the note away]","CloseItemConversation")
 StartDialogConversation(conversation, 2, Item, Player, "After you complete your task, report to Marshal Glorfel using the citizenship sign.")

+ 5 - 3
server/ItemScripts/StarcrestCommunecitizenshiptask.lua

@@ -30,7 +30,9 @@ end
 
 function Dialog4(Item, Player)
 conversation = CreateConversation()
-if not HasQuest(Player,5722) and not HasCompletedQuest(Player,5722)then
+if GetLevel(Player)<6 then
+ AddConversationOption(conversation, "[I need more experience to pursue Citizenship]","CloseItemConversation")
+ elseif not HasQuest(Player,5722) and not HasCompletedQuest(Player,5722)then
 AddConversationOption(conversation, "[write this in your quest journal]","StartQuest")
 end
 if HasQuest(Player,5722) or  HasCompletedQuest(Player,5722) then
@@ -41,8 +43,8 @@ StartDialogConversation(conversation, 2, Item, Player, "Starcrest Commune reside
 end
 
 function StartQuest(Item,Player)
- if not HasQuest(Player,5722) and not HasCompletedQuest(Player,5722)then
-   OfferQuest(Item,Player,5722)
+if not HasQuest(Player,5722) and not HasCompletedQuest(Player,5722)then
+   OfferQuest(nil,Player,5722)
 end
 conversation = CreateConversation()
 AddConversationOption(conversation, "[put the note]","CloseItemConversation")

+ 7 - 4
server/ItemScripts/TheBaubbleshirecitizenshiptask.lua

@@ -29,7 +29,9 @@ end
 
 function Dialog4(Item, Player)
 conversation = CreateConversation()
-if not HasQuest(Player,5718) and not HasCompletedQuest(Player,5718)then
+if GetLevel(Player)<6 then
+AddConversationOption(conversation, "[I need more experience to pursue Citizenship]","CloseItemConversation")
+elseif not HasQuest(Player,5718) and not HasCompletedQuest(Player,5718)then
 AddConversationOption(conversation, "[write this in your quest journal]","StartQuest")
 end
 if HasQuest(Player,5718) or  HasCompletedQuest(Player,5718) then
@@ -42,8 +44,9 @@ end
 function StartQuest(Item,Player)
 conversation = CreateConversation()
 AddConversationOption(conversation, "[put the note]","CloseItemConversation")
-StartDialogConversation(conversation, 2, Item, Player, "After you complete your task, report to Marshal Glorfel using the citizenship sign.")
- if not HasQuest(Player,5718) and not HasCompletedQuest(Player,5718)then
-   OfferQuest(Item,Player,5718)
+if not HasQuest(Player,5718) and not HasCompletedQuest(Player,5718)then
+   OfferQuest(nil,Player,5718)
 end
+StartDialogConversation(conversation, 2, Item, Player, "After you complete your task, report to Marshal Glorfel using the citizenship sign.")
+
 end

+ 104 - 0
server/ItemScripts/WelcometoQeynosCitizen.lua

@@ -0,0 +1,104 @@
+--[[
+    Script Name    : ItemScripts/WelcometoQeynosCitizen.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.31 12:10:33
+    Script Purpose : 
+                   : 
+--]]
+
+function examined(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page1")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "Welcome to Qeynos!  As a new citizen of our city, there are probably hundreds of questions you still wish to have answered.  This book is meant to assist you in finding activities which will interest and inspire you.  Naturally, such a small book cannot possibly explain all you will need to know.  Let it serve as a brief guide to the richness that you will experience throughout Norrath.  Your citizenship is not affected if you discard this book without accepting the tasks.  If you work on these tasks, you must keep this book until you finish them all.")
+end
+
+function Page1(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page2")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "Collecting stones and shards can be a very rewarding hobby.    You can collect items as you travel, examining them to determine whether they will be worthwhile examples to keep.  Gathering little items can be addicting as well!  Be sure to look up now and again to admire the beauty of Norrath.")
+end
+
+function Page2(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page3")
+AddConversationOption(conversation, "Previous Page","Page1")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "Once you have completed a collection, present it to Mervos Stadrin in North Qeynos.  He offers rewards for your completed collections.  And should you complete an entire series of collectable items, you may receive something special for your home as well.  Gathering collectibles is not only educational and rewarding but fun as well.")
+end
+
+function Page3(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page4")
+AddConversationOption(conversation, "Previous Page","Page2")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "The lands have changed much since the ancient days, and yet there are so many things that remain to remind us of our heritage.  No doubt you have seen some of these precious memorials preserved in some of the villages, such as the Spirit of Faydark park in the Willow Wood.  Please take a moment to remember the fallen by visiting the Claymore Plaza in North Qeynos.")
+end
+
+function Page4(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page5")
+AddConversationOption(conversation, "Previous Page","Page3")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "There are many such places throughout the world as we are not the only folk who preserve our history.  Be cautious in your travels but do not deny yourself the pleasure of discovery, either.  Be wary and respectful of your surroundings and you will find many places throughout the lands to interest or thrill you.")
+end
+
+function Page5(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page6")
+AddConversationOption(conversation, "Previous Page","Page4")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "Reading is a great way to learn more about the heritage of the land, the history of its inhabitants and the beliefs of those who are a part of Norrath.  Visit Sage Indis Surion in South Qeynos to purchase some of his fascinating tomes.  Though some are missing a page or two, the Sage has made notations in each volume, indicating where additional pages might be located.")
+end
+
+function Page6(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page7")
+AddConversationOption(conversation, "Previous Page","Page5")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "The Sage sells \"The Story of the Rat Queen,\" which is part autobiographical and part analysis of the poor woman who lives in the Vermin's Snye.  It is said to be among Antonia Bayle's favorites and is an interesting read.  Additionally, one can find books scattered throughout the world that are excellent sources of information.  You can also gain new skills by completing any of the Mastery tomes available.")
+end
+
+function Page7(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page8")
+AddConversationOption(conversation, "Previous Page","Page6")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "As you explore Norrath, you will occasionally find unsual objects.  Sometimes, they are on creatures in the wilds.  Sometimes you will notice something odd in the landscape and pause to take a closer look.  In either case, let curiosity be your guide as many great discoveries have been made serendipitously. ")
+end
+
+function Page8(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page","Page9")
+AddConversationOption(conversation, "Previous Page","Page7")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "While Qeynos is now your home, you will likely travel beyond the city limits many times in your life.  As you travel, you will doubtless encounter folks who are trying to rebuild their lives as well as those whose needs are more commercial.  These goals are not mutually exclusive, as strong enterprise can mean work for the displaced.  Please feel free to assist representatives of the Far Seas Trading Company as they are a large local employer.")
+end
+
+function Page9(Item, Player)
+conversation = CreateConversation()
+AddConversationOption(conversation, "Next Page [WORK IN PROGRESS]","")
+AddConversationOption(conversation, "Previous Page","Page8")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "Qeynos is proud of its diversity.  Our reasons to move here are varied, but we must never forget our heritage.  Rumors surface that items important to the history of Norrath are found throughout the world.  You could always check with Hwal Rucksif inside the Keep of the Ardent Needle in Antonica for updates as he seems to get a fair amount of foot traffic.")
+end
+
+function Page10(Item, Player)
+if not HasQuest(Player,5766) and not HasCompletedQuest(Player,5766)then
+    OfferQuest(Item,Player,5766)
+elseif GetQuestStep(Player,5766) ==8 then    
+AddConversationOption(conversation, "Next Page","Page11")
+end
+AddConversationOption(conversation, "Previous Page","Page9")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "Training in your chosen life's path enables you to help others to the best of your abilities by giving you a focus.  Fighters should speak with Master-at-Arms Dagorel in South Qeynos.  Mages, you will learn much with Magister Niksel, also in South Qeynos.  Priests should seek the counsel of Hierophant Aldalad in North Qeynos.  Scouts, seek Vemerik the Counselor in Qeynos North.  Train hard, act wisely and help your neighbors.")
+end
+
+function Page11(Item, Player)
+SetStepComplete(Player,5766,8)    
+AddConversationOption(conversation, "Previous Page","Page10")
+AddConversationOption(conversation, "Close the book.","CloseItemConversation")
+StartDialogConversation(conversation, 2, Item, Player, "Though we have come through some dark times, we cannot dwell upon the past.  In the Age of Destiny, every day is a gift and how we use that gift determines our personal destiny.  Compassion, honor and loyalty are ever the standard by which we should live our lives, no matter what challenges may come.")
+end
+

+ 6 - 4
server/ItemScripts/WillowWoodcitizenshiptask.lua

@@ -30,7 +30,9 @@ end
 
 function Dialog4(Item, Player)
 conversation = CreateConversation()
-if not HasQuest(Player,5723) and not HasCompletedQuest(Player,5723)then
+ if GetLevel(Player)<=5 then
+ AddConversationOption(conversation, "[I need more experience to pursue Citizenship]","CloseItemConversation")
+ elseif not HasQuest(Player,5723) and not HasCompletedQuest(Player,5723)then
 AddConversationOption(conversation, "[write this in your quest journal]","StartQuest")
 end
 if HasQuest(Player,5723) or  HasCompletedQuest(Player,5723) then
@@ -41,10 +43,10 @@ StartDialogConversation(conversation, 2, Item, Player, "Willow Wood residents mu
 end
 
 function StartQuest(Item,Player)
- if not HasQuest(Player,5723) and not HasCompletedQuest(Player,5723)then
-   OfferQuest(Item,Player,5723)
-end
 conversation = CreateConversation()
+if not HasQuest(Player,5723) and not HasCompletedQuest(Player,5723)then
+   OfferQuest(nil,Player,5723)
+end
 AddConversationOption(conversation, "[put the note]","CloseItemConversation")
 StartDialogConversation(conversation, 2, Item, Player, "After you complete your task, report to Marshal Glorfel using the citizenship sign.")
 end

+ 1 - 1
server/ItemScripts/asandyboneshardClassic.lua

@@ -50,7 +50,7 @@ function Dialog3(Item,Player)
     SetStepComplete(Player,BoneShard,2)
     end    
     AddConversationOption(conversation, "[Put the Piece Away]", "CloseItemConversation")
-    StartDialogConversation(conversation, 2, Item, Player, "As you assemble the pieces of the taken the intricate carving of a ship becomes clear. The pieces can be repaired but some sort of glue will be needed to hold them together again. Fish skin may be a good start to create the glue.")
+    StartDialogConversation(conversation, 2, Item, Player, "As you assemble the pieces of the takon the intricate carving of a ship becomes clear. The pieces can be repaired but some sort of glue will be needed to hold them together again. Fish skin may be a good start to create the glue.")
 end
 
 function Dialog4(Item,Player)

+ 2 - 1
server/Quests/Baubbleshire/a_budding_prankster.lua

@@ -1,7 +1,7 @@
 --[[
 	Script Name	: Quests/Baubbleshire/a_budding_prankster.lua
 	Script Purpose	: Handles the quest, "A Budding Prankster"
-	Script Author	: Scatman is a gangsta
+	Script Author	: Scatman is a gangsta!
 	Script Date	: 2009.09.27
 	
 	Zone       : The Baubbleshire
@@ -13,6 +13,7 @@
 function Init(Quest)
 	AddQuestStepChat(Quest, 1, "I need to speak to Remmy Tumbub.", 1, "I need to find Remmy in the Forest Ruins and pretend to be from the Qeynos guard.", 0, 1960016)
 	AddQuestStepCompleteAction(Quest, 1, "quest_complete")
+    UpdateQuestZone(Quest,"Forest Ruins")
 end
 
 function Accepted(Quest, QuestGiver, Player)

+ 1 - 1
server/Quests/Baubbleshire/a_tattered_journal_for_valean.lua

@@ -11,7 +11,7 @@
 --]]
 
 function Init(Quest)
-    AddQuestStepChat(Quest, 1, " I must go to Innkeeper Valean.", 1, "I must find Innkeeper Valean in Castleview Hamlet.", 53227, 2360024)
+    AddQuestStepChat(Quest, 1, " I need to deliver this book to Innkeeper Valean.", 1, " I must deliver this tattered book to Innkeeper Valean in the Caslteview Hamlet inn.", 53227, 2360024)
     AddQuestStepCompleteAction(Quest, 1, "Delivery")
     	UpdateQuestZone(Quest, "Castleview Hamlet")
 end

+ 4 - 3
server/Quests/Baubbleshire/badger_pelts_for_diggs.lua

@@ -13,14 +13,15 @@ require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need ten badger pelts.", 10, 100, "I must collect ten badger pelts in the Forest Ruins or Oakmyst Forest.", 93, 1960011, 1960017, 1950035, 1950039)
+	AddQuestStepKill(Quest, 1, "I need ten badger pelts.", 10, 100, "I must collect ten badger pelts in the Forest Ruins or Oakmyst Forest.", 93, 1960011, 1960017, 1950035, 1950039, 8270025,8270016,8300001,8300008)
 	AddQuestStepCompleteAction(Quest, 1, "step1_complete_killedBadgers")
+    UpdateQuestZone(Quest,"Multiple Zones")
 end
 
 function Accepted(Quest, QuestGiver, Player)
 	FaceTarget(QuestGiver, Player)
 	Dialog.New(QuestGiver, Player)
-	Dialog.AddDialog("Then prepare for a hunting trip in the Forest Ruins.  I'll pay you handsomely for a bundle of badger pelts.  I may even toss in a bit of Diggs' finest armor.")
+	Dialog.AddDialog("Then prepare for a hunting trip in the Forest Ruins or Oakmyst Forest.  I'll pay you handsomely for a bundle of badger pelts.  I may even toss in a bit of Diggs' finest armor.")
 	Dialog.AddVoiceover("voiceover/english/merchant_diggin_diggs/qey_village06/merchantdiggindiggs002.mp3", 2590912109, 2110560767)
 	Dialog.AddOption("I will return with the bundle of badger pelts. ", "Dialog8")
 	Dialog.Start()
@@ -32,7 +33,7 @@ end
 function step1_complete_killedBadgers(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I have collected ten badger pelts.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I have collected then badger pelts for Diggs.")
-	UpdateQuestZone(Quest, "The Baubbleshire")
+	UpdateQuestZone(Quest, "Baubbleshire")
 	
 	AddQuestStepChat(Quest, 2, "I must return to Armorsmith Diggs.", 1, "I must return to Armorsmith Diggs in Baubbleshire.", 93, 2380049 )
 	AddQuestStepCompleteAction(Quest, 2, "quest_complete")

+ 3 - 2
server/Quests/Baubbleshire/embers_for_xoort.lua

@@ -11,8 +11,9 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to gather coals from the fiery forgotten guardians in the Forest Ruins.", 2, 70, "I need to gather an everburning coal from the fiery forgotten guardians in the Forest Ruins.", 183, 1960019)
+	AddQuestStepKill(Quest, 1, "I need to gather coals from the fiery forgotten guardians in the Forest Ruins.", 2, 70, "I need to gather an everburning coal from the fiery forgotten guardians in the Forest Ruins.", 183, 1960019, 8270009,8270062)
 	AddQuestStepCompleteAction(Quest, 1, "step1_complete_gotGoal")
+    UpdateQuestZone(Quest,"Forest Ruins")
 end
 
 function Accepted(Quest, QuestGiver, Player)
@@ -29,7 +30,7 @@ end
 function step1_complete_gotGoal(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I gathered an everburning coal.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I gathered the embers that Sage Xoort needed from the guardians.")
-	UpdateQuestZone(Quest, "The Baubbleshire")	
+	UpdateQuestZone(Quest, "Baubbleshire")	
 
 	AddQuestStepChat(Quest, 2, "I need to speak with Sage Xoort in the Baubbleshire.", 1, "I need to speak with Sage Xoort and give him the embers I gathered.", 0, 2380043)
 	AddQuestStepCompleteAction(Quest, 2, "quest_complete")

+ 3 - 3
server/Quests/Baubbleshire/fight_the_forgotten_guardians.lua

@@ -12,14 +12,14 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must kill some forgotten guardians.", 5, 100, "I need to slay five Forgotten Guardians in the Forest Ruins.", 611, 1960038, 1960058)
+	AddQuestStepKill(Quest, 1, "I must kill some forgotten guardians.", 5, 100, "I need to slay five Forgotten Guardians in the Forest Ruins.", 611, 1960038, 1960058, 8270062,8270009,8270061,8270011,8270056,8270063,8270064,8270003)
 	AddQuestStepCompleteAction(Quest, 1, "step1_complete_killedGuardians")
+    UpdateQuestZone(Quest,"Forest Ruins")
 end
 
 function Accepted(Quest, QuestGiver, Player)
 	FaceTarget(QuestGiver, Player)
 	conversation = CreateConversation()
-	UpdateQuestZone(Quest, "Forest Ruins")	
 
 	AddConversationOption(conversation, "I will return victorious!")
 	StartConversation(conversation, QuestGiver, Player, "Good! Return when you've bested them!")
@@ -31,7 +31,7 @@ end
 function step1_complete_killedGuardians(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I have killed some forgotten guardians")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I have slain five Forgotten Guardians.")
-	UpdateQuestZone(Quest, "The Baubbleshire")	
+	UpdateQuestZone(Quest, "Baubbleshire")	
 
 	AddQuestStepChat(Quest, 2, "I must return to Marshal Surefoot.", 1, "I need to return to Marshal Surefoot in Baubbleshire.", 0, 2380044)
 	AddQuestStepCompleteAction(Quest, 2, "quest_complete")

+ 1 - 1
server/Quests/Baubbleshire/in_search_of_the_shrine_of_estle.lua

@@ -11,7 +11,7 @@
 --]]
 
 function Init(Quest)
-    	UpdateQuestZone(Quest, "The Down Below")	
+    UpdateQuestZone(Quest, "Down Below")	
 	AddQuestStepLocation(Quest, 1, "I will find the shrine in the Down Below.", 5, "I need to locate the Shrine of Estle in the Down Below.", 0, 7.12, 0.3, -137.86, 199)
 	AddQuestStepCompleteAction(Quest, 1, "FoundTemple")
 end

+ 2 - 2
server/Quests/Baubbleshire/in_search_of_the_tower_of_the_order_of_three.lua

@@ -11,9 +11,9 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepLocation(Quest, 1, "I need to locate the mage tower ruins.", 5, "I need to locate the mage tower ruins in the Forest Ruins.", 0, 1117.56, -9.25, -760.03, 196)
+	AddQuestStepZoneLoc(Quest, 1, "I need to locate the mage tower ruins.", 6, "I need to locate the mage tower ruins in the Forest Ruins.", 0, 1117.56, -9.25, -760.03, 827)
 	AddQuestStepCompleteAction(Quest, 1, "TowerRuins")
-	UpdateQuestZone(Quest, "The Forest Ruins")
+	UpdateQuestZone(Quest, "Forest Ruins")
 end
 
 function Accepted(Quest, QuestGiver, Player)

+ 2 - 1
server/Quests/Baubbleshire/oro_rootforlozoria.lua

@@ -11,8 +11,9 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I've heard that the glowmyst beetles in Oakmyst Forest will sometimes dig up Oro roots.", 10, 90, "I need to find oro root that glowmyst beetles have dug up. I'll probably have to kill the beetles to get their treasured roots!", 197, 1950002)
+	AddQuestStepKill(Quest, 1, "I've heard that the glowmyst beetles in Oakmyst Forest will sometimes dig up Oro roots.", 10, 90, "I need to find oro root that glowmyst beetles have dug up. I'll probably have to kill the beetles to get their treasured roots!", 197, 8300034)
 	AddQuestStepCompleteAction(Quest, 1, "step1_complete_beetles")
+    UpdateQuestZone(Quest,"Oakmyst Forest")
 end
 
 function Accepted(Quest, QuestGiver, Player)

+ 8 - 1
server/Quests/Castleview/faeadaens_dinner_message.lua

@@ -9,6 +9,7 @@
     Preceded by: None
     Followed by: None
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
     AddQuestStepChat(Quest, 1, "I must speak with Innkeeper Valean.", 1, "I need to deliver Faeadaen's message to Innkeeper Valean.", 11, 2360024)
@@ -18,7 +19,13 @@ end
 
 
 function Accepted(Quest, QuestGiver, Player)
-
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Customers love my magic tricks! Actually, a little too much. Bulurg asked me to work late tonight. Could you ask Valean at the inn and let me know I can't dine with him tonight? I appreciate your help.")
+	Dialog.AddVoiceover("voiceover/english/entertainer_faeadaen/qey_village04/entertainerfaeadaen000.mp3", 3630263809, 612433831)
+ 	PlayFlavor(QuestGiver, "", "", "agree", 0,0 , Player)
+    Dialog.AddOption( "I will let Valean know that you can't make it.")
+	Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 10 - 3
server/Quests/CastleviewHamlet/a_jug_of_water_for_the_hole_in_the_wall_.lua

@@ -9,16 +9,23 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
-	AddQuestStepLocation(Quest, 1, "I need to get near the Oakmyst falls.", 3, "I must go into Oakmyst Forest and find the waterfall. There I will fill the jug.", 310, 993.6, 0.9, -203.21)
+	AddQuestStepZoneLoc(Quest, 1, "I need to get near the Oakmyst falls.", 3, "I must go into Oakmyst Forest and find the waterfall. There I will fill the jug.", 310, 993.6, 0.9, -203.21,830)
 	AddQuestStepCompleteAction(Quest, 1, "FoundWater")
 	UpdateQuestZone(Quest, "Oakmyst Forest")
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
-end
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("That wouldst be most kind.  Take this jug and then venture into Oakmyst Forest.  This is where thou willst find a waterfall.  Enter the waterfall and fill thine jug with this fall water before it toucheth the pond water.")
+	Dialog.AddVoiceover("voiceover/english/bartender_bulurg/qey_village04/bartenderbulurg002.mp3",2371403827,3750341640)
+ 	PlayFlavor(QuestGiver, "", "", "thanks", 0,0 , Player)
+   Dialog.AddOption("I shall return with your jug of fall water.")
+   Dialog.Start()
+  end
 
 function Declined(Quest, QuestGiver, Player)
 	-- Add dialog here for when the quest is declined

+ 10 - 3
server/Quests/CastleviewHamlet/badger_claws_for_yanari_.lua

@@ -9,16 +9,23 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to collect claws from some vicious badgers.", 4, 75, "I need to collect four vicious badger claws for Yanari Cyellann in Castleview.", 174, 1950039)
+	AddQuestStepKill(Quest, 1, "I need to collect claws from some vicious badgers.", 4, 75, "I need to collect four vicious badger claws for Yanari Cyellann in Castleview.", 174,8300008)
 	AddQuestStepCompleteAction(Quest, 1, "Turnin")
 	UpdateQuestZone(Quest,"Oakmyst Forest")
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
-end
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Splended! You'll find the badgers in the Oakmyst Forest. Please be swift! Badger claws lose their inate furiocity rather quickly!")
+	Dialog.AddVoiceover("voiceover/english/yanari_cyellann/qey_village04/yanaricyellan001.mp3",1380358614,4188270121)
+ 	PlayFlavor(QuestGiver, "", "", "agree", 0,0 , Player)
+    Dialog.AddOption("I'll bring them back once I gather them.")
+    Dialog.Start()
+    end
 
 function Declined(Quest, QuestGiver, Player)
 	-- Add dialog here for when the quest is declined

+ 9 - 2
server/Quests/CastleviewHamlet/bog_exploring_for_grommluk.lua

@@ -10,16 +10,23 @@
         Followed by: 
 --]]
 
+require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-AddQuestStepLocation(Quest, 1, "I need to collect Peat Bog water.", 18, "I need to collect bog water in Grommluk's jar from the middle of Peat Bog.", 356, 667.10, -33.6, 501.99)
+AddQuestStepZoneLoc(Quest, 1, "I need to collect Peat Bog water.", 18, "I need to collect bog water in Grommluk's jar from the middle of Peat Bog.", 356, 667.10, -33.6, 501.99,829)
 AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 UpdateQuestZone(Quest, "The Peat Bog")
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Great! Take'st this jar and bring me some water from the middle of the Peat Bog. Make'th sure thou gets plenty of muck in there too.")
+	Dialog.AddVoiceover("voiceover/english/grommluk_oognee/qey_village04/grommlukoognee001.mp3",753284600, 2887327469)
+ 	PlayFlavor(QuestGiver, "", "", "smile", 0,0 , Player)
+    Dialog.AddOption("Swamp water in the jar.  Got it!")
+    Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 11 - 4
server/Quests/CastleviewHamlet/food_for_kruuprum.lua

@@ -9,16 +9,23 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must kill some insects such as the centipedes in the Forest Ruins.", 6, 100, "I need to gather food for Merchant Kruuprum in Castleview. Apparently he eats insects such as the centipedes in the Forest Ruins.", 135, 1960026)
+	AddQuestStepKill(Quest, 1, "I must kill some insects such as the centipedes in the Forest Ruins.", 6, 100, "I need to gather food for Merchant Kruuprum in Castleview. Apparently he eats insects such as the centipedes in the Forest Ruins.", 135, 1960026, 8270006)
 	AddQuestStepCompleteAction(Quest, 1, "KilledBugs")
-	UpdateQuestZone(Quest, "The Forest Ruins")
+	UpdateQuestZone(Quest, "Forest Ruins")
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
-end
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Praise Marr! Thou would'st be so kind! The meaty part of any insect would rightly do. That should tide me for at least a few days. I would happily pay thee some coin upon thy return.")
+	Dialog.AddVoiceover("voiceover/english/merchant_kruuprum/qey_village04/merchantkruuprum001.mp3",3403348691,1398407939)
+ 	PlayFlavor(QuestGiver, "", "", "boggle", 0,0 , Player)
+    Dialog.AddOption("Hold out for a bit longer. I'll return as soon as I've found some.")
+    Dialog.Start()
+    end
 
 function Declined(Quest, QuestGiver, Player)
 	-- Add dialog here for when the quest is declined

+ 8 - 1
server/Quests/CastleviewHamlet/gathering_elddar_leaves.lua

@@ -9,6 +9,7 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
 	AddQuestStepLocation(Quest, 1, "I need to gather Elddar leaves for Scribe Bleemeb.", 14, "I need to gather leaves from the base of the greatest Elddar tree in the grove.", 199, 663.74 -9.72 -373.53)
@@ -17,7 +18,13 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("It is, it is! FrroOAK! She needs someone to fetch some leaves from the base of the tallest Eldarr tree. Say! I figured thou would'st do nicely for that. Why doth thou head over to the Eldarr grove and pick her up some leaves. Thou'st can't miss the tree! It has elves in it.")
+	Dialog.AddVoiceover("voiceover/english/scribe_bleemeb/qey_village04/qst_scribebleemeb002.mp3",1766321211,1856541681)
+ 	PlayFlavor(QuestGiver, "", "", "agree", 0,0 , Player)
+    Dialog.AddOption("I'll return with some of the Elddar leaves.")
+    Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 8 - 4
server/Quests/CastleviewHamlet/jewelry_delivery_to_taneran.lua

@@ -9,6 +9,7 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
     AddQuestStepChat(Quest, 1, " I need to deliver this note to Tara Ironforge.", 1, " I must deliver a note to Tara Ironforge in the Jewel Box located in North Qeynos.", 75, 2220057)
@@ -17,10 +18,13 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-  conversation = CreateConversation()
-      PlayFlavor(QuestGiver,"","","thank",0,0,Player)
-  AddConversationOption(conversation, "I'll be back soon.")
-  StartConversation(conversation, QuestGiver, Player, "I have waited this long. I can wait a little longer.")
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("It's a simple task. I need you to deliver a note to Tara Ironforge at the Jewel Box in North Qeynos. The shop isn't difficult to find. It's outside the Ironforge Estate, look for the Ironforge shops in the southern section of the district. Return with the package that Tara gives you.")
+	Dialog.AddVoiceover("voiceover/english/taneranthalis_nedaiveren/qey_village04/qst_taneranthalisnedaiveren002.mp3",1622360856, 1471149811)
+ 	PlayFlavor(QuestGiver, "", "", "agree", 0,0 , Player)
+    Dialog.AddOption("Understood. I'll see what I can do.")
+    Dialog.Start()
 end   
 
 

+ 9 - 2
server/Quests/CastleviewHamlet/mystail_tails_for_fevalin.lua

@@ -9,16 +9,23 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must kill some mystail yearlings.", 6, 80, "I must collect tails from mystail yearlings.", 172, 1950009)
+	AddQuestStepKill(Quest, 1, "I must kill some mystail yearlings.", 6, 80, "I must collect tails from mystail yearlings.", 172, 1950009,8300035)
 	AddQuestStepCompleteAction(Quest, 1, "RatsDead")
 	UpdateQuestZone(Quest, "Oakmyst Forest")
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Thanks for pitching in. Every bundle of tails helps! You'll' find the mystail rats within Oakmyst Forest. Happy hunting!")
+	Dialog.AddVoiceover("voiceover/english/merchant_fevalin/qey_village04/merchantfevalin005.mp3",25404249,2050252222)
+ 	PlayFlavor(QuestGiver, "", "", "smile", 0,0 , Player)
+    Dialog.AddOption("I'm off to Oakmyst Forest shortly!")
+    Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 8 - 6
server/Quests/CastleviewHamlet/new_etching_tool_for_froptubs_smithy.lua

@@ -9,6 +9,7 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
@@ -17,12 +18,13 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	FaceTarget(NPC, Spawn)
-	conversation = CreateConversation()
-	PlayFlavor(QuestGiver, "voiceover/english/armsdealer_froptub/qey_village04/armsdealerfroptub001.mp3", "", "bow", 2191302103, 1711619713, Player)
-    AddConversationOption(conversation, "I'll go look for him now.")
-	StartConversation(conversation, QuestGiver, Player, "Gramercy! I shall be able to finish up these orders and get these grumbling elves off my doorstep!")
-
+    FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Grammarcy!  I shall be able to finish up these orders and get the grumbling elves off mine doorstep.")
+	Dialog.AddVoiceover("voiceover/english/armsdealer_froptub/qey_village04/armsdealerfroptub001.mp3",2191302103, 1711619713)
+ 	PlayFlavor(QuestGiver, "", "", "bow", 0,0 , Player)
+   Dialog.AddOption("Your apprentice shouldn't be too hard to find, I'll be back soon.")
+   Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 8 - 2
server/Quests/CastleviewHamlet/proving_myself_to_captain_gerathalas.lua

@@ -17,8 +17,14 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
-end
+	FaceTarget(NPC, Spawn)
+	Dialog.New(NPC, Spawn)
+	Dialog.AddDialog("Good, good! The vermin live in the catacombs. Bring me back some of those putrid rat's tails and I'll reward you with a piece of armor.")
+	Dialog.AddVoiceover("voiceover/english/knight-captain_gerathalas/qey_village04/captaingerathalas001.mp3",1809197225,35106101)
+ 	PlayFlavor(NPC, "", "", "agree", 0,0 , Spawn)
+   Dialog.AddOption("Great, I'll be right back to prove how well I can take care of myself.")
+   Dialog.Start()
+  end
 
 function Declined(Quest, QuestGiver, Player)
 	-- Add dialog here for when the quest is declined

+ 10 - 6
server/Quests/CastleviewHamlet/reservations_for_a_visitor.lua

@@ -9,18 +9,22 @@
         Preceded by: None
         Followed by: 
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
    	AddQuestStepChat(Quest, 1, "I must speak with innkeeper Valean.", 1, "I must speak with innkeeper Valean about reservations for Taneran.", 11, 2360024)
 	AddQuestStepCompleteAction(Quest, 1, "CheckIn")
 end
 
---[[function Accepted(Quest, QuestGiver, Player)
-  conversation = CreateConversation()
-      PlayFlavor(QuestGiver,"","","",0,0,Player)
-  AddConversationOption(conversation, "")
-  StartConversation(conversation, QuestGiver, Player, "")
-end   ]]--
+function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("You see, I invited Taneran for a visit, but my house is too small for both of us. Would you be kind and reserve a room at the inn for him?")
+	Dialog.AddVoiceover("voiceover/english/listalania_vainederian/qey_village04/listalaniavainederian001.mp3",2137369666, 3214169291)
+ 	PlayFlavor(QuestGiver, "", "", "sniff", 0,0 , Player)
+    Dialog.AddOption("I will do so immediately.")
+    Dialog.Start()
+end  
 
 
 

+ 7 - 1
server/Quests/CastleviewHamlet/substance_extract_for_yanari.lua

@@ -17,7 +17,13 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Go to the Down Below in the catacombs. In the Down Below, you must slay several gunks and fill my vials with their extract. Leave immediately! I need these ingredients to complete my research.")
+	Dialog.AddVoiceover("voiceover/english/yanari_cyellann/qey_village04/yanaricyellan005.mp3",3750763447,1479813412)
+ 	PlayFlavor(QuestGiver, "", "", "tapfoot", 0,0 , Player)
+    Dialog.AddOption("I will be back with your substance extract.")
+    Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 9 - 3
server/Quests/CastleviewHamlet/sword_for_aadalian.lua

@@ -9,7 +9,7 @@
         Preceded by: None
         Followed by: 
 --]]
-
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
 	AddQuestStepChat(Quest, 1, "I need to speak with Froptub.", 1, "I must see about Aadalian's sword at Froptub's smithy in Castleview.", 11, 2360018)
@@ -17,8 +17,14 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
-end
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("My design is not mere decoration, friend. The inscription chronicles the cohabitation of our two races. Would you be kind and see what's keeping the sword at Froptub's smithy?")
+	Dialog.AddVoiceover("voiceover/english/aadalian_farenair/qey_village04/aadalianfarenair001.mp3",1068773246, 2639950014)
+ 	PlayFlavor(QuestGiver, "", "", "shrug", 0,0 , Player)
+   Dialog.AddOption("I suppose I can do that.")
+   Dialog.Start()
+  end
 
 function Declined(Quest, QuestGiver, Player)
 	-- Add dialog here for when the quest is declined

+ 10 - 23
server/Quests/CastleviewHamlet/the_lost_book_of_arbos.lua

@@ -32,31 +32,23 @@ function FaeTalked(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I found Faeadaen in Castleview Hamlet.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I found Faeadaen in Castleview Hamlet.")
 
-	AddQuestStepChat(Quest, 2, "I must find Innkeeper Valean.", 1, "I must search Castleview Hamlet for Valean.", 0, 2360024)
-	AddQuestStepCompleteAction(Quest, 2, "ValeanTalked")
+	AddQuestStep(Quest, 2, "I must search for the book at the inn in Castleview.", 1, "I must search for The Book of Arbos at the Bed and Book Inn in Castleview Hamlet.", 0)
+	AddQuestStepCompleteAction(Quest, 2, "BookshelfTalk")
 end
 
-function ValeanTalked(Quest, QuestGiver, Player)
-	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
-	UpdateQuestStepDescription(Quest, 2, "I found Valean in Castleview Hamlet.")
-	UpdateQuestTaskGroupDescription(Quest, 2, "I found Valean in Castleview Hamlet.")
-
-	AddQuestStepChat(Quest, 3, "I must check the bookshelves.", 1, "I must search the bookshelves at the inn for the lost book.", 0, 2360075)
-	AddQuestStepCompleteAction(Quest, 3, "BookshelfTalk")
-end
 
 function BookshelfTalk(Quest, QuestGiver, Player)
 	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
-	UpdateQuestStepDescription(Quest, 3, "I found the lost book.")
-	UpdateQuestTaskGroupDescription(Quest, 3, "I found the lost book in the inn's bookshelves.")
+	UpdateQuestStepDescription(Quest, 2, "I found the lost book.")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I found the lost book in the inn's bookshelves.")
 
-	AddQuestStepChat(Quest, 4, "I must return to Bleemeb.", 1, "I must return this book to Bleemeb.", 718, 2360055)
-	AddQuestStepCompleteAction(Quest, 4, "QuestComplete")
+	AddQuestStepChat(Quest, 3, "I must return to Bleemeb.", 1, "I must return this book to Bleemeb.", 718, 2360055)
+	AddQuestStepCompleteAction(Quest, 3, "QuestComplete")
 end
 
 function QuestComplete(Quest, QuestGiver, Player)
-	UpdateQuestStepDescription(Quest, 4, "I returned to Bleemeb.")
-	UpdateQuestTaskGroupDescription(Quest, 4, "I returned the lost book to Bleemeb.")
+	UpdateQuestStepDescription(Quest, 3, "I returned to Bleemeb.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I returned the lost book to Bleemeb.")
 
 	UpdateQuestDescription(Quest, "I retrieved the Book of Arbos and returned it to Bleemeb. The book was written in a rare lost elven language.")
 	GiveQuestReward(Quest, Player)
@@ -65,14 +57,9 @@ end
 function Reload(Quest, QuestGiver, Player, Step)
 	if Step == 1 then
 		FaeTalked(Quest, QuestGiver, Player)
-	end
-		if Step == 2 then
-		ValeanTalked(Quest, QuestGiver, Player)
-	end
-		if Step == 3 then
+	elseif Step == 2 then
 		BookshelfTalk(Quest, QuestGiver, Player)
-	end
-		if Step == 4 then
+	elseif Step == 3 then
 		QuestComplete(Quest, QuestGiver, Player)
 	end
 end

+ 1 - 1
server/Quests/Graystone/finding_bait.lua

@@ -11,7 +11,7 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to kill centipedes, or crawlers, for Moyna to use as bait.", 10, 100, "I must kill ten centipedes in the Forest Ruins and gather their remains for use as bait.", 0, 1960026)
+	AddQuestStepKill(Quest, 1, "I need to kill centipedes, or crawlers, for Moyna to use as bait.", 10, 100, "I must kill ten centipedes in the Forest Ruins and gather their remains for use as bait.", 0, 1960026,8270006)
 	AddQuestStepCompleteAction(Quest, 1, "step1_completed_killedCentipedes")
 end
 

+ 7 - 0
server/Quests/GraystoneYard/graystone_bank_tally_delivery.lua

@@ -20,6 +20,13 @@ end
 
 
 function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Make sure Robert Newbury recieves this tally directly.  You'll find him in the Qeynos Exchange at the harbor. Now, this needs to be delivered right away, so no dawdling!")
+	Dialog.AddVoiceover("voiceover/english/banker_dori/qey_village03/bankerdori001.mp3", 161424087,848076549)
+	PlayFlavor(QuestGiver, "", "", "agree", 0, 0, Player)
+    Dialog.AddOption("You got it, Dori.")
+    Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 1 - 1
server/Quests/GraystoneYard/inform_tracker_kelnis.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepChat(Quest, 1, "I must speak to Kelnis in Oakmyst Forest.", 1, "I must find Tracker Kelnis somewhere in Oakmyst Forest.", 11, 1950042)
+	AddQuestStepChat(Quest, 1, "I must speak to Kelnis in Oakmyst Forest.", 1, "I must find Tracker Kelnis somewhere in Oakmyst Forest.", 11, 8300033)
     UpdateQuestZone(Quest,"Oakmyst Forest")
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 end

+ 2 - 2
server/Quests/GraystoneYard/shrillers_for_tillheel.lua

@@ -13,9 +13,9 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must kill some juvenile shrillers.", 5, 100, "I must slay five juvenile shrillers to obtain their wings for Tillheel.", 140, 1990004,1990022,1990001)
+	AddQuestStepKill(Quest, 1, "I must kill some juvenile shrillers.", 5, 100, "I must slay five juvenile shrillers to obtain their wings for Tillheel.", 140, 1990004,1990022,1990001,8290020)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
-	UpdateQuestZone(Quest,"The Down Below")
+	UpdateQuestZone(Quest,"Multiple Zones")
 end
 
 function Step1Complete(Quest,QuestGiver,Player)

+ 1 - 1
server/Quests/Hallmark/baubbleshire_citizenship_task.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Caves.", 5, 20, "The local caves have been seeded with tokens for the citizens of the Baubbleshire to gather. These tokens may be found on any creatures in the Caves.", 1350, 1960009,1960011	,1960012,1960013,1960014,1960017,1960018, 1960019,1960020,1960021,1960022,1960023,1960024,1960025,1960026,1960027,1960028,1960029,1960030,1960031,1960032,1960033,1960034,1960035,1960036,1960037,1960038,1960039,1960040,1960041,1960042,1960043,1960044,1960045,1960046,1960049,1960050,1960051,1960052,1960054,1960055,1960058,1960060,1960061,1960065,1960067,1960068,1960069,1960070,1960071,1960072,1960074,1960075,1960076,1960077,1960088,1960090,1960094,1960098,1960101,1960109,1960117,1960122,1960185,1960186,1960187)
+	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Caves.", 5, 30, "The local caves have been seeded with tokens for the citizens of the Baubbleshire to gather. These tokens may be found on any creatures in the Caves.", 1350, 8260001, 8260002, 8260003, 8260004, 8260005, 8260006, 8260007, 8260008, 8260009, 8260010, 8260011, 8260012, 8260013, 8260014, 8260015,8260016, 8260017, 8260018, 8260019, 8260020, 8260021, 8260022, 8260023, 8260024, 8260025,  8260026, 8260028, 8260030, 8260031, 8260032, 8260034, 8260073,8260074, 8260077, 8260078, 8260079, 8260080, 8260082, 8260083, 8260086, 8260087, 8260088, 8260089, 8260090, 8260091, 8260093, 8260094)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Caves")
 end

+ 3 - 3
server/Quests/Hallmark/castleview_citizenship_task.lua

@@ -12,9 +12,9 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Oakmyst Forest.", 5, 20, "The local forests have been seeded with tokens for the citizens of Castleview Hamlet to gather. These tokens may be found on any creatures in the Caves.", 1334, 1950000, 1950001, 1950002, 1950006, 1950007, 1950009, 1950010, 1950013, 1950014, 1950015, 1950016, 1950017, 1950018, 1950019, 1950020, 1950023, 1950026, 1950028, 1950029, 1950032, 1950033, 1950034 , 1950035, 1950036, 1950039, 1950046, 1950047, 1950054, 1950056, 1950057, 1950062, 1950064, 1950065, 1950066, 1950067, 1950070, 1950074, 1950124, 1950125, 1950126, 1950131)
+	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Down Below.", 5, 30, "The local forests have been seeded with tokens for the citizens of Castleview Hamlet to gather. These tokens may be found on any creatures in the Caves.", 1334, 1990001, 1990002, 1990003, 1990004, 1990005, 1990006, 1990007, 1990008, 1990009, 1990010, 1990012, 1990013, 1990014, 1990015, 1990016, 1990017, 1990018, 1990019, 1990020, 1990021, 1990022, 1990023, 1990024, 1990025, 1990026, 1990027, 1990028, 1990029, 1990030, 1990031, 1990032, 1990033, 1990034, 1990035, 1990036, 1990037, 1990038, 1990039, 1990041, 1990042, 1990043, 1990044, 1990045, 1990054, 1990056, 1990096, 1990097, 1990098, 1990099, 1990100, 1990101, 1990102, 1990103, 1990104)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
-    UpdateQuestZone(Quest,"Oakmyst Forest")
+    UpdateQuestZone(Quest,"Down Below")
 end
 
 function Accepted(Quest, QuestGiver, Player)
@@ -30,7 +30,7 @@ end
 
 function Step1Complete(Quest, QuestGiver, Player)
 	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
-	UpdateQuestStepDescription(Quest, 1, "I have gathered five tokens from the Oakmyst Forest.")
+	UpdateQuestStepDescription(Quest, 1, "I have gathered five tokens from the Down Below.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I have gathered the tokens required to prove my worth as a citizen.")
     UpdateQuestZone(Quest,"Castleview Hamlet")
 	AddQuestStep(Quest, 2, "I need to enter the citizenship trial.", 1, 100, "I must perform the citizenship trial by returning to the Citizenship Sign and entering the trial chamber",1334)

+ 7 - 4
server/Quests/Hallmark/cellar_cleanup.lua

@@ -98,11 +98,14 @@ function Step8Complete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 8, "I spoke with Assistant Dreak.")
 	UpdateQuestTaskGroupDescription(Quest, 2, "I told Assistant Dreak that the cellar is clean.")
     UpdateQuestZone(Quest,"Mizan's Cellar")
-    if not HasItem(Player,20708) and GetTradeskillLevel(Player)<2 then
-    SetTradeskillLevel(Player,2)
+    if not HasItem(Player,20708,1) and GetTradeskillLevel(Player) <2  then
+    SummonItem(Player,1030001,1)
     GiveQuestItem(Quest, Player, "", 20708,4142,4142,4142,7391,7391,7391)
-     SummonItem(Player,1030001,1)
-   end
+    end
+    if GetTradeskillLevel(Player) <2 then
+    SetTradeskillLevel(Player,2)
+    end
+
 --    GiveQuestItem(Quest, Player, "", 4142)
 --   GiveQuestItem(Quest, Player, "", 4142)
 --    GiveQuestItem(Quest, Player, "", 4142)

+ 25 - 0
server/Quests/Hallmark/freeport_alignment.lua

@@ -28,6 +28,31 @@ function Accepted(Quest, QuestGiver, Player)
 	if not HasItem(Player,1413)then
     GiveQuestItem(Quest,Player,"So it shall be!  This coin is given to all refugees seeking to start a life in Freeport.",1413)
     end
+
+Qeynos = GetFactionAmount(Player, 11)
+Freeport = GetFactionAmount(Player, 12)
+Neriak = GetFactionAmount(Player, 13)
+Kelethin = GetFactionAmount(Player, 14)
+Halas = GetFactionAmount(Player, 16)
+Gorowyn = GetFactionAmount(Player, 17)
+alignment = GetAlignment(Player)
+
+if GetRace(Player) == 0 or GetRace(Player) == 3 or GetRace(Player) == 5 or GetRace(Player) == 6 or GetRace(Player) == 9 or GetRace(Player) == 11 or GetRace(Player) == 20 then
+SetAlignment(Player, 0)
+end
+
+if Qeynos ==0 then ChangeFaction(Player, 11, -40000)
+end
+if Freeport ==0 then ChangeFaction(Player, 12, 20000)
+end
+--[[if Neriak ==0 then ChangeFaction(Player, 13, Neriak)
+end
+if Kelethin ==0 then ChangeFaction(Player, 14, Kelethin)
+end
+if Halas ==0 then ChangeFaction(Player, 16, Halas)
+end
+if Gorowyn ==0 then ChangeFaction(Player, 17, -Gorowyn)
+end--]]
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 1 - 1
server/Quests/Hallmark/graystone_citizenship_task.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Oakmyst Forest.", 5, 20, "The local forests have been seeded with tokens for the citizens of Graystone Yard to gather. These tokens may be found on any creatures in the Oakmyst Forest.", 1333, 1950000, 1950001, 1950002, 1950006, 1950007, 1950009, 1950010, 1950013, 1950014, 1950015, 1950016, 1950017, 1950018, 1950019, 1950020, 1950023, 1950026, 1950028, 1950029, 1950032, 1950033, 1950034 , 1950035, 1950036, 1950039, 1950046, 1950047, 1950054, 1950056, 1950057, 1950062, 1950064, 1950065, 1950066, 1950067, 1950070, 1950074, 1950124, 1950125, 1950126, 1950131)
+	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Oakmyst Forest.", 5, 30, "The local forests have been seeded with tokens for the citizens of Graystone Yard to gather. These tokens may be found on any creatures in the Oakmyst Forest.", 1333,8300001, 8300002, 8300003, 8300004, 8300005, 8300006, 8300008, 8300010, 8300013, 8300014, 8300015, 8300016, 8300017, 8300018, 8300019, 8300022, 8300023, 8300026, 8300027, 8300034, 8300035, 8300036, 8300048, 8300049, 8300050, 8300051, 8300052, 8300053, 8300064)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Oakmyst Forest")
 end

+ 1 - 1
server/Quests/Hallmark/gruttooth_invasion_fighter.lua

@@ -34,7 +34,7 @@ function Deleted(Quest, QuestGiver, Player)
 end
 
 function Step1Complete(Quest, QuestGiver, Player)
-    if not HasItem(Player, 1001011) and not HasItem(Player, 75057) then
+    if not HasItem(Player, 1001011,1) and not HasItem(Player, 75057,1) then
     GiveQuestItem(Quest,Player,"You found some items that suit you on the weapon rack.",1001011, 75057)
     end
 	UpdateQuestStepDescription(Quest, 1, "Got my weapon, now to kill some goblins.")

+ 1 - 1
server/Quests/Hallmark/gruttooth_invasion_mage.lua

@@ -34,7 +34,7 @@ function Deleted(Quest, QuestGiver, Player)
 end
 
 function Step1Complete(Quest, QuestGiver, Player)
-    if not HasItem(Player, 1001011) and not HasItem(Player, 73899) then
+    if not HasItem(Player, 1001011,1) and not HasItem(Player, 73899,1) then
     GiveQuestItem(Quest,Player,"You found some items that suit you on the weapon rack.",1001011,73899)
     end
 	UpdateQuestStepDescription(Quest, 1, "Got my weapon, now to kill some goblins.")

+ 1 - 1
server/Quests/Hallmark/gruttooth_invasion_priest.lua

@@ -34,7 +34,7 @@ function Deleted(Quest, QuestGiver, Player)
 end
 
 function Step1Complete(Quest, QuestGiver, Player)
-    if not HasItem(Player, 1001011) and not HasItem(Player, 73731) then
+    if not HasItem(Player, 1001011,1) and not HasItem(Player, 73731,1) then
     GiveQuestItem(Quest,Player,"You found some items that suit you on the weapon rack.",1001011, 73731)
     end
 	UpdateQuestStepDescription(Quest, 1, "Got my weapon, now to kill some goblins.")

+ 1 - 1
server/Quests/Hallmark/gruttooth_invasion_scout.lua

@@ -34,7 +34,7 @@ function Deleted(Quest, QuestGiver, Player)
 end
 
 function Step1Complete(Quest, QuestGiver, Player)
-    if not HasItem(Player, 1001011) and not HasItem(Player, 73896) then
+    if not HasItem(Player, 1001011,1) and not HasItem(Player, 73896,1) then
     GiveQuestItem(Quest,Player,"You found some items that suit you on the weapon rack.",1001011,73896)
     end
 	UpdateQuestStepDescription(Quest, 1, "Got my weapon, now to kill some goblins.")

+ 123 - 0
server/Quests/Hallmark/mage_training_part_1.lua

@@ -0,0 +1,123 @@
+--[[
+    Script Name    : Quests/Hallmark/mage_training_part_1.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.11.06 07:11:49
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepKill(Quest, 1, "I must kill five bog slugs in the Peat Bog.", 5, 100, "The Magister has sent me to the bog to kill five (5) bog things", 91, 8290005)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+    UpdateQuestZone(Quest,"Peat Bog")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+    FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)   
+ 	Dialog.AddDialog("I know where you can find creatures pulled from the holes. Lazy summoners beckon forth companions, and when they no longer have use for these friends, they disperse of them in the bog. Your homework is to go to the bog and kill some of these displaced creatures. When you are done, return to me and report your findings.")
+	Dialog.AddVoiceover("voiceover/english/magister_niksel/qey_south/magister_niksel005.mp3", 3296291813, 1082692317)
+    PlayFlavor(QuestGiver, "", "", "nod", 0, 0, Player)
+    Dialog.AddOption("Alright. I'll investigate the creatures in the bog.")	
+	Dialog.Start()
+end
+
+function Declined(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is declined
+end
+
+function Deleted(Quest, QuestGiver, Player)
+	-- Remove any quest specific items here when the quest is deleted
+end
+
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I have killed five bog slugs in the Peat Bog.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've killed the bog things and paid attention to what they looked like.")
+    UpdateQuestZone(Quest,"South Qeynos")
+
+	AddQuestStepChat(Quest, 2, "I need to speak with Magister Niksel in South Qeynos.", 1, "I should let Niksel, in South Qeynos, know that the bog things didn't have much of a shape.", 11, 2310376)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 2, "I spoke with Magister Niksel.")
+	UpdateQuestTaskGroupDescription(Quest, 2, "Niksel has let me know what the bog things really were.")
+    UpdateQuestZone(Quest,"Multiple Zones")
+
+	AddQuestStepChat(Quest, 3, "I need to speak with Yanari in Castleview.", 1, "Niksel has now directed me to other students to hear more about sorcery.", 11, 2360047)
+	AddQuestStepChat(Quest, 4, "I need to find Zipiff Clamorclang.", 1, "Niksel has now directed me to other students to hear more about sorcery.", 11, 2380010	)
+	AddQuestStepChat(Quest, 5, "I need to speak with Oolimeminoso in Starcrest.", 1, "Niksel has now directed me to other students to hear more about sorcery.", 11, 2340046)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")
+	AddQuestStepCompleteAction(Quest, 5, "Step5Complete")
+end
+
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I have spoken with Yanari.")
+
+ QuestCheck(Quest, QuestGiver, Player)
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 4, "I have spoken with Zipiff.")
+
+ QuestCheck(Quest, QuestGiver, Player)
+end
+
+function Step5Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 5, "I have spoken with Oolimeminoso")
+ QuestCheck(Quest, QuestGiver, Player)
+end
+
+
+function  QuestCheck(Quest, QuestGiver, Player)
+    if QuestStepIsComplete(Player,5767,3) and QuestStepIsComplete(Player,5767,4) and QuestStepIsComplete(Player,5767,5) then
+    UpdateQuestTaskGroupDescription(Quest, 3, "I have learned much from Niksel's former students about sorcery.")
+    UpdateQuestZone(Quest,"South Qeynos")
+	AddQuestStepChat(Quest, 6, "I need to tell Magister Niksel what I've learned.", 1, "I should give Niksel, in South Qeynos, a summary of what I learned from his students", 11, 2310376)
+	AddQuestStepCompleteAction(Quest, 6, "QuestComplete")
+	end
+end
+
+--I need to speak with Magister Niksel in South Qeynos about advancing as a mage.
+--I have contacted Magister Niksel about advancing.
+--Niksel has agreed to continue my lessons at a later time
+--Niksel has now directed me to other students to hear more about sorcery
+--I should let Niksel, in South Qeynos, know that the bog things didn't have much of a shape.
+--I spoke with Magister Niksel.
+--Niksel has let me know what the bog things really were.
+--I need to speak with Magister Niksel outside the mage tower in South Qeynos.
+--I should give Niksel, in South Qeynos, a summary of what I learned from his students
+
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 6, "Niksel has agreed to continue my lessons at a later time.")
+	UpdateQuestTaskGroupDescription(Quest, 6, "Niksel has agreed to continue my lessons at a later time.")
+
+	UpdateQuestDescription(Quest, "I've learned what a summoner and a sorcerer studies from Niksel's lessons.  He has ended my first lesson so that he can write down the magical theory he came up with.  He has offered to teach me more again in the future.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	elseif Step == 5 then
+		Step5Complete(Quest, QuestGiver, Player)
+	elseif Step == 6 then
+		QuestComplete(Quest, QuestGiver, Player)
+	end
+end

+ 80 - 0
server/Quests/Hallmark/mage_training_part_2.lua

@@ -0,0 +1,80 @@
+--[[
+    Script Name    : Quests/Hallmark/mage_training_part_2.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.11.06 07:11:11
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepChat(Quest, 1, "I need to speak with Willim in Nettleville.", 1, "I need to speak with Willim in Nettleville and try to cheer him up.", 11, 2330036)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+    FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)   
+ 	Dialog.AddDialog("I got it!  I know a lad named Willim Barclay who lives in Nettleville. The other day, I noticed he was in a dismal mood, but I don't know why. Go talk with him and see if you can cheer him up.")
+	Dialog.AddVoiceover("voiceover/english/magister_niksel/qey_south/magister_niksel015.mp3", 2423582680, 3203696326)
+    PlayFlavor(QuestGiver, "", "", "doh", 0, 0, Player)
+    Dialog.AddOption("I suppose I can try my own \"charm\". I'll go speak with Willim.")	
+	Dialog.Start()
+end
+
+function Declined(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is declined
+end
+
+function Deleted(Quest, QuestGiver, Player)
+	-- Remove any quest specific items here when the quest is deleted
+end
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've spoken with Willim.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've \"convinced\" Willim to have a little more confidence.")
+
+	AddQuestStepChat(Quest, 2, "I need to speak with Magister Niksel in South Qeynos.", 1, "I should let Magister Niksel in South Qeynos know the good news about Willim.", 11, 2310376)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 2, "I've spoken with the Magister.")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I've let Niksel know how I \"charmed\" Willim.")
+
+	AddQuestStepKill(Quest, 3, "I must kill one klicnik mite in Antonica.", 1, 100, "I need to collect an eyeball from a Klicnik mite in Antonica.", 91, 120067)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")
+end
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I have killed one klicnik mite.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I've collected an eyeball from a Klicnik mite.")
+
+	AddQuestStepChat(Quest, 4, "I need to speak with Magister Niksel in South Qeynos.", 1, "I should bring this eyeball back to Niksel in South Qeynos.", 11, 2310376)
+	AddQuestStepCompleteAction(Quest, 4, "QuestComplete")
+end
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 4, "I've spoken with the Magister.")
+	UpdateQuestTaskGroupDescription(Quest, 4, "It seems Niksel wanted the eyeball for his lunch...")
+
+	UpdateQuestDescription(Quest, "I've only one task left to do now that I've completed all of Niksel's other lessons!")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		QuestComplete(Quest, QuestGiver, Player)
+	end
+end

+ 1 - 1
server/Quests/Hallmark/nettleville_citizenship_task.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Peat Bog.", 5, 20, "The local bog have been seeded with tokens for the citizens of Nettleville Hovel to gather. These tokens may be found on any creatures in the Peat Bog.", 1341, 1980002, 1980003, 1980004, 1980006, 1980007, 1980008, 1980009, 1980010, 1980011, 1980015, 1980017, 1980018, 1980019, 1980021, 1980022, 1980026, 1980027, 1980031, 1980033, 1980034, 1980036, 1980037, 1980038, 1980039, 1980040, 1980041, 1980042, 1980044, 1980045, 1980046, 1980047, 1980048, 1980049, 1980050, 1980051, 1980052, 1980053, 1980054, 1980055, 1980056, 1980060, 1980061, 1980062, 1980064, 1980065, 1980066, 1980067, 1980068, 1980069, 1980070, 1980072, 1980076, 1980078, 1980079, 1980115, 1980116, 1980117, 1980118, 1980119, 1980127, 1980128, 1980129, 1980130, 1980131	)
+	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Peat Bog.", 5, 30, "The local bog have been seeded with tokens for the citizens of Nettleville Hovel to gather. These tokens may be found on any creatures in the Peat Bog.", 1341, 8290001,8290002,8290003,8290004,8290005,8290006,8290007,8290008,8290009,8290010,8290011,8290012,8290013,8290014,8290015,8290016,8290017,8290018,8290019,8290020,8290021,8290022,8290023,8290024,8290025,8290026,8290027,8290028,8290029,8290030,8290031,8290032,8290033,8290038,8290039,8290040,8290041,8290042,8290043,8290044)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Peat Bog")
 end

+ 43 - 0
server/Quests/Hallmark/path_of_the_enchanter(Q).lua

@@ -0,0 +1,43 @@
+--[[
+    Script Name    : Quests/Hallmark/path_of_the_enchanter(Q).lua
+    Script Author  : Dorbin
+    Script Date    : 2022.11.06 08:11:22
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+
+function Init(Quest)
+	AddQuestStep(Quest, 1, "I should look to the middle of the southern row of buildings in South Qeynos for the Wayfarer's Rest.", 1, 100, "I must enter the Wayfarer's Rest in South Qeynos and take care of the disturbance.", 11)
+	AddQuestStepCompleteAction(Quest, 1, "QuestComplete")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is accepted
+end
+
+function Declined(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is declined
+end
+
+function Deleted(Quest, QuestGiver, Player)
+	-- Remove any quest specific items here when the quest is deleted
+end
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 1, "I have taken care of the disturbance in the Wayfarer's Rest.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I have taken care of the disturbance for Niksel and proven myself as an enchanter.")
+
+	UpdateQuestDescription(Quest, "After thinking about it rationally, I realized that there was no way for those tavern patrons to have been so upset.  So naturally, I went to find the root of their animosity.  Having done so, I find myself in a new role as an enchanter.  I suppose I'll have much to learn.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		QuestComplete(Quest, QuestGiver, Player)
+	end
+end

+ 42 - 0
server/Quests/Hallmark/path_of_the_sorcerer(Q).lua

@@ -0,0 +1,42 @@
+--[[
+    Script Name    : Quests/Hallmark/path_of_the_sorcerer(Q).lua
+    Script Author  : Dorbin
+    Script Date    : 2022.11.06 07:11:55
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+function Init(Quest)
+	AddQuestStep(Quest, 1, "I need to pass Magister Niksel's trial.", 1, 100, "I must pass Magister Niksel's trial in the testing room south of the mage tower in South Qeynos.", 11)
+	AddQuestStepCompleteAction(Quest, 1, "QuestComplete")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is accepted
+end
+
+function Declined(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is declined
+end
+
+function Deleted(Quest, QuestGiver, Player)
+	-- Remove any quest specific items here when the quest is deleted
+end
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 1, "I've passed Magister Niksel's trial.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've passed Magister Niksel's trial.")
+
+	UpdateQuestDescription(Quest, "I passed the trial and will continue on my path as a sorcerer.  I know that I cannot be reckless with my power, or these forces may overwhelm me.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		QuestComplete(Quest, QuestGiver, Player)
+	end
+end

+ 43 - 0
server/Quests/Hallmark/path_of_the_summoner.lua

@@ -0,0 +1,43 @@
+--[[
+    Script Name    : Quests/Hallmark/path_of_the_summoner.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.11.06 08:11:22
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+
+function Init(Quest)
+	AddQuestStep(Quest, 1, "I need to pass Magister Niksel's trial.", 1, 100, "I must pass Magister Niksel's trial in the testing room south of the mage tower in South Qeynos.", 11)
+	AddQuestStepCompleteAction(Quest, 1, "QuestComplete")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is accepted
+end
+
+function Declined(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is declined
+end
+
+function Deleted(Quest, QuestGiver, Player)
+	-- Remove any quest specific items here when the quest is deleted
+end
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 1, "I've passed Magister Niksel's trial.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've passed Magister Niksel's trial.")
+
+	UpdateQuestDescription(Quest, "Having completed my trial as a summoner, I will be focusing my studies in magic down the path I've chosen.  I am well on my way in Norrath - and have learned valuable lessons in responsible summoning.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		QuestComplete(Quest, QuestGiver, Player)
+	end
+end

+ 1 - 1
server/Quests/Hallmark/starcrest_citizenship_task.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Down Below.", 5, 20, "The catacombs have been seeded with tokens for the citizens of the Starcrest Commune to gather. These tokens may be found on any creatures in the Down Below.", 1342, 1990001, 1990002, 1990003, 1990004, 1990005, 1990006, 1990007, 1990008, 1990009, 1990010, 1990012, 1990013, 1990014, 1990015, 1990016, 1990017, 1990018, 1990019, 1990020, 1990021, 1990022, 1990023, 1990024, 1990025, 1990026, 1990027, 1990028, 1990029, 1990030, 1990031, 1990032, 1990033, 1990034, 1990035, 1990036, 1990037, 1990038, 1990039, 1990041, 1990042, 1990043, 1990044, 1990045, 1990054, 1990056, 1990096, 1990097, 1990098, 1990099, 1990100, 1990101, 1990102, 1990103, 1990104)
+	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Down Below.", 5, 30, "The catacombs have been seeded with tokens for the citizens of the Starcrest Commune to gather. These tokens may be found on any creatures in the Down Below.", 1342, 1990001, 1990002, 1990003, 1990004, 1990005, 1990006, 1990007, 1990008, 1990009, 1990010, 1990012, 1990013, 1990014, 1990015, 1990016, 1990017, 1990018, 1990019, 1990020, 1990021, 1990022, 1990023, 1990024, 1990025, 1990026, 1990027, 1990028, 1990029, 1990030, 1990031, 1990032, 1990033, 1990034, 1990035, 1990036, 1990037, 1990038, 1990039, 1990041, 1990042, 1990043, 1990044, 1990045, 1990054, 1990056, 1990096, 1990097, 1990098, 1990099, 1990100, 1990101, 1990102, 1990103, 1990104)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Down Below")
 end

+ 165 - 0
server/Quests/Hallmark/welcome_to_qeynos_Baubbleshire.lua

@@ -0,0 +1,165 @@
+--[[
+    Script Name    : Quests/Hallmark/welcome_to_qeynos_Baubbleshire.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.28 03:10:38
+    Script Purpose : Baubbleshire Citizenship Intro
+
+        Zone       : Hallmark
+        Quest Giver: Steward Leon
+        Preceded by: Qeynos Alignment
+        Followed by: Baubbleshire Citizenship Task
+--]]
+require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepZoneLoc(Quest, 1, "Use the room door to be given your inn room.  Click on the \"Buy\" button to get your room.  Once you have purchased your room click on \"Enter\" to enter your room.", 10, "I've been instructed to sign in at the inn's guest registry in order to get the key to my room.", 11,-5.21, 0.00, 0.03,223)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+    UpdateQuestZone(Quest,"Baubbleshire")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Yup, you heard me right.  The Baubbleshire is one of the villages that surround the city of Qeynos.  We halflings and gnomes live a good life here, though we have our decorating differences!  Oh!  I nearly forgot about your house!  The caretaker is waiting for you!")
+    PlayFlavor(QuestGiver,"","","smile",0,0,Player)
+	Dialog.AddVoiceover("voiceover/english/steward_leon/qey_village06/steward_leon004.mp3", 0, 0) --WE DON'T HAVE THE KEYS TO THIS VO
+	Dialog.AddOption("Great! I'll head to the inn right away.  Thank you.")
+	Dialog.Start()
+    if HasQuest(Player,5717) and GetQuestStep(Player,5717)==2 then
+        SetStepComplete(Player,5717,2)
+    end        
+end
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've been given your inn room")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've been given the key to my room and can now come and go as I please.")
+	AddQuestStepChat(Quest, 2, "I need to introduce myself to the caretaker.", 1, "I need to introduce myself to the caretaker",11,2230785)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")   
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+    UpdateQuestStepDescription(Quest, 2, "I've introduced myself to the caretaker of my room")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I've introduced myself to the caretaker of my innroom, Ms. Fairlee.")
+
+	AddQuestStep(Quest, 3, "I need to place the table in my inn room and speak with the caretaker.", 1, 100, "I've spoken with the caretaker of the inn, Fairlee.  She gave me a table to put in my room, claiming that the Ironforge Exchange has offered it to me.  I should place this on the floor and then continue speaking with her.",11)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")   
+end
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	AddQuestStepChat(Quest, 4, "Speak with the Banker Drizzcopper in The Baubbleshire.", 1, "Ms. Fairlee has informed me that I have a bank account waiting for me.  I need to speak with the Banker Drizzcopper to open the account.",11,2380019)
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")   
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 4, "I've spoken with the Banker in Baubbleshire.")
+	UpdateQuestTaskGroupDescription(Quest, 4, "I've spoken with the Banker in Baubbleshire.")
+	AddQuestStepChat(Quest, 5, "Return to your room and speak with Caretaker Fairlee.", 1, "I should return to the caretaker in my inn room.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 5, "Step5Complete")   
+end
+
+function Step5Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.  She gave me a painting of hers to place on my walls.")
+	AddQuestStep(Quest, 6, "Open your inventory.  \"Place\" your new painting and then speak with the caretaker.", 1,100, "Caretake Fairlee has suggested that I place the painting on my walls to liven up the place.  I should place the painting and then ask her about The Baubbleshire.",0)
+	AddQuestStepCompleteAction(Quest, 6, "Step6Complete")   
+end
+
+function Step6Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	AddQuestStepZoneLoc(Quest, 7, "I need to visit the gates to the Forest Ruins.",6,"\"Some people choose to adventure in the Forest Ruins.  It's a dangerous place, so watch yourself.  Here's where you can find the gates to the ruins.  I'll show you a few other places after you take a look at the gates.\" - Ms. Fairlee", 11,888.41, -12.55, -545.74,238)
+	AddQuestStepCompleteAction(Quest, 7, "Step7Complete")   
+end
+
+function Step7Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 7, "I've found the gates to the Forest Ruins.")
+	UpdateQuestTaskGroupDescription(Quest, 7, "I've visisted one of four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 8, "I need to introduce myself to the Baubbleshire crafting trainer, Rala Eurocarry.",1,"\"Not all coin gained by refugees comes from battling vermin. Crafting is a great opportunity for some refugees to become skilled in a tradeskill.  You should meet with the crafting trainer outside the Deductive Directory so you become familiar with where to begin a tradeskill if you so desire.\" - Ms. Fairlee", 11,2380025)
+	AddQuestStepCompleteAction(Quest, 8, "Step8Complete")   
+end
+
+function Step8Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 8, "I've met with the village crafting trainer.")
+	UpdateQuestTaskGroupDescription(Quest, 8, "I've visisted two of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 9, "I need to locate the grate to the Down Below.",6,"\"Some of the more adventurous souls help keep the city clean of vermin by venturing into the catacombs.  You can find the grate leading down to them if you take a close look.  I'll show you where you can find the entrance to the catacombs.  After that, I'll show you one more place.\" - Ms. Fairlee", 0,854.63, -18.40, -529.96,238)
+	AddQuestStepCompleteAction(Quest, 9, "Step9Complete")   
+end
+
+function Step9Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 9, "I've found the enterence to the Down Below.")
+	UpdateQuestTaskGroupDescription(Quest, 9, "I've visisted three of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 10, "I need to locate the gates to the Elddar Grove.",6, "\"Even though only citizens can travel into the city proper, it would be rude not to at least show where the gates to Qeynos are.  I'll lead you over to where you can find the gates into the city.  I should be done with fixing up the place by the time you get back.\" - Ms. Fairlee", 11,820.05, -20.60, -525.39,238)
+	AddQuestStepCompleteAction(Quest, 10, "Step10Complete")   
+end
+
+function Step10Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 10, "I've visited the inner city gates but was not allowed access.")
+	UpdateQuestTaskGroupDescription(Quest, 10, "I've visisted all four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 11, "I need to return to my room and ask Ms. Fairlee why I can't enter the city.", 1, 100, "I should return back to my room and ask Ms. Fairlee why the guard didn't allow me to enter into the city.  Hopefully she might know why.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 11, "Step11Complete")   
+end
+
+function Step11Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	UpdateQuestTaskGroupDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	AddQuestStep(Quest, 12, "Open your inventory.  \"Place\" your new chandelier and then speak with the caretaker.", 1, 100,"As if two pieces of furniture weren't enough, I now have a chandelier some neighbors brought by.  I should place this on my ceiling for better lighting and then ask Ms. Fairlee why the guard said only \"citizens\" were allowed into the city.",11)
+	AddQuestStepCompleteAction(Quest, 12, "Step12Complete")   
+end
+
+function Step12Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	AddQuestStep(Quest, 13, "Take an application from the citizenship sign, complete the task, then speak with Marshal Glorfel by using the citizenship sign again.", 1, 100,"\"If you want to deal with all the hub-bub of city life, then you'll want to go to the citizenship sign at the city gates.  Pull an application from the wall and fulfill the application task, afterwards return to the sign and use it to speak with Marshal Glorfel about becoming a citizen.  If you ask me, I don't know what's wrong with settling down here.  It's a nice sleepy village, not troubled with excitement and danger and all that.  But then again, you kids like that kind of thing.  Well, good luck to you!\" - Ms. Fairlee",11)
+	AddQuestStepCompleteAction(Quest, 13, "Step13Complete")   
+end
+
+function Step13Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	UpdateQuestTaskGroupDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	AddQuestStepChat(Quest, 14, "Judge the traitors individually and prove your loyalty to Qeynos.", 1, 100,"Marshal Glorfel has tasked me with rendering judgment upon some treasonous residents in order to gain citizenship.  He has pointed out that there are those who would betray our great city to that wretch Lucan.  To prove myself, I will have to render final judgment on all of them.",11,22101350)
+	AddQuestStepCompleteAction(Quest, 14, "QuestComplete")   
+end
+
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 14, "I have completed the Citizenship Trial and am now a citizen of Qeynos.")
+	UpdateQuestTaskGroupDescription(Quest, 14, "I am now a citizen of Qeynos!")
+
+	UpdateQuestDescription(Quest, "Thanks to the help of the inn's caretaker, I've been able to familiarize myself with the Baubbleshire.  Not only did she show me the way around, she also let me know who to speak to in order to become a citizen.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	elseif Step == 5 then
+		Step5Complete(Quest, QuestGiver, Player)
+	elseif Step == 6 then
+		Step6Complete(Quest, QuestGiver, Player)
+	elseif Step == 7 then
+		Step7Complete(Quest, QuestGiver, Player)
+	elseif Step == 8 then
+		Step8Complete(Quest, QuestGiver, Player)
+	elseif Step == 9 then
+		Step9Complete(Quest, QuestGiver, Player)
+	elseif Step == 10 then
+		Step10Complete(Quest, QuestGiver, Player)
+	elseif Step == 11 then
+		Step11Complete(Quest, QuestGiver, Player)
+	elseif Step == 12 then
+		Step12Complete(Quest, QuestGiver, Player)
+	elseif Step == 13 then
+		Step13Complete(Quest, QuestGiver, Player)
+	elseif Step == 14 then
+		QuestComplete(Quest, QuestGiver, Player)
+		end
+end

+ 165 - 0
server/Quests/Hallmark/welcome_to_qeynos_Castleivew.lua

@@ -0,0 +1,165 @@
+--[[
+    Script Name    : Quests/Hallmark/welcome_to_qeynos_Castleivew.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.28 03:10:45
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+ require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepZoneLoc(Quest, 1, "Use the room door to be given your inn room.  Click on the \"Buy\" button to get your room.  Once you have purchased your room click on \"Enter\" to enter your room.", 10, "I've been instructed to sign in at the inn's guest registry in order to get the key to my room.", 11,-5.21, 0.00, 0.03,223)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+    UpdateQuestZone(Quest,"Castleview")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("This is the village of Castleview, one of several villages surrounding Qeynos. Within our hamlet, both Koada'Dal like me, and Frogloks, live side by side.  I digress. The caretaker of your home awaits you, and it is impolite to keep her waiting.")
+    PlayFlavor(QuestGiver,"","","orate",0,0,Player)
+	Dialog.AddVoiceover("voiceover/english/steward_quyntar/qey_village04/steward_quyntar004.mp3", 2072542675, 3706058762)
+	Dialog.AddOption("I thank your for your assistance.  I shall meet with the caretaker at once.")
+	Dialog.Start()
+    if HasQuest(Player,5717) and GetQuestStep(Player,5717)==2 then
+        SetStepComplete(Player,5717,2)
+    end        
+end
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've been given your inn room")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've been given the key to my room and can now come and go as I please.")
+	AddQuestStepChat(Quest, 2, "I need to introduce myself to the caretaker.", 1, "I need to introduce myself to the caretaker",11,2230785)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")   
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+    UpdateQuestStepDescription(Quest, 2, "I've introduced myself to the caretaker of my room")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I've introduced myself to the caretaker of my innroom, Ms. Fairlee.")
+
+	AddQuestStep(Quest, 3, "I need to place the table in my inn room and speak with the caretaker.", 1, 100, "I've spoken with the caretaker of the inn, Fairlee.  She gave me a table to put in my room, claiming that the Ironforge Exchange has offered it to me.  I should place this on the floor and then continue speaking with her.",11)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")   
+end
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	AddQuestStepChat(Quest, 4, "Speak with the Banker Dalonalis in Castleview Hamlet.", 1, "Ms. Fairlee has informed me that I have a bank account waiting for me.  I need to speak with the Banker Dalonalis to open the account.",11,2360027)
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")   
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 4, "I've spoken with the Banker in Graystone Yard.")
+	UpdateQuestTaskGroupDescription(Quest, 4, "I've spoken with the Banker in the Graystone Yard.")
+	AddQuestStepChat(Quest, 5, "Return to your room and speak with Caretaker Fairlee.", 1, "I should return to the caretaker in my inn room.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 5, "Step5Complete")   
+end
+
+function Step5Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.  She gave me a painting of hers to place on my walls.")
+	AddQuestStep(Quest, 6, "Open your inventory.  \"Place\" your new painting and then speak with the caretaker.", 1,100, "Caretake Fairlee has suggested that I place the painting on my walls to liven up the place.  I should place the painting and then ask her about The Baubbleshire.",0)
+	AddQuestStepCompleteAction(Quest, 6, "Step6Complete")   
+end
+
+function Step6Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	AddQuestStepZoneLoc(Quest, 7, "I need to visit the gates to the Oakmyst Forest.",6,"\"Some people choose to adventure in the Oakmyst Forest.  It's a dangerous place, so watch yourself.  Here's where you can find the gates to the forest.  I'll show you a few other places after you take a look at the gates.\" - Ms. Fairlee", 11,749.32, -6.25, -194.2,236)
+	AddQuestStepCompleteAction(Quest, 7, "Step7Complete")   
+end
+
+function Step7Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 7, "I've found the gates to the Oakmyst Forest.")
+	UpdateQuestTaskGroupDescription(Quest, 7, "I've visisted one of four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 8, "I need to introduce myself to the Castleview Hamlet crafting trainer, Glump Marrblade.",1,"\"Not all coin gained by refugees comes from battling vermin. Crafting is a great opportunity for some refugees to become skilled in a tradeskill.  You should meet with the crafting trainer outside The Charter of the Truthbringer so you become familiar with where to begin a tradeskill if you so desire.\" - Ms. Fairlee", 11,2360033)
+	AddQuestStepCompleteAction(Quest, 8, "Step8Complete")   
+end
+
+function Step8Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 8, "I've met with the village crafting trainer.")
+	UpdateQuestTaskGroupDescription(Quest, 8, "I've visisted two of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 9, "I need to locate the grate to the Down Below.",6,"\"Some of the more adventurous souls help keep the city clean of vermin by venturing into the catacombs.  You can find the grate leading down to them if you take a close look.  I'll show you where you can find the entrance to the catacombs.  After that, I'll show you one more place.\" - Ms. Fairlee", 0,793.01, -20.68, -97.76,236)
+	AddQuestStepCompleteAction(Quest, 9, "Step9Complete")   
+end
+
+function Step9Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 9, "I've found the enterence to the Down Below.")
+	UpdateQuestTaskGroupDescription(Quest, 9, "I've visisted three of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 10, "I need to locate the gates to Qeynos Harbor.",6, "\"Even though only citizens can travel into the city proper, it would be rude not to at least show where the gates to Qeynos are.  I'll lead you over to where you can find the gates into the city.  I should be done with fixing up the place by the time you get back.\" - Ms. Fairlee", 11,730.60, -21.16, -124.67,236)
+	AddQuestStepCompleteAction(Quest, 10, "Step10Complete")   
+end
+
+function Step10Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 10, "I've visited the inner city gates but was not allowed access.")
+	UpdateQuestTaskGroupDescription(Quest, 10, "I've visisted all four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 11, "I need to return to my room and ask Ms. Fairlee why I can't enter the city.", 1, 100, "I should return back to my room and ask Ms. Fairlee why the guard didn't allow me to enter into the city.  Hopefully she might know why.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 11, "Step11Complete")   
+end
+
+function Step11Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	UpdateQuestTaskGroupDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	AddQuestStep(Quest, 12, "Open your inventory.  \"Place\" your new chandelier and then speak with the caretaker.", 1, 100,"As if two pieces of furniture weren't enough, I now have a chandelier some neighbors brought by.  I should place this on my ceiling for better lighting and then ask Ms. Fairlee why the guard said only \"citizens\" were allowed into the city.",11)
+	AddQuestStepCompleteAction(Quest, 12, "Step12Complete")   
+end
+
+function Step12Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	AddQuestStep(Quest, 13, "Take an application from the citizenship sign, complete the task, then speak with Marshal Glorfel by using the citizenship sign again.", 1, 100,"\"If you want to deal with all the hub-bub of city life, then you'll want to go to the citizenship sign at the city gates.  Pull an application from the wall and fulfill the application task, afterwards return to the sign and use it to speak with Marshal Glorfel about becoming a citizen.  If you ask me, I don't know what's wrong with settling down here.  It's a nice sleepy village, not troubled with excitement and danger and all that.  But then again, you kids like that kind of thing.  Well, good luck to you!\" - Ms. Fairlee",11)
+	AddQuestStepCompleteAction(Quest, 13, "Step13Complete")   
+end
+
+function Step13Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	UpdateQuestTaskGroupDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	AddQuestStepChat(Quest, 14, "Judge the traitors individually and prove your loyalty to Qeynos.", 1, 100,"Marshal Glorfel has tasked me with rendering judgment upon some treasonous residents in order to gain citizenship.  He has pointed out that there are those who would betray our great city to that wretch Lucan.  To prove myself, I will have to render final judgment on all of them.",11,22101350)
+	AddQuestStepCompleteAction(Quest, 14, "QuestComplete")   
+end
+
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 14, "I have completed the Citizenship Trial and am now a citizen of Qeynos.")
+	UpdateQuestTaskGroupDescription(Quest, 14, "I am now a citizen of Qeynos!")
+
+	UpdateQuestDescription(Quest, "Thanks to the help of the inn's caretaker, I've been able to familiarize myself with the Baubbleshire.  Not only did she show me the way around, she also let me know who to speak to in order to become a citizen.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	elseif Step == 5 then
+		Step5Complete(Quest, QuestGiver, Player)
+	elseif Step == 6 then
+		Step6Complete(Quest, QuestGiver, Player)
+	elseif Step == 7 then
+		Step7Complete(Quest, QuestGiver, Player)
+	elseif Step == 8 then
+		Step8Complete(Quest, QuestGiver, Player)
+	elseif Step == 9 then
+		Step9Complete(Quest, QuestGiver, Player)
+	elseif Step == 10 then
+		Step10Complete(Quest, QuestGiver, Player)
+	elseif Step == 11 then
+		Step11Complete(Quest, QuestGiver, Player)
+	elseif Step == 12 then
+		Step12Complete(Quest, QuestGiver, Player)
+	elseif Step == 13 then
+		Step13Complete(Quest, QuestGiver, Player)
+	elseif Step == 14 then
+		QuestComplete(Quest, QuestGiver, Player)
+		end
+end

+ 165 - 0
server/Quests/Hallmark/welcome_to_qeynos_Graystone.lua

@@ -0,0 +1,165 @@
+--[[
+    Script Name    : Quests/Hallmark/welcome_to_qeynos_Graystone.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.28 03:10:51
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+ require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepZoneLoc(Quest, 1, "Use the room door to be given your inn room.  Click on the \"Buy\" button to get your room.  Once you have purchased your room click on \"Enter\" to enter your room.", 10, "I've been instructed to sign in at the inn's guest registry in order to get the key to my room.", 11,-5.21, 0.00, 0.03,223)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+    UpdateQuestZone(Quest,"Graystone Yard")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("This is Graystone Yard, home to dwarves and barbarians. It's the nicest of the villages surrounding Qeynos. Really, you couldn't ask to live in a better place. Oh no!  Look at the time! I enjoyed chatting with you, but I took too much of your time already. You gotta go meet with the caretaker of your new home. Good luck!")
+    PlayFlavor(QuestGiver,"","","orate",0,0,Player)
+	Dialog.AddVoiceover("voiceover/english/steward_sal/qey_village03/steward_sal004.mp3", 443635836, 3348325034) 
+	Dialog.AddOption("And nice to meet you, too!")
+	Dialog.Start()
+    if HasQuest(Player,5717) and GetQuestStep(Player,5717)==2 then
+        SetStepComplete(Player,5717,2)
+    end        
+end
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've been given your inn room")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've been given the key to my room and can now come and go as I please.")
+	AddQuestStepChat(Quest, 2, "I need to introduce myself to the caretaker.", 1, "I need to introduce myself to the caretaker",11,2230785)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")   
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+    UpdateQuestStepDescription(Quest, 2, "I've introduced myself to the caretaker of my room")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I've introduced myself to the caretaker of my innroom, Ms. Fairlee.")
+
+	AddQuestStep(Quest, 3, "I need to place the table in my inn room and speak with the caretaker.", 1, 100, "I've spoken with the caretaker of the inn, Fairlee.  She gave me a table to put in my room, claiming that the Ironforge Exchange has offered it to me.  I should place this on the floor and then continue speaking with her.",11)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")   
+end
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	AddQuestStepChat(Quest, 4, "Speak with the Banker Dori in Graystone Yard.", 1, "Ms. Fairlee has informed me that I have a bank account waiting for me.  I need to speak with the Banker Dori to open the account.",11,2350026)
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")   
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 4, "I've spoken with the Banker in Graystone Yard.")
+	UpdateQuestTaskGroupDescription(Quest, 4, "I've spoken with the Banker in the Graystone Yard.")
+	AddQuestStepChat(Quest, 5, "Return to your room and speak with Caretaker Fairlee.", 1, "I should return to the caretaker in my inn room.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 5, "Step5Complete")   
+end
+
+function Step5Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.  She gave me a painting of hers to place on my walls.")
+	AddQuestStep(Quest, 6, "Open your inventory.  \"Place\" your new painting and then speak with the caretaker.", 1,100, "Caretake Fairlee has suggested that I place the painting on my walls to liven up the place.  I should place the painting and then ask her about The Baubbleshire.",0)
+	AddQuestStepCompleteAction(Quest, 6, "Step6Complete")   
+end
+
+function Step6Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	AddQuestStepZoneLoc(Quest, 7, "I need to visit the gates to the Oakmyst Forest.",6,"\"Some people choose to adventure in the Oakmyst Forest.  It's a dangerous place, so watch yourself.  Here's where you can find the gates to the forest.  I'll show you a few other places after you take a look at the gates.\" - Ms. Fairlee", 11,861.01, -5.17, -203.63,235)
+	AddQuestStepCompleteAction(Quest, 7, "Step7Complete")   
+end
+
+function Step7Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 7, "I've found the gates to the Oakmyst Forest.")
+	UpdateQuestTaskGroupDescription(Quest, 7, "I've visisted one of four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 8, "I need to introduce myself to the Graystone Yard crafting trainer, Dorak Everstock.",1,"\"Not all coin gained by refugees comes from battling vermin. Crafting is a great opportunity for some refugees to become skilled in a tradeskill.  You should meet with the crafting trainer outside The Stalwart Township so you become familiar with where to begin a tradeskill if you so desire.\" - Ms. Fairlee", 11,2350050)
+	AddQuestStepCompleteAction(Quest, 8, "Step8Complete")   
+end
+
+function Step8Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 8, "I've met with the village crafting trainer.")
+	UpdateQuestTaskGroupDescription(Quest, 8, "I've visisted two of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 9, "I need to locate the grate to the Down Below.",6,"\"Some of the more adventurous souls help keep the city clean of vermin by venturing into the catacombs.  You can find the grate leading down to them if you take a close look.  I'll show you where you can find the entrance to the catacombs.  After that, I'll show you one more place.\" - Ms. Fairlee", 0,814.48, -25.07, -149.12,235)
+	AddQuestStepCompleteAction(Quest, 9, "Step9Complete")   
+end
+
+function Step9Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 9, "I've found the enterence to the Down Below.")
+	UpdateQuestTaskGroupDescription(Quest, 9, "I've visisted three of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 10, "I need to locate the gates to Qeynos Harbor.",6, "\"Even though only citizens can travel into the city proper, it would be rude not to at least show where the gates to Qeynos are.  I'll lead you over to where you can find the gates into the city.  I should be done with fixing up the place by the time you get back.\" - Ms. Fairlee", 11,865.63, -25.47, -98.92,235)
+	AddQuestStepCompleteAction(Quest, 10, "Step10Complete")   
+end
+
+function Step10Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 10, "I've visited the inner city gates but was not allowed access.")
+	UpdateQuestTaskGroupDescription(Quest, 10, "I've visisted all four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 11, "I need to return to my room and ask Ms. Fairlee why I can't enter the city.", 1, 100, "I should return back to my room and ask Ms. Fairlee why the guard didn't allow me to enter into the city.  Hopefully she might know why.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 11, "Step11Complete")   
+end
+
+function Step11Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	UpdateQuestTaskGroupDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	AddQuestStep(Quest, 12, "Open your inventory.  \"Place\" your new chandelier and then speak with the caretaker.", 1, 100,"As if two pieces of furniture weren't enough, I now have a chandelier some neighbors brought by.  I should place this on my ceiling for better lighting and then ask Ms. Fairlee why the guard said only \"citizens\" were allowed into the city.",11)
+	AddQuestStepCompleteAction(Quest, 12, "Step12Complete")   
+end
+
+function Step12Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	AddQuestStep(Quest, 13, "Take an application from the citizenship sign, complete the task, then speak with Marshal Glorfel by using the citizenship sign again.", 1, 100,"\"If you want to deal with all the hub-bub of city life, then you'll want to go to the citizenship sign at the city gates.  Pull an application from the wall and fulfill the application task, afterwards return to the sign and use it to speak with Marshal Glorfel about becoming a citizen.  If you ask me, I don't know what's wrong with settling down here.  It's a nice sleepy village, not troubled with excitement and danger and all that.  But then again, you kids like that kind of thing.  Well, good luck to you!\" - Ms. Fairlee",11)
+	AddQuestStepCompleteAction(Quest, 13, "Step13Complete")   
+end
+
+function Step13Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	UpdateQuestTaskGroupDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	AddQuestStepChat(Quest, 14, "Judge the traitors individually and prove your loyalty to Qeynos.", 1, 100,"Marshal Glorfel has tasked me with rendering judgment upon some treasonous residents in order to gain citizenship.  He has pointed out that there are those who would betray our great city to that wretch Lucan.  To prove myself, I will have to render final judgment on all of them.",11,22101350)
+	AddQuestStepCompleteAction(Quest, 14, "QuestComplete")   
+end
+
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 14, "I have completed the Citizenship Trial and am now a citizen of Qeynos.")
+	UpdateQuestTaskGroupDescription(Quest, 14, "I am now a citizen of Qeynos!")
+
+	UpdateQuestDescription(Quest, "Thanks to the help of the inn's caretaker, I've been able to familiarize myself with the Baubbleshire.  Not only did she show me the way around, she also let me know who to speak to in order to become a citizen.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	elseif Step == 5 then
+		Step5Complete(Quest, QuestGiver, Player)
+	elseif Step == 6 then
+		Step6Complete(Quest, QuestGiver, Player)
+	elseif Step == 7 then
+		Step7Complete(Quest, QuestGiver, Player)
+	elseif Step == 8 then
+		Step8Complete(Quest, QuestGiver, Player)
+	elseif Step == 9 then
+		Step9Complete(Quest, QuestGiver, Player)
+	elseif Step == 10 then
+		Step10Complete(Quest, QuestGiver, Player)
+	elseif Step == 11 then
+		Step11Complete(Quest, QuestGiver, Player)
+	elseif Step == 12 then
+		Step12Complete(Quest, QuestGiver, Player)
+	elseif Step == 13 then
+		Step13Complete(Quest, QuestGiver, Player)
+	elseif Step == 14 then
+		QuestComplete(Quest, QuestGiver, Player)
+		end
+end

+ 165 - 0
server/Quests/Hallmark/welcome_to_qeynos_Nettleville.lua

@@ -0,0 +1,165 @@
+--[[
+    Script Name    : Quests/Hallmark/welcome_to_qeynos_Nettleville.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.28 03:10:57
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+ require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepZoneLoc(Quest, 1, "Use the room door to be given your inn room.  Click on the \"Buy\" button to get your room.  Once you have purchased your room click on \"Enter\" to enter your room.", 10, "I've been instructed to sign in at the inn's guest registry in order to get the key to my room.", 11,-5.21, 0.00, 0.03,223)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+    UpdateQuestZone(Quest,"Nettleville")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Nettleville is one of the oldest villages surrounding Qeynos.  Our village is home to both humans and kerrans. I'd love to talk further, but I must direct you to your home.  The caretaker is waiting for you.  Good luck with your new life, friend.")
+    PlayFlavor(QuestGiver,"","","orate",0,0,Player)
+	Dialog.AddVoiceover("voiceover/english/steward_loralei/qey_village01/steward_loralei004.mp3", 779159458, 3923643767) 
+	Dialog.AddOption("Well, thank you for your assistance, Steward.")
+	Dialog.Start()
+    if HasQuest(Player,5717) and GetQuestStep(Player,5717)==2 then
+        SetStepComplete(Player,5717,2)
+    end        
+end
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've been given your inn room")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've been given the key to my room and can now come and go as I please.")
+	AddQuestStepChat(Quest, 2, "I need to introduce myself to the caretaker.", 1, "I need to introduce myself to the caretaker",11,2230785)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")   
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+    UpdateQuestStepDescription(Quest, 2, "I've introduced myself to the caretaker of my room")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I've introduced myself to the caretaker of my innroom, Ms. Fairlee.")
+
+	AddQuestStep(Quest, 3, "I need to place the table in my inn room and speak with the caretaker.", 1, 100, "I've spoken with the caretaker of the inn, Fairlee.  She gave me a table to put in my room, claiming that the Ironforge Exchange has offered it to me.  I should place this on the floor and then continue speaking with her.",11)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")   
+end
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	AddQuestStepChat(Quest, 4, "Speak with the Banker Caroline Copperstone in Nettleville Hovel.", 1, "Ms. Fairlee has informed me that I have a bank account waiting for me.  I need to speak with the Banker Caroline to open the account.",11,2330017)
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")   
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 4, "I've spoken with the Banker in Nettleville Hovel.")
+	UpdateQuestTaskGroupDescription(Quest, 4, "I've spoken with the Banker in the Nettleville Hovel.")
+	AddQuestStepChat(Quest, 5, "Return to your room and speak with Caretaker Fairlee.", 1, "I should return to the caretaker in my inn room.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 5, "Step5Complete")   
+end
+
+function Step5Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.  She gave me a painting of hers to place on my walls.")
+	AddQuestStep(Quest, 6, "Open your inventory.  \"Place\" your new painting and then speak with the caretaker.", 1,100, "Caretake Fairlee has suggested that I place the painting on my walls to liven up the place.  I should place the painting and then ask her about The Baubbleshire.",0)
+	AddQuestStepCompleteAction(Quest, 6, "Step6Complete")   
+end
+
+function Step6Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	AddQuestStepZoneLoc(Quest, 7, "I need to visit the gates to the Peat Bog.",6,"\"Some people choose to adventure in the Peat Bog.  It's a dangerous place, so watch yourself.  Here's where you can find the gates to the Bog.  I'll show you a few other places after you take a look at the gates.\" - Ms. Fairlee", 11,576.11, -26.74, 395.69,233)
+	AddQuestStepCompleteAction(Quest, 7, "Step7Complete")   
+end
+
+function Step7Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 7, "I've found the gates to the Peat Bog.")
+	UpdateQuestTaskGroupDescription(Quest, 7, "I've visisted one of four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 8, "I need to introduce myself to the Nettleville crafting trainer, Nawal Tahri.",1,"\"Not all coin gained by refugees comes from battling vermin. Crafting is a great opportunity for some refugees to become skilled in a tradeskill.  You should meet with the crafting trainer outside The Elsuive Commonwealth so you become familiar with where to begin a tradeskill if you so desire.\" - Ms. Fairlee", 11,2350050)
+	AddQuestStepCompleteAction(Quest, 8, "Step8Complete")   
+end
+
+function Step8Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 8, "I've met with the village crafting trainer.")
+	UpdateQuestTaskGroupDescription(Quest, 8, "I've visisted two of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 9, "I need to locate the grate to the Down Below.",6,"\"Some of the more adventurous souls help keep the city clean of vermin by venturing into the catacombs.  You can find the grate leading down to them if you take a close look.  I'll show you where you can find the entrance to the catacombs.  After that, I'll show you one more place.\" - Ms. Fairlee", 0,662.58, -21.82, 332.28,233)
+	AddQuestStepCompleteAction(Quest, 9, "Step9Complete")   
+end
+
+function Step9Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 9, "I've found the enterence to the Down Below.")
+	UpdateQuestTaskGroupDescription(Quest, 9, "I've visisted three of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 10, "I need to locate the gates to South Qeynos.",6, "\"Even though only citizens can travel into the city proper, it would be rude not to at least show where the gates to Qeynos are.  I'll lead you over to where you can find the gates into the city.  I should be done with fixing up the place by the time you get back.\" - Ms. Fairlee", 11,669.28, -20.37, 275.44,233)
+	AddQuestStepCompleteAction(Quest, 10, "Step10Complete")   
+end
+
+function Step10Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 10, "I've visited the inner city gates but was not allowed access.")
+	UpdateQuestTaskGroupDescription(Quest, 10, "I've visisted all four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 11, "I need to return to my room and ask Ms. Fairlee why I can't enter the city.", 1, 100, "I should return back to my room and ask Ms. Fairlee why the guard didn't allow me to enter into the city.  Hopefully she might know why.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 11, "Step11Complete")   
+end
+
+function Step11Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	UpdateQuestTaskGroupDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	AddQuestStep(Quest, 12, "Open your inventory.  \"Place\" your new chandelier and then speak with the caretaker.", 1, 100,"As if two pieces of furniture weren't enough, I now have a chandelier some neighbors brought by.  I should place this on my ceiling for better lighting and then ask Ms. Fairlee why the guard said only \"citizens\" were allowed into the city.",11)
+	AddQuestStepCompleteAction(Quest, 12, "Step12Complete")   
+end
+
+function Step12Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	AddQuestStep(Quest, 13, "Take an application from the citizenship sign, complete the task, then speak with Marshal Glorfel by using the citizenship sign again.", 1, 100,"\"If you want to deal with all the hub-bub of city life, then you'll want to go to the citizenship sign at the city gates.  Pull an application from the wall and fulfill the application task, afterwards return to the sign and use it to speak with Marshal Glorfel about becoming a citizen.  If you ask me, I don't know what's wrong with settling down here.  It's a nice sleepy village, not troubled with excitement and danger and all that.  But then again, you kids like that kind of thing.  Well, good luck to you!\" - Ms. Fairlee",11)
+	AddQuestStepCompleteAction(Quest, 13, "Step13Complete")   
+end
+
+function Step13Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	UpdateQuestTaskGroupDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	AddQuestStepChat(Quest, 14, "Judge the traitors individually and prove your loyalty to Qeynos.", 1, 100,"Marshal Glorfel has tasked me with rendering judgment upon some treasonous residents in order to gain citizenship.  He has pointed out that there are those who would betray our great city to that wretch Lucan.  To prove myself, I will have to render final judgment on all of them.",11,22101350)
+	AddQuestStepCompleteAction(Quest, 14, "QuestComplete")   
+end
+
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 14, "I have completed the Citizenship Trial and am now a citizen of Qeynos.")
+	UpdateQuestTaskGroupDescription(Quest, 14, "I am now a citizen of Qeynos!")
+
+	UpdateQuestDescription(Quest, "Thanks to the help of the inn's caretaker, I've been able to familiarize myself with the Baubbleshire.  Not only did she show me the way around, she also let me know who to speak to in order to become a citizen.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	elseif Step == 5 then
+		Step5Complete(Quest, QuestGiver, Player)
+	elseif Step == 6 then
+		Step6Complete(Quest, QuestGiver, Player)
+	elseif Step == 7 then
+		Step7Complete(Quest, QuestGiver, Player)
+	elseif Step == 8 then
+		Step8Complete(Quest, QuestGiver, Player)
+	elseif Step == 9 then
+		Step9Complete(Quest, QuestGiver, Player)
+	elseif Step == 10 then
+		Step10Complete(Quest, QuestGiver, Player)
+	elseif Step == 11 then
+		Step11Complete(Quest, QuestGiver, Player)
+	elseif Step == 12 then
+		Step12Complete(Quest, QuestGiver, Player)
+	elseif Step == 13 then
+		Step13Complete(Quest, QuestGiver, Player)
+	elseif Step == 14 then
+		QuestComplete(Quest, QuestGiver, Player)
+		end
+end

+ 165 - 0
server/Quests/Hallmark/welcome_to_qeynos_Starcrest.lua

@@ -0,0 +1,165 @@
+--[[
+    Script Name    : Quests/Hallmark/welcome_to_qeynos_Starcrest.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.28 03:10:03
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+ require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepZoneLoc(Quest, 1, "Use the room door to be given your inn room.  Click on the \"Buy\" button to get your room.  Once you have purchased your room click on \"Enter\" to enter your room.", 10, "I've been instructed to sign in at the inn's guest registry in order to get the key to my room.", 11,-5.21, 0.00, 0.03,223)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+    UpdateQuestZone(Quest,"Starcrest Commune")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("You are in the Starcrest Commune, a village surrounding the city of Qeynos. Many humans and Erudites call Starcrest home. Soon, you will call it home as well. Please, venture on now. Your new caretaker awaits you. I've confidence in you, young one. I know you will do well in our village.")
+    PlayFlavor(QuestGiver,"","","orate",0,0,Player)
+	Dialog.AddVoiceover("voiceover/english/steward_daedeakovoon/qey_village02/steward_daedeakovoon004.mp3", 2169284616, 3409785704)
+	Dialog.AddOption("Well, thank you for your assistance, Steward.")
+	Dialog.Start()
+    if HasQuest(Player,5717) and GetQuestStep(Player,5717)==2 then
+        SetStepComplete(Player,5717,2)
+    end        
+end
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've been given your inn room")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've been given the key to my room and can now come and go as I please.")
+	AddQuestStepChat(Quest, 2, "I need to introduce myself to the caretaker.", 1, "I need to introduce myself to the caretaker",11,2230785)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")   
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+    UpdateQuestStepDescription(Quest, 2, "I've introduced myself to the caretaker of my room")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I've introduced myself to the caretaker of my innroom, Ms. Fairlee.")
+
+	AddQuestStep(Quest, 3, "I need to place the table in my inn room and speak with the caretaker.", 1, 100, "I've spoken with the caretaker of the inn, Fairlee.  She gave me a table to put in my room, claiming that the Ironforge Exchange has offered it to me.  I should place this on the floor and then continue speaking with her.",11)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")   
+end
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	AddQuestStepChat(Quest, 4, "Speak with the Banker Orudormo in Nettleville Hovel.", 1, "Ms. Fairlee has informed me that I have a bank account waiting for me.  I need to speak with the Banker Caroline to open the account.",11,2340031)
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")   
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 4, "I've spoken with the Banker Orudormo in Starcrest Commune.")
+	UpdateQuestTaskGroupDescription(Quest, 4, "I've spoken with the Banker in the Starcrest Commune.")
+	AddQuestStepChat(Quest, 5, "Return to your room and speak with Caretaker Fairlee.", 1, "I should return to the caretaker in my inn room.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 5, "Step5Complete")   
+end
+
+function Step5Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.  She gave me a painting of hers to place on my walls.")
+	AddQuestStep(Quest, 6, "Open your inventory.  \"Place\" your new painting and then speak with the caretaker.", 1,100, "Caretake Fairlee has suggested that I place the painting on my walls to liven up the place.  I should place the painting and then ask her about The Baubbleshire.",0)
+	AddQuestStepCompleteAction(Quest, 6, "Step6Complete")   
+end
+
+function Step6Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	AddQuestStepZoneLoc(Quest, 7, "I need to visit the gates to the Peat Bog.",6,"\"Some people choose to adventure in the Peat Bog.  It's a dangerous place, so watch yourself.  Here's where you can find the gates to the Bog.  I'll show you a few other places after you take a look at the gates.\" - Ms. Fairlee", 11,769.35, -26.47, 360.3,234)
+	AddQuestStepCompleteAction(Quest, 7, "Step7Complete")   
+end
+
+function Step7Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 7, "I've found the gates to the Peat Bog.")
+	UpdateQuestTaskGroupDescription(Quest, 7, "I've visisted one of four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 8, "I need to introduce myself to the Starcrest crafting trainer, Erian Seaver.",1,"\"Not all coin gained by refugees comes from battling vermin. Crafting is a great opportunity for some refugees to become skilled in a tradeskill.  You should meet with the crafting trainer outside The Luminary Cache so you become familiar with where to begin a tradeskill if you so desire.\" - Ms. Fairlee", 11,2340036)
+	AddQuestStepCompleteAction(Quest, 8, "Step8Complete")   
+end
+
+function Step8Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 8, "I've met with the village crafting trainer.")
+	UpdateQuestTaskGroupDescription(Quest, 8, "I've visisted two of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 9, "I need to locate the grate to the Down Below.",6,"\"Some of the more adventurous souls help keep the city clean of vermin by venturing into the catacombs.  You can find the grate leading down to them if you take a close look.  I'll show you where you can find the entrance to the catacombs.  After that, I'll show you one more place.\" - Ms. Fairlee", 0,809.60, -19.90, 257.14,234)
+	AddQuestStepCompleteAction(Quest, 9, "Step9Complete")   
+end
+
+function Step9Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 9, "I've found the enterence to the Down Below.")
+	UpdateQuestTaskGroupDescription(Quest, 9, "I've visisted three of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 10, "I need to locate the gates to South Qeynos.",6, "\"Even though only citizens can travel into the city proper, it would be rude not to at least show where the gates to Qeynos are.  I'll lead you over to where you can find the gates into the city.  I should be done with fixing up the place by the time you get back.\" - Ms. Fairlee", 11,704.68, -20.38, 264.64,234)
+	AddQuestStepCompleteAction(Quest, 10, "Step10Complete")   
+end
+
+function Step10Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 10, "I've visited the inner city gates but was not allowed access.")
+	UpdateQuestTaskGroupDescription(Quest, 10, "I've visisted all four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 11, "I need to return to my room and ask Ms. Fairlee why I can't enter the city.", 1, 100, "I should return back to my room and ask Ms. Fairlee why the guard didn't allow me to enter into the city.  Hopefully she might know why.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 11, "Step11Complete")   
+end
+
+function Step11Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	UpdateQuestTaskGroupDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	AddQuestStep(Quest, 12, "Open your inventory.  \"Place\" your new chandelier and then speak with the caretaker.", 1, 100,"As if two pieces of furniture weren't enough, I now have a chandelier some neighbors brought by.  I should place this on my ceiling for better lighting and then ask Ms. Fairlee why the guard said only \"citizens\" were allowed into the city.",11)
+	AddQuestStepCompleteAction(Quest, 12, "Step12Complete")   
+end
+
+function Step12Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	AddQuestStep(Quest, 13, "Take an application from the citizenship sign, complete the task, then speak with Marshal Glorfel by using the citizenship sign again.", 1, 100,"\"If you want to deal with all the hub-bub of city life, then you'll want to go to the citizenship sign at the city gates.  Pull an application from the wall and fulfill the application task, afterwards return to the sign and use it to speak with Marshal Glorfel about becoming a citizen.  If you ask me, I don't know what's wrong with settling down here.  It's a nice sleepy village, not troubled with excitement and danger and all that.  But then again, you kids like that kind of thing.  Well, good luck to you!\" - Ms. Fairlee",11)
+	AddQuestStepCompleteAction(Quest, 13, "Step13Complete")   
+end
+
+function Step13Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	UpdateQuestTaskGroupDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	AddQuestStepChat(Quest, 14, "Judge the traitors individually and prove your loyalty to Qeynos.", 1, 100,"Marshal Glorfel has tasked me with rendering judgment upon some treasonous residents in order to gain citizenship.  He has pointed out that there are those who would betray our great city to that wretch Lucan.  To prove myself, I will have to render final judgment on all of them.",11,22101350)
+	AddQuestStepCompleteAction(Quest, 14, "QuestComplete")   
+end
+
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 14, "I have completed the Citizenship Trial and am now a citizen of Qeynos.")
+	UpdateQuestTaskGroupDescription(Quest, 14, "I am now a citizen of Qeynos!")
+
+	UpdateQuestDescription(Quest, "Thanks to the help of the inn's caretaker, I've been able to familiarize myself with the Baubbleshire.  Not only did she show me the way around, she also let me know who to speak to in order to become a citizen.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	elseif Step == 5 then
+		Step5Complete(Quest, QuestGiver, Player)
+	elseif Step == 6 then
+		Step6Complete(Quest, QuestGiver, Player)
+	elseif Step == 7 then
+		Step7Complete(Quest, QuestGiver, Player)
+	elseif Step == 8 then
+		Step8Complete(Quest, QuestGiver, Player)
+	elseif Step == 9 then
+		Step9Complete(Quest, QuestGiver, Player)
+	elseif Step == 10 then
+		Step10Complete(Quest, QuestGiver, Player)
+	elseif Step == 11 then
+		Step11Complete(Quest, QuestGiver, Player)
+	elseif Step == 12 then
+		Step12Complete(Quest, QuestGiver, Player)
+	elseif Step == 13 then
+		Step13Complete(Quest, QuestGiver, Player)
+	elseif Step == 14 then
+		QuestComplete(Quest, QuestGiver, Player)
+		end
+end

+ 165 - 0
server/Quests/Hallmark/welcome_to_qeynos_WillowWood.lua

@@ -0,0 +1,165 @@
+--[[
+    Script Name    : Quests/Hallmark/welcome_to_qeynos_WillowWood.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.28 03:10:10
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+ require "SpawnScripts/Generic/DialogModule"
+
+function Init(Quest)
+	AddQuestStepZoneLoc(Quest, 1, "Use the room door to be given your inn room.  Click on the \"Buy\" button to get your room.  Once you have purchased your room click on \"Enter\" to enter your room.", 10, "I've been instructed to sign in at the inn's guest registry in order to get the key to my room.", 11,-5.21, 0.00, 0.03,223)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+    UpdateQuestZone(Quest,"Willow Wood")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	FaceTarget(QuestGiver, Player)
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("The Willow Wood is the name of the village called home by both wood elves and half elves. Qeynos is a short walk from our village. For now, you must go to your new home. The caretaker awaits you. Farewell now.")
+    PlayFlavor(QuestGiver,"","","",0,0,Player)
+	Dialog.AddVoiceover("voiceover/english/steward_kianoa/qey_village05/steward_kianoa004.mp3", 1374315710, 4234689234) 
+	Dialog.AddOption("Then I mustn't leave her waiting, can I?  Thank you, Kianoa!")
+	Dialog.Start()
+    if HasQuest(Player,5717) and GetQuestStep(Player,5717)==2 then
+        SetStepComplete(Player,5717,2)
+    end        
+end
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've been given your inn room")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've been given the key to my room and can now come and go as I please.")
+	AddQuestStepChat(Quest, 2, "I need to introduce myself to the caretaker.", 1, "I need to introduce myself to the caretaker",11,2230785)
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")   
+end
+
+function Step2Complete(Quest, QuestGiver, Player)
+    UpdateQuestStepDescription(Quest, 2, "I've introduced myself to the caretaker of my room")
+	UpdateQuestTaskGroupDescription(Quest, 2, "I've introduced myself to the caretaker of my innroom, Ms. Fairlee.")
+
+	AddQuestStep(Quest, 3, "I need to place the table in my inn room and speak with the caretaker.", 1, 100, "I've spoken with the caretaker of the inn, Fairlee.  She gave me a table to put in my room, claiming that the Ironforge Exchange has offered it to me.  I should place this on the floor and then continue speaking with her.",11)
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")   
+end
+
+function Step3Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 3, "I've placed the table and spoken with the caretaker.")
+	AddQuestStepChat(Quest, 4, "Speak with the Banker Deephathom in The Willow Wood.", 1, "Ms. Fairlee has informed me that I have a bank account waiting for me.  I need to speak with the Banker Deephathom to open the account.",11,2370004)
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")   
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 4, "I've spoken with the Banker in the Willow Wood.")
+	UpdateQuestTaskGroupDescription(Quest, 4, "I've spoken with the Banker in the Willow Wood.")
+	AddQuestStepChat(Quest, 5, "Return to your room and speak with Caretaker Fairlee.", 1, "I should return to the caretaker in my inn room.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 5, "Step5Complete")   
+end
+
+function Step5Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 5, "I've returned to my room and spoken with caretaker Fairlee.  She gave me a painting of hers to place on my walls.")
+	AddQuestStep(Quest, 6, "Open your inventory.  \"Place\" your new painting and then speak with the caretaker.", 1,100, "Caretake Fairlee has suggested that I place the painting on my walls to liven up the place.  I should place the painting and then ask her about The Baubbleshire.",0)
+	AddQuestStepCompleteAction(Quest, 6, "Step6Complete")   
+end
+
+function Step6Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	UpdateQuestTaskGroupDescription(Quest, 6, "I've placed the painting and spoken with the caretaker.")
+	AddQuestStepZoneLoc(Quest, 7, "I need to visit the gates to the Forest Ruins.",6,"\"Some people choose to adventure in the Forest Ruins.  It's a dangerous place, so watch yourself.  Here's where you can find the gates to the ruins.  I'll show you a few other places after you take a look at the gates.\" - Ms. Fairlee", 11,883.43, -15.20, -584.80,237)
+	AddQuestStepCompleteAction(Quest, 7, "Step7Complete")   
+end
+
+function Step7Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 7, "I've found the gates to the Forest Ruins.")
+	UpdateQuestTaskGroupDescription(Quest, 7, "I've visisted one of four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 8, "I need to introduce myself to the Willow Wood crafting trainer, Oseof Crestryder.",1,"\"Not all coin gained by refugees comes from battling vermin. Crafting is a great opportunity for some refugees to become skilled in a tradeskill.  You should meet with the crafting trainer outside the Wayfarer's Stockpilers so you become familiar with where to begin a tradeskill if you so desire.\" - Ms. Fairlee", 11,2380025)
+	AddQuestStepCompleteAction(Quest, 8, "Step8Complete")   
+end
+
+function Step8Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 8, "I've met with the village crafting trainer.")
+	UpdateQuestTaskGroupDescription(Quest, 8, "I've visisted two of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 9, "I need to locate the grate to the Down Below.",6,"\"Some of the more adventurous souls help keep the city clean of vermin by venturing into the catacombs.  You can find the grate leading down to them if you take a close look.  I'll show you where you can find the entrance to the catacombs.  After that, I'll show you one more place.\" - Ms. Fairlee", 0,804.78, -20.97, -636.14,237)
+	AddQuestStepCompleteAction(Quest, 9, "Step9Complete")   
+end
+
+function Step9Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 9, "I've found the enterence to the Down Below.")
+	UpdateQuestTaskGroupDescription(Quest, 9, "I've visisted three of four locations Ms. Fairlee has told me about.")
+	AddQuestStepZoneLoc(Quest, 10, "I need to locate the gates to the Elddar Grove.",6, "\"Even though only citizens can travel into the city proper, it would be rude not to at least show where the gates to Qeynos are.  I'll lead you over to where you can find the gates into the city.  I should be done with fixing up the place by the time you get back.\" - Ms. Fairlee", 11,810.64, -21.30, -565.55,237)
+	AddQuestStepCompleteAction(Quest, 10, "Step10Complete")   
+end
+
+function Step10Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 10, "I've visited the inner city gates but was not allowed access.")
+	UpdateQuestTaskGroupDescription(Quest, 10, "I've visisted all four locations Ms. Fairlee has told me about.")
+	AddQuestStepChat(Quest, 11, "I need to return to my room and ask Ms. Fairlee why I can't enter the city.", 1, 100, "I should return back to my room and ask Ms. Fairlee why the guard didn't allow me to enter into the city.  Hopefully she might know why.",11,2230785)
+	AddQuestStepCompleteAction(Quest, 11, "Step11Complete")   
+end
+
+function Step11Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	UpdateQuestTaskGroupDescription(Quest, 11, "I've spoken with Ms. Fairlee and have been given another piece of furniture, this time a chandelier.")
+	AddQuestStep(Quest, 12, "Open your inventory.  \"Place\" your new chandelier and then speak with the caretaker.", 1, 100,"As if two pieces of furniture weren't enough, I now have a chandelier some neighbors brought by.  I should place this on my ceiling for better lighting and then ask Ms. Fairlee why the guard said only \"citizens\" were allowed into the city.",11)
+	AddQuestStepCompleteAction(Quest, 12, "Step12Complete")   
+end
+
+function Step12Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	UpdateQuestTaskGroupDescription(Quest, 12, "I've placed the chandelier on the ceiling and spoke with Ms. Fairlee.")
+	AddQuestStep(Quest, 13, "Take an application from the citizenship sign, complete the task, then speak with Marshal Glorfel by using the citizenship sign again.", 1, 100,"\"If you want to deal with all the hub-bub of city life, then you'll want to go to the citizenship sign at the city gates.  Pull an application from the wall and fulfill the application task, afterwards return to the sign and use it to speak with Marshal Glorfel about becoming a citizen.  If you ask me, I don't know what's wrong with settling down here.  It's a nice sleepy village, not troubled with excitement and danger and all that.  But then again, you kids like that kind of thing.  Well, good luck to you!\" - Ms. Fairlee",11)
+	AddQuestStepCompleteAction(Quest, 13, "Step13Complete")   
+end
+
+function Step13Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	UpdateQuestTaskGroupDescription(Quest, 13, "I've spoken with Marshal Glorfel and have been told how to become a citizen.")
+	AddQuestStepChat(Quest, 14, "Judge the traitors individually and prove your loyalty to Qeynos.", 1, 100,"Marshal Glorfel has tasked me with rendering judgment upon some treasonous residents in order to gain citizenship.  He has pointed out that there are those who would betray our great city to that wretch Lucan.  To prove myself, I will have to render final judgment on all of them.",11,22101350)
+	AddQuestStepCompleteAction(Quest, 14, "QuestComplete")   
+end
+
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 14, "I have completed the Citizenship Trial and am now a citizen of Qeynos.")
+	UpdateQuestTaskGroupDescription(Quest, 14, "I am now a citizen of Qeynos!")
+
+	UpdateQuestDescription(Quest, "Thanks to the help of the inn's caretaker, I've been able to familiarize myself with the Baubbleshire.  Not only did she show me the way around, she also let me know who to speak to in order to become a citizen.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		Step1Complete(Quest, QuestGiver, Player)
+	elseif Step == 2 then
+		Step2Complete(Quest, QuestGiver, Player)
+	elseif Step == 3 then
+		Step3Complete(Quest, QuestGiver, Player)
+	elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	elseif Step == 5 then
+		Step5Complete(Quest, QuestGiver, Player)
+	elseif Step == 6 then
+		Step6Complete(Quest, QuestGiver, Player)
+	elseif Step == 7 then
+		Step7Complete(Quest, QuestGiver, Player)
+	elseif Step == 8 then
+		Step8Complete(Quest, QuestGiver, Player)
+	elseif Step == 9 then
+		Step9Complete(Quest, QuestGiver, Player)
+	elseif Step == 10 then
+		Step10Complete(Quest, QuestGiver, Player)
+	elseif Step == 11 then
+		Step11Complete(Quest, QuestGiver, Player)
+	elseif Step == 12 then
+		Step12Complete(Quest, QuestGiver, Player)
+	elseif Step == 13 then
+		Step13Complete(Quest, QuestGiver, Player)
+	elseif Step == 14 then
+		QuestComplete(Quest, QuestGiver, Player)
+		end
+end

+ 43 - 0
server/Quests/Hallmark/welcome_to_qeynos_citizen.lua

@@ -0,0 +1,43 @@
+--[[
+    Script Name    : Quests/Hallmark/welcome_to_qeynos_citizen.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.31 12:10:43
+    Script Purpose : 
+
+        Zone       : Hallmark
+        Quest Giver: 
+        Preceded by: None
+        Followed by: 
+--]]
+
+function Init(Quest)
+	AddQuestStepChat(Quest, 1, "Mervos Stadrin in North Qeynos will tell me about collecting objects in Norrath.", 1, "I should read through my Qeynos' citizenship booklet.", 11, 2220015)
+	AddQuestStepCompleteAction(Quest, 1, "QuestComplete")
+end
+
+function Accepted(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is accepted
+end
+
+function Declined(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is declined
+end
+
+function Deleted(Quest, QuestGiver, Player)
+	-- Remove any quest specific items here when the quest is deleted
+end
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 1, "I've learned about collections from Mervos Stadrin.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I should read the Conclusion of the booklet.")
+
+	UpdateQuestDescription(Quest, "While I might have learned these things on my own, it's thoughtful of the Queen to provide this information to the citizens of Qeynos.  Long live Antonia Bayle!")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+		QuestComplete(Quest, QuestGiver, Player)
+	end
+end

+ 1 - 1
server/Quests/Hallmark/willow_wood_citizenship_task.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Forest Ruins.", 5, 22, "The local ruins have been seeded with tokens for the citizens of the Willow Wood to gather. These tokens may be found on any creatures in the Forest Ruins.", 1322,  1960009,1960011	,1960012,1960013,1960014,1960017,1960018, 1960019,1960020,1960021,1960022,1960023,1960024,1960025,1960026,1960027,1960028,1960029,1960030,1960031,1960032,1960033,1960034,1960035,1960036,1960037,1960038,1960039,1960040,1960041,1960042,1960043,1960044,1960045,1960046,1960049,1960050,1960051,1960052,1960054,1960055,1960058,1960060,1960061,1960065,1960067,1960068,1960069,1960070,1960071,1960072,1960074,1960075,1960076,1960077,1960088,1960090,1960094,1960098,1960101,1960109,1960117,1960122,1960185,1960186,1960187)
+	AddQuestStepKill(Quest, 1, "Gather five tokens from the creatures in the Forest Ruins.", 5, 30, "The local ruins have been seeded with tokens for the citizens of the Willow Wood to gather. These tokens may be found on any creatures in the Forest Ruins.", 1322,  8270002	,8270003 ,8270005,8270006,8270007,8270008,8270009,8270010,8270011,8270012,8270013,8270014,8270015,8270016,8270017,8270018,8270019,8270020,8270021,8270024,8270025,8270026,8270027,8270028,8270031,8270034,8270045,8270056,8270058,8270059,8270060,8270061,8270062,8270063,8270064,8270065,8270075,8270076)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Forest Ruins")
 end

+ 1 - 0
server/Quests/IsleofRefuge/hunting_the_orcish_leader.lua

@@ -9,6 +9,7 @@
         Preceded by: Striking Back at the Goblins
         Followed by: None
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)

+ 32 - 2
server/Quests/MultipleZones/qeynos_alignment.lua

@@ -29,6 +29,32 @@ function Accepted(Quest, QuestGiver, Player)
 	if not HasItem(Player,1414)then
     GiveQuestItem(Quest,Player,"Congratulations! This coin is given to all refugees seeking to start a life in Qeynos.",1414)
     end
+
+
+Qeynos = GetFactionAmount(Player, 11)
+Freeport = GetFactionAmount(Player, 12)
+Neriak = GetFactionAmount(Player, 13)
+Kelethin = GetFactionAmount(Player, 14)
+Halas = GetFactionAmount(Player, 16)
+Gorowyn = GetFactionAmount(Player, 17)
+alignment = GetAlignment(Player)
+
+if GetRace(Player) == 0 or GetRace(Player) == 3 or GetRace(Player) == 5 or GetRace(Player) == 6 or GetRace(Player) == 9 or GetRace(Player) == 11 or GetRace(Player) == 20 then
+SetAlignment(Player, 1)
+end
+
+if Qeynos ==0 then ChangeFaction(Player, 11, 20000)
+end
+if Freeport ==0 then ChangeFaction(Player, 12, -40000)
+end
+--[[if Neriak ==0 then ChangeFaction(Player, 13, Neriak)
+end
+if Kelethin ==0 then ChangeFaction(Player, 14, Kelethin)
+end
+if Halas ==0 then ChangeFaction(Player, 16, Halas)
+end
+if Gorowyn ==0 then ChangeFaction(Player, 17, -Gorowyn)
+end--]]
 end
 
 function Declined(Quest, QuestGiver, Player)
@@ -46,8 +72,12 @@ function Step1Complete(Quest, QuestGiver, Player)
    Race = GetRace(Player)
     
     -- Human / Kerra
-    if Race == 9 or Race == 11 then
-	AddQuestStepChat(Quest, 2, "I must find the Steward", 1, "I have been instructed to seek out the Steward when I arrive in Qeynos.  I should ring the bell on the docks to book passage to the city.", 11, 2330168)
+    if Race == 9 then
+	AddQuestStepChat(Quest, 2, "I must find the Steward", 1, "I have been instructed to seek out the Steward when I arrive in Qeynos.  I should ring the bell on the docks to book passage to the city.", 11, 2330170,2340166)
+    UpdateQuestZone(Quest, "Multiple Zones")
+    
+    elseif Race == 11 then
+	AddQuestStepChat(Quest, 2, "I must find the Steward", 1, "I have been instructed to seek out the Steward when I arrive in Qeynos.  I should ring the bell on the docks to book passage to the city.", 11, 2330170)
     UpdateQuestZone(Quest, "Nettleville")
 
     -- Erudite

+ 1 - 1
server/Quests/Nettleville/refill_the_oakmyst_spider_silk_jars.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must slay some Oakmyst spiders in Oakmyst Forest", 8, 100, "I must slay Oakmyst spiders and collect their silk in the local Oakmyst Forest, reachable by any mariner bell within the City of Qeynos.", 354,1950014)
+	AddQuestStepKill(Quest, 1, "I must slay some Oakmyst spiders in Oakmyst Forest", 8, 100, "I must slay Oakmyst spiders and collect their silk in the local Oakmyst Forest, reachable by any mariner bell within the City of Qeynos.", 354,1950014,8300018)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 end
 

+ 1 - 1
server/Quests/Nettleville/restocking_bog_faerie_wings.lua

@@ -12,7 +12,7 @@
 require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to collect eight bog faerie wings.", 8, 100, "I need to collect eight Bog Faerie Wings from the Peat Bog for Scribe Varion Smitelin.", 110, 1980007, 1980008, 1980010, 1980052, 1980026, 1980056, 1980061)
+	AddQuestStepKill(Quest, 1, "I need to collect eight bog faerie wings.", 8, 100, "I need to collect eight Bog Faerie Wings from the Peat Bog for Scribe Varion Smitelin.", 110, 8290002,8290003,8290052,8290008,8290009,8290010,8290013,8290014,8290011,8290012,8290017,8290018,8290019,8290053,8290044)
 	AddQuestStepCompleteAction(Quest, 1, "Step1_Complete_GotWings")
 end
 

+ 1 - 1
server/Quests/Nettleville/scalies_for_shinies.lua

@@ -46,7 +46,7 @@ function Step1Complete(Quest, QuestGiver, Player)
 	AddQuestStepCompleteAction(Quest, 2, "QuestComplete")
 end
 
-function QuestComplete(Quest)
+function QuestComplete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 2, "I have returned to Dirk Vargin.")
 	UpdateQuestTaskGroupDescription(Quest, 2, "I delivered ten Albino Snake Skins for Dirk Vagrin.")
    

+ 1 - 1
server/Quests/Nettleville/toxic_glands_for_erollisis_bane.lua

@@ -11,7 +11,7 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must kill some toxic bog slugs.", 6, 100, "I must slay six toxic bog slugs for their poison glands.", 2515, 1980006) 
+	AddQuestStepKill(Quest, 1, "I must kill some toxic bog slugs.", 6, 100, "I must slay six toxic bog slugs for their poison glands.", 2515, 1980006,8290031) 
 	AddQuestStepCompleteAction(Quest, 1, "Step1_Complete_KilledSlugs")
 end
 

+ 1 - 1
server/Quests/NorthQeynos/bear_fashion.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need four fine pelts from Oakmyst great bears.", 4, 75, "I need to get four fine pelts from Oakmyst great bears.", 124, 1950023)
+	AddQuestStepKill(Quest, 1, "I need four fine pelts from Oakmyst great bears.", 4, 75, "I need to get four fine pelts from Oakmyst great bears.", 124, 8300016,8300023)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Compelte")
     UpdateQuestZone(Quest,"Oakmyst Forest")
 end

+ 1 - 1
server/Quests/OakmystForest/cleaning_supplies_for_findlebop.lua

@@ -12,7 +12,7 @@
 require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to find a pristine Mystail rat tail.", 1, 65, "I need to hunt down Mystail matriarch in the Oakmyst forest until I can find a suitable tail.", 172, 1950017)
+	AddQuestStepKill(Quest, 1, "I need to find a pristine Mystail rat tail.", 1, 35, "I need to hunt down Mystail matriarch in the Oakmyst forest until I can find a suitable tail.", 172, 8300036)
 	AddQuestStepCompleteAction(Quest, 1, "step1_complete_Matriarchs")
 		UpdateQuestZone(Quest, "Oakmyst Forest")
 end

+ 9 - 8
server/Quests/OakmystForest/destroy_the_corruption.lua

@@ -9,21 +9,22 @@
 	Preceded by: Judgement of the Dryads (judgement_of_the_dryads.lua)
 	Followed by: None
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Find and defeat Rotweed.", 1, 100, "I must slay Rotweed. This being can be found in the Teardrop Cave in Oakmyst Forest.", 611, 1950029)
+	AddQuestStepKill(Quest, 1, "Find and defeat Rotweed.", 1, 100, "I must slay Rotweed. This being can be found in the Teardrop Cave in Oakmyst Forest.", 611, 1950029,8300027)
 	AddQuestStepCompleteAction(Quest, 1, "Step1_Complete_KilledRotweed")
 end
 
 function Accepted(Quest, QuestGiver, Player)
 	FaceTarget(QuestGiver, Player)
-	conversation = CreateConversation()
-	
-	PlayFlavor(QuestGiver, "voiceover/english/empress_anassa/qey_adv01_oakmyst/empressanassa002.mp3", "", "", 3988531876, 1061259431, Player)
-	AddConversationOption(conversation, "What is Rotweed?", "WhatIsRotweed")
-	AddConversationOption(conversation, "I will battle this Rotweed and return victorious.")
-	StartConversation(conversation, QuestGiver, Player, "The evil calls itself Rotweed and lurks in the darkness of Teardrop Cave. It buries itself in the cave walls and exudes corruption upon this woodland. ")
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("The evil calls itself Rotweed and lurks in the darkness of Teardrop Cave. It buries itself in the cave walls and exudes corruption upon this woodland. ")
+	Dialog.AddVoiceover("voiceover/english/empress_anassa/qey_adv01_oakmyst/empressanassa002.mp3", 3988531876, 1061259431)
+	Dialog.AddOption("What is Rotweed?", "WhatIsRotweed")
+	Dialog.AddOption("I will battle this Rotweed and return victorious. ")
+	Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)
@@ -33,7 +34,7 @@ function Step1_Complete_KilledRotweed(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I have found and defeated Rotweed .")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I have slain the many creatures that made up Rotweed the plant fiend.")
 
-	AddQuestStepChat(Quest, 2, "Speak to Empress Anassa.", 1, "I must return to speak to Empress Anassa in Oakmyst Forest.", 0, 1950050) 
+	AddQuestStepChat(Quest, 2, "Speak to Empress Anassa.", 1, "I must return to speak to Empress Anassa in Oakmyst Forest.", 0, 1950050,8300021) 
 	AddQuestStepCompleteAction(Quest, 2, "QuestComplete")
 end
 

+ 3 - 3
server/Quests/OakmystForest/druids_legacy.lua

@@ -12,7 +12,7 @@
 
 
 function Init(Quest)
-	AddQuestStepLocation(Quest, 1, "I need to find the tree on the island in the stream.", 3, "I must find the tree that the druid spoke of in his note.  It should be on an island in the stream.", 185, 924, 2.22, -273)
+	AddQuestStepZoneLoc(Quest, 1, "I need to find the tree on the island in the stream.", 3, "I must find the tree that the druid spoke of in his note.  It should be on an island in the stream.", 185, 924, 2.22, -273,830)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 end
 
@@ -34,7 +34,7 @@ end
 function Step1Complete(Quest)
 	UpdateQuestStepDescription(Quest, 1, "I've found the tree on the island in the stream.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I found the tree the druid spoke of and it looks like he had a map hidden there.")
-	AddQuestStepLocation(Quest, 2, "I need to find the tree overlooking the waterfall.", 3, "I must find the tree overlooking the waterfall where the druid buried the token he left behind.", 199, 914, 15, -199)
+	AddQuestStepZoneLoc(Quest, 2, "I need to find the tree overlooking the waterfall.", 3, "I must find the tree overlooking the waterfall where the druid buried the token he left behind.", 199, 914, 15, -199,830)
 	AddQuestStepCompleteAction(Quest, 2, "QuestComplete")
 end
 function QuestComplete(Quest, QuestGiver, Player)
@@ -42,7 +42,7 @@ function QuestComplete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 2, "	I've found the tree overlooking the waterfall.")
 	UpdateQuestTaskGroupDescription(Quest, 2, "I found the token buried among the roots of a tree overlooking the waterfall.")
 
-	UpdateQuestDescription(Quest, "After following a couple of clues, I was able to find the tree that the druid, Phyndin Silverystream, marked on the map he left in the tree.  It seems the token he left behind was an earring he used to wear. <br> <br>")
+	UpdateQuestDescription(Quest, "After following a couple of clues, I was able to find the tree that the druid, Phyndin Silverystream, marked on the map he left in the tree.  It seems the token he left behind was an earring he used to wear.")
 	GiveQuestReward(Quest, Player)
 end
 

+ 3 - 3
server/Quests/OakmystForest/far_seas_requisition_okf050.lua

@@ -13,9 +13,9 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must gather some mystail yearling tails.", 4, 80, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 172, 1950009)
-	AddQuestStepKill(Quest, 2, "I must gather tongues from clearwater frogs.", 3, 80, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 1104, 1950020)
-	AddQuestStepKill(Quest, 3, "I must get the hide from one Oakmyst great bear.", 1, 70, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 127, 1950023)
+	AddQuestStepKill(Quest, 1, "I must gather some mystail yearling tails.", 4, 80, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 172, 1950009,8300035)
+	AddQuestStepKill(Quest, 2, "I must gather tongues from clearwater frogs.", 3, 80, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 1104, 1950020.8300003)
+	AddQuestStepKill(Quest, 3, "I must get the hide from one Oakmyst great bear.", 1, 70, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 127, 1950023,8300016)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
 	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")

+ 1 - 1
server/Quests/OakmystForest/far_seas_requisition_okf063.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must collect five Oakmyst deer pelts.", 5, 80, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 138, 1950001, 1950007)
+	AddQuestStepKill(Quest, 1, "I must collect five Oakmyst deer pelts.", 5, 80, "To fill the requisition, I must hunt down the creatures in Oakmyst Forest, reachable by any number of mariner bells in the City of Qeynos.", 138, 1950001, 1950007, 8300015,8300013)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 end
 

+ 10 - 9
server/Quests/OakmystForest/feed_the_sapling.lua

@@ -10,20 +10,21 @@
 	Followed by: Judgement of the Dryads (judgement_of_the_dryads.lua)
 --]]
 
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
-	AddQuestStep(Quest, 1, "Search the alchemy shelves.", 1, 100, "I must search for the alchemist shop in Nettleville to attain the magical plant nutrient.", 182)
+	AddQuestStep(Quest, 1, "Search the alchemy shelves.", 1, 100, "I must search alchemist shops in Qeynos to attain the magical plant nutrient.", 182)
 	AddQuestStepCompleteAction(Quest, 1, "Step1_Complete_FoundNutrients")
-	UpdateQuestZone(Quest, "Nettleville")
+	UpdateQuestZone(Quest, "Multiple Zones")
 end
 
 function Accepted(Quest, QuestGiver, Player)
 	FaceTarget(QuestGiver, Player)
-	conversation = CreateConversation()
-	
-	PlayFlavor(QuestGiver, "voiceover/english/scholar_neola/qey_adv01_oakmyst/scholarneola002.mp3", "", "", 4033827219, 3906200141, Player)
-	AddConversationOption(conversation, "I will go and find this arcane nutrient.")
-	StartConversation(conversation, QuestGiver, Player, "I cannot leave this woodland, but you can. Within the villages of Qeynos an alchemist has created a powerful nutrient that will aid the sapling. Retrieve this prized item and feed it to the growing tree. ")
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("I cannot leave this woodland, but you can. Within the villages of Qeynos an alchemist has created a powerful nutrient that will aid the sapling. Retrieve this prized item and feed it to the growing tree. ")
+	Dialog.AddVoiceover("voiceover/english/scholar_neola/qey_adv01_oakmyst/scholarneola002.mp3", 4033827219, 3906200141)
+	Dialog.AddOption("I will go and find this arcane nutrient.")
+	Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)
@@ -34,7 +35,7 @@ function Step1_Complete_FoundNutrients(Quest, QuestGiver, Player)
 	UpdateQuestTaskGroupDescription(Quest, 1, "I found Smitelin's Excel-o-gro in Nettleville.")
 	UpdateQuestZone(Quest, "Oakmyst Forest")
 
-	AddQuestStepChat(Quest, 2, "Find the treant sapling.", 1, "I must sprinkle Smitelin's Excel-o-gro into the treant sapling of Oakmyst Forest.", 0, 1950052) 
+	AddQuestStepChat(Quest, 2, "Find the treant sapling.", 1, "I must sprinkle Smitelin's Excel-o-gro into the treant sapling of Oakmyst Forest.", 0, 1950052,8300007) 
 	AddQuestStepCompleteAction(Quest, 2, "Step2_Complete_SpokeToSapling")
 end
 
@@ -42,7 +43,7 @@ function Step2_Complete_SpokeToSapling(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 2, "I poured the nutrient on the treant sapling.")
 	UpdateQuestTaskGroupDescription(Quest, 2, "I sprinkled the magical nutrient, Smitelin's Excel-o-gro onto the treant sapling.")
 
-	AddQuestStepChat(Quest, 3, "Speak to Scholar Neola.", 1, "I should inform Scholar Neola that I saved the treant sapling.", 0, 1950051) 
+	AddQuestStepChat(Quest, 3, "Speak to Scholar Neola.", 1, "I should inform Scholar Neola that I saved the treant sapling.", 0, 1950051,8300030) 
 	AddQuestStepCompleteAction(Quest, 3, "QuestComplete")
 end
 

+ 8 - 7
server/Quests/OakmystForest/judgement_of_the_dryads.lua

@@ -9,20 +9,21 @@
 	Preceded by: Feed the Sapling (feed_the_sapling.lua)
 	Followed by: Destroy the Corruption (destroy_the_corruption.lua)
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Slay five Sunshimmer Sprites.", 5, 100, "I must hunt down and slay five Sunshimmer Sprites in Oakmyst Forest.", 611, 1950034, 1950036, 1950054, 1950031)
+	AddQuestStepKill(Quest, 1, "Slay five Sunshimmer Sprites.", 5, 100, "I must hunt down and slay five Sunshimmer Sprites in Oakmyst Forest.", 611, 1950034, 1950036, 1950054, 1950031,8300052,8300053,8300006,8300012)
 	AddQuestStepCompleteAction(Quest, 1, "Step1_Complete_KillSprites")
 end
 
 function Accepted(Quest, QuestGiver, Player)
 	FaceTarget(QuestGiver, Player)
-	conversation = CreateConversation()
-	
-	PlayFlavor(QuestGiver, "voiceover/english/judge_eunomia/qey_adv01_oakmyst/judgeeunomia002.mp3", "", "", 2678200574, 3115032598, Player)
-	AddConversationOption(conversation, "I shall do my best to lower their numbers.")
-	StartConversation(conversation, QuestGiver, Player, "They're corrupted fayfolke--bright with beauty but twisted and corrupted to the core. They're called the sunshimmer sprites.  You must destroy them.")
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("They're corrupted fayfolke--bright with beauty but twisted and corrupted to the core. They're called the sunshimmer sprites.  You must destroy them.")
+	Dialog.AddVoiceover("voiceover/english/judge_eunomia/qey_adv01_oakmyst/judgeeunomia002.mp3", 2678200574, 3115032598)
+	Dialog.AddOption("I shall do my best to lower their numbers.")
+	Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)
@@ -32,7 +33,7 @@ function Step1_Complete_KillSprites(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I have slain five Sunshimmer Sprites.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I have slain five Sunshimmer Sprites in Oakmyst Forest.")
 
-	AddQuestStepChat(Quest, 2, "Speak to Judge Eunomia.", 1, "I must speak to Judge Eunomia in Oakmyst Forest.", 0, 1950049) 
+	AddQuestStepChat(Quest, 2, "Speak to Judge Eunomia.", 1, "I must speak to Judge Eunomia in Oakmyst Forest.", 0, 1950049,8300009) 
 	AddQuestStepCompleteAction(Quest, 2, "QuestComplete")
 end
 

+ 13 - 11
server/Quests/OakmystForest/proof_of_poachers.lua

@@ -9,30 +9,32 @@
 	Preceded by: None
 	Followed by: None
 --]]
+require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Slay two shady furriers", 2, 100, "Slay two shady furriers. They can be found at night lurking the Oakmyst Forest.", 2468, 1950006)
+	AddQuestStepKill(Quest, 1, "Slay two oakmyst poachers", 2, 100, "Slay oakmyst poachers. They can be found at night lurking the Oakmyst Forest.", 2468, 1950006,8300064)
 	AddQuestStepCompleteAction(Quest, 1, "Step1_Complete_KilledPoachers")
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	FaceTarget(QuestGiver, Player)
-	conversation = CreateConversation()
-	
-	PlayFlavor(QuestGiver, "voiceover/english/optional1/steward_tredo/qey_adv01_oakmyst/stewardtredo001.mp3", "", "", 3490306942, 2253910242, Player)
-	AddConversationOption(conversation, "I'll keep my eyes out at night.")
-	StartConversation(conversation, QuestGiver, Player, "A new defender of Oakmyst? Grand! Tracker Galera seeks proof of the poachers' existence. They say they lurk the shadows at night. Bring her proof, and I'm sure she'll be grateful.")
+	FaceTarget(NPC, Spawn)
+	Dialog.New(NPC, Spawn)
+	Dialog.AddDialog("A new defender of Oakmyst? Grand! Tracker Galera seeks proof of the poachers' existence. They say they lurk the shadows at night. Bring her proof, and I'm sure she'll be grateful.")
+    PlayFlavor(NPC,"","","smile",0,0,Spawn)
+	Dialog.AddVoiceover("voiceover/english/optional1/steward_tredo/qey_adv01_oakmyst/stewardtredo001.mp3", 3490306942, 2253910242)
+	Dialog.AddOption("I'll keep my eyes out at night.")
+	Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)
 end
 
 function Step1_Complete_KilledPoachers(Quest, QuestGiver, Player)
-	UpdateQuestStepDescription(Quest, 1, "I have collected a frog poison gland.")
-	UpdateQuestTaskGroupDescription(Quest, 1, "I slew two shady furriers and retrieved poached pelts as proof of their invasion of the woods.")
+	UpdateQuestStepDescription(Quest, 1, "I have collected a poached deer pelt.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I slew two oakmyst poachers and retrieved poached pelts as proof of their invasion of the woods.")
 
-	AddQuestStepChat(Quest, 2, "Speak to Tracker Galera.", 1, "Speak to Tracker Galera, a wood elf that walks the trails of Oakmyst Forest.", 0, 1950011) 
+	AddQuestStepChat(Quest, 2, "Speak to Tracker Galera.", 1, "Speak to Tracker Galera, a wood elf that walks the trails of Oakmyst Forest.", 0, 1950011,8300032) 
 	AddQuestStepCompleteAction(Quest, 2, "QuestComplete")
 end
 
@@ -40,7 +42,7 @@ function QuestComplete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 2, "I have spoken to Tracker Galera.")
 	UpdateQuestTaskGroupDescription(Quest, 2, "I spoke with Tracker Galera and gave her poached pelts as proof of the poaching activity going on in the forest.")
 	
-	UpdateQuestDescription(Quest, "I hunted down the shady furriers and retrieved poached pelts of the Oakmyst creatures. I gave the pelts to Tracker Galera as proof of the poacher's activity within the woods.")
+	UpdateQuestDescription(Quest, "I hunted down the oakmyst poachers and retrieved poached pelts of the Oakmyst creatures. I gave the pelts to Tracker Galera as proof of the poacher's activity within the woods.")
 	GiveQuestReward(Quest, Player)
 end
 

+ 1 - 1
server/Quests/OakmystForest/runed_acorn.lua

@@ -13,7 +13,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to kill three corrupted dryads.", 3, 100, "Corrupted dryads often hide in dark, dank places such as water-filled caverns.", 611, 1950013, 1950070)
+	AddQuestStepKill(Quest, 1, "I need to kill three corrupted dryads.", 3, 100, "Corrupted dryads often hide in dark, dank places such as water-filled caverns.", 611, 1950013, 1950070,8300004)
 	AddQuestStepCompleteAction(Quest, 1, "QuestComplete")
 end
 

+ 2 - 2
server/Quests/PeatBog/FarSeasDirectRequisitionPBG0162.lua

@@ -14,8 +14,8 @@
 local MARINER_STITCHED_BRACERS_ID = 164053
 local MARINER_STITCHED_SHAWL_ID = 164058
 local MARINER_STITCHED_SLIPPERS_ID = 164059
-local BOG_SLUG_ID = 1980018
-local TANAIRA_ID = 1980029
+local BOG_SLUG_ID = 8290005
+local TANAIRA_ID = 2340040
 
 function Init(Quest)
 	local chance = math.random(1, 3)

+ 3 - 3
server/Quests/PeatBog/FarSeasDirectRequisitionPBG0295.lua

@@ -12,9 +12,9 @@
 --]]
 
 local FAR_SEAS_DR_PBG0295_QUEST_ID = 516
-local TANAIRA_ID = 1980029
-local MUCK_TOAD_ID = 1980015
-local SILT_SUCKER_ID = 1980036
+local TANAIRA_ID = 2340040
+local MUCK_TOAD_ID = 8290024
+local SILT_SUCKER_ID = 8290029
 local MARINER_STITCHED_BRACERS_ID = 164053
 local MARINER_STITCHED_SHAWL_ID = 164058
 local MARINER_STITCHED_SLIPPERS_ID = 164059

+ 2 - 2
server/Quests/QeynosHarbor/taking_the_bait.lua

@@ -13,8 +13,8 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must gather five bog faerie wings for Sean.", 5, 80, "I need to head over to the Peat Bog and get five pieces of bog slug meat and five bog faerie wings.", 110, 1980010,1980007,1980052,1980008)
-	AddQuestStepKill(Quest, 2, "I must gather five bog slug meat for Sean.", 5, 80, "I need to head over to the Peat Bog and get five pieces of bog slug meat and five bog faerie wings.", 133, 1980018,1980021,1980006)
+	AddQuestStepKill(Quest, 1, "I must gather five bog faerie wings for Sean.", 5, 80, "I need to head over to the Peat Bog and get five pieces of bog slug meat and five bog faerie wings.", 110, 8290002,8290003,8290052,8290008,8290009,8290010,8290013,8290014,8290011,8290012,8290017,8290018,8290019,8290053,8290044)
+	AddQuestStepKill(Quest, 2, "I must gather five bog slug meat for Sean.", 5, 80, "I need to head over to the Peat Bog and get five pieces of bog slug meat and five bog faerie wings.", 133, 8290005,8290006,8290031,8290027)
     UpdateQuestZone(Quest, "The Peat Bog")
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")

+ 1 - 1
server/Quests/SouthQeynos/corrupted_dryad_nuisance.lua

@@ -11,7 +11,7 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must slay three corrupted dryads.", 3, 100, "I must go into the Oakmyst Forest and slay three of the corrupted dryads that plague the area.", 611, 1950013,1950131,1950070,1950131)
+	AddQuestStepKill(Quest, 1, "I must slay three corrupted dryads.", 3, 100, "I must go into the Oakmyst Forest and slay three of the corrupted dryads that plague the area.", 611, 8300004)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Oakmyst Forest")
 end

+ 3 - 3
server/Quests/SouthQeynos/gathering_components.lua

@@ -11,9 +11,9 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Hunt bog faeries in the Peat Bog.", 1, 60, "I must gather up the rare components Khalil'Mun needs for his potion. I will find them in the Peat Bog.", 110, 1980052,1980010,1980007,1980008,1980002)
-	AddQuestStepKill(Quest, 2, "Hunt bog slugs in the Peat Bog.", 1, 60, "I must gather up the rare components Khalil'Mun needs for his potion. I will find them in the Peat Bog.", 83, 1980018,1980006)
-	AddQuestStepKill(Quest, 3, "Hunt bog sludges in the Peat Bog.", 1, 60, "I must gather up the rare components Khalil'Mun needs for his potion. I will find them in the Peat Bog.", 178, 1980002)
+	AddQuestStepKill(Quest, 1, "Hunt bog faeries in the Peat Bog.", 1, 33, "I must gather up the rare components Khalil'Mun needs for his potion. I will find them in the Peat Bog.", 110, 8290002,8290003,8290052,8290008,8290009,8290010,8290013,8290014,8290011,8290012,8290017,8290018,8290019,8290053,8290044)
+	AddQuestStepKill(Quest, 2, "Hunt bog slugs in the Peat Bog.", 1, 25, "I must gather up the rare components Khalil'Mun needs for his potion. I will find them in the Peat Bog.", 83, 8290005,8290006,8290031,8290027)
+	AddQuestStepKill(Quest, 3, "Hunt bog sludges in the Peat Bog.", 1, 33, "I must gather up the rare components Khalil'Mun needs for his potion. I will find them in the Peat Bog.", 178, 8290004)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
 	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")

+ 6 - 5
server/Quests/SouthQeynos/oakmyst_minerals.lua

@@ -10,16 +10,17 @@
         Followed by: 
 --]]
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to hunt Oakmyst royal defenders in Oakmyst Forest.", 3, 60, "I need to go to the Oakmyst Forest and slay some Oakmyst royal defenders to try to find some type of mineral.", 187, 1950047)
+	AddQuestStepKill(Quest, 1, "I need to hunt Oakmyst royal defenders in Oakmyst Forest.", 3, 75, "I need to go to the Oakmyst Forest and slay some Oakmyst royal defenders to try to find some type of mineral.", 187, 8300017)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Oakmyst Forest")
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	FaceTarget(QuestGiver, Player)
-	conversation = CreateConversation()
-	AddConversationOption(conversation, "All right.")
-	StartConversation(conversation, QuestGiver, Player, "Good! Bring them back here as soon as you have them.")
+	FaceTarget(QuestGiver, Spawn)
+    PlayFlavor(QuestGiver, "voiceover/english/blacksmith_hegrenn/qey_south/blacksmithhegrenn002.mp3", "", "ponder", 986701836, 3811375684, Player)
+    local conversation = CreateConversation()
+	AddConversationOption(conversation, "Several pieces got it.")
+	StartConversation(conversation, QuestGiver, Player, "Ahh, work.  You don't say.  I heard a bit of gossip over at the tavern.  There's a rare stone mineral.  The Oakmyst royal defenders out in the forest have it, and I need several pieces.  Will you commit to this daring task, adventurer?  Remember, I need several pieces!")
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 1 - 1
server/Quests/SouthQeynos/stop_the_mischievous_tricksters.lua

@@ -12,7 +12,7 @@
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must slay some bog faeries in the Peat Bog.", 10, 100, "I haven't quite driven the malicious faeries of the Peat Bog back yet.", 611, 1980052,1980010,1980007,1980008,1980002)
+	AddQuestStepKill(Quest, 1, "I must slay some bog faeries in the Peat Bog.", 10, 100, "I haven't quite driven the malicious faeries of the Peat Bog back yet.", 611, 8290002,8290003,8290052,8290008,8290009,8290010,8290013,8290014,8290011,8290012,8290017,8290018,8290019,8290053,8290044)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"The Peat Bog")
 end

+ 1 - 1
server/Quests/StarcrestCommune/BogSludgeHunt.lua

@@ -16,7 +16,7 @@ require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must kill several bog sludges", 10, 100, "I need to kill Bog Sludges in the Peat Bog.", 346, 1980002)
+	AddQuestStepKill(Quest, 1, "I must kill several bog sludges", 10, 100, "I need to kill Bog Sludges in the Peat Bog.", 346, 1980002,8290004)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Peat Bog")
 end

+ 1 - 1
server/Quests/StarcrestCommune/EruditeDebate.lua

@@ -23,7 +23,7 @@ function Accepted(Quest, QuestGiver, Player)
 	Dialog.AddDialog("Then bring this message to Oomitelmora.  He should be humiliating Vandis in a game of King's Field on the eastern side of the village.  Scurry off now.  I must get back to my thoughts.")
     PlayFlavor(QuestGiver, "", "", "nod", 0, 0, Player)
 	Dialog.AddVoiceover("voiceover/english/philosopher_orrinalanya/qey_village02/philosopherorrinalanya001.mp3", 3961956565, 3669950879)
-	Dialog.AddOption("I'll see he gets your message.")
+	Dialog.AddOption("How can I refuse such a pleasant lady?")
 	Dialog.Start()
 end
 

+ 1 - 1
server/Quests/StarcrestCommune/GatheringGlowmyst.lua

@@ -14,7 +14,7 @@
 require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must gather glowmyst from the beetles in Oakmyst Forest", 10, 100, "I need to gather up glowmyst juice from Oakmyst Forest, reachable by any number of mariner bells within Qeynos, by hunting down glowmyst beetles.", 1204, 1950002)
+	AddQuestStepKill(Quest, 1, "I must gather glowmyst from the beetles in Oakmyst Forest", 10, 100, "I need to gather up glowmyst juice from Oakmyst Forest, reachable by any number of mariner bells within Qeynos, by hunting down glowmyst beetles.", 1204, 8300034)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
     UpdateQuestZone(Quest,"Oakmyst Forest")
 end

+ 3 - 3
server/Quests/StarcrestCommune/SoberingRemedy.lua

@@ -17,9 +17,9 @@ local SOBERING_REMEDY = 246
 
 function Init(Quest)
     UpdateQuestZone(Quest,"Peat Bog")
-	AddQuestStepKill(Quest, 1, "I must gather pieces from bog slugs", 1, 100, "I need to gather the components for Vondorinsarnoo's concoction from the Peat Bog, reachable by mariner bell within the City of Qeynos.", 289, 1980018)
-	AddQuestStepKill(Quest, 2, "I must gather whiskers from large scavengers", 1, 100, "I need to gather the components for Vondorinsarnoo's concoction from the Peat Bog, reachable by mariner bell within the City of Qeynos.", 2123, 1980017)
-	AddQuestStepKill(Quest, 3, "I must gather bile from bog sludges", 1, 100, "I need to gather the components for Vondorinsarnoo's concoction from the Peat Bog, reachable by mariner bell within the City of Qeynos.", 1162, 1980002)
+	AddQuestStepKill(Quest, 1, "I must gather pieces from bog slugs", 1, 33, "I need to gather the components for Vondorinsarnoo's concoction from the Peat Bog, reachable by mariner bell within the City of Qeynos.", 289, 8290005,8290006,8290031,8290027)
+	AddQuestStepKill(Quest, 2, "I must gather whiskers from large scavengers", 1, 33, "I need to gather the components for Vondorinsarnoo's concoction from the Peat Bog, reachable by mariner bell within the City of Qeynos.", 2123, 8290021)
+	AddQuestStepKill(Quest, 3, "I must gather bile from bog sludges", 1, 40, "I need to gather the components for Vondorinsarnoo's concoction from the Peat Bog, reachable by mariner bell within the City of Qeynos.", 1162, 8290004)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
 	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")

+ 2 - 2
server/Quests/StarcrestCommune/batwing_crunchies_for_jerben.lua

@@ -30,10 +30,10 @@ end
 
 function Step1Complete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I have gathered the bat wings that I needed.")
-	UpdateQuestTaskGroupDescription(Quest, 1, "I've collected all five albino bat wings for Jerben Sleepwell at the harbor in the Qeynos Province District.")
+	UpdateQuestTaskGroupDescription(Quest, 1, "I've collected all five albino bat wings for Jerben Sleepwell at the harbor in Starcrest Commune.")
     UpdateQuestZone(Quest,"Starcrest Commune")
 
-	AddQuestStepChat(Quest, 2, "I need to speak with Jerben Sleepwell", 1, "I need to return to Jerben Sleepwell at the harbor in the Qeynos Province District.", 140, 2340030, 6600463)
+	AddQuestStepChat(Quest, 2, "I need to speak with Jerben Sleepwell", 1, "I need to return to Jerben Sleepwell at the harbor in the Starcrest Commune.", 140, 2340030, 6600463)
 	AddQuestStepCompleteAction(Quest, 2, "QuestComplete")
 end
 

+ 1 - 1
server/Quests/StarcrestCommune/essence_hunting_for_obidudyn.lua

@@ -13,7 +13,7 @@ require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must gather the essence of forgotten guardians in the forest ruins.", 6, 85, "I need to collect six Essence of Elemental for Scholar Obidudyn. To do this I need to crush forgotten guardians in the Forest Ruins.", 2515, 1960038, 1960058)
+	AddQuestStepKill(Quest, 1, "I must gather the essence of forgotten guardians in the forest ruins.", 6, 85, "I need to collect six Essence of Elemental for Scholar Obidudyn. To do this I need to crush forgotten guardians in the Forest Ruins.", 2515, 1960038, 1960058,8270056,8270011,8270009,8270061,8270062,8270063)
 	AddQuestStepCompleteAction(Quest, 1, "step1_complete_killedGuardians")
 	UpdateQuestZone(Quest, "Forest Ruins")	
 end

+ 1 - 1
server/Quests/StarcrestCommune/tanairas_picnic_spot.lua

@@ -13,7 +13,7 @@ require "SpawnScripts/Generic/DialogModule"
 
 
 function Init(Quest)
-AddQuestStepLocation(Quest, 1, "I need to find the picnic spot near the waterfall in Oakmyst Forest.", 6, "I need to find the spot near the waterfall in Oakmyst Forest and see if it is a good site for a picnic.", 185, 976.82, 2.23, -209.86)
+AddQuestStepZoneLoc(Quest, 1, "I need to find the picnic spot near the waterfall in Oakmyst Forest.", 6, "I need to find the spot near the waterfall in Oakmyst Forest and see if it is a good site for a picnic.", 185, 976.82, 2.23, -209.86, 830)
 AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 UpdateQuestZone(Quest, "Oakmyst Forest")
 end

+ 2 - 2
server/Quests/TheElddarGrove/hawk_hunt.lua

@@ -11,9 +11,9 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I need to gather some hawks for Gregor Earthstride.", 5, 100, "I need to kill five hawks in the Forest ruins for Gregor Earthstride in the Elddar Grove.", 80, 1960013)
+	AddQuestStepKill(Quest, 1, "I need to gather some hawks for Gregor Earthstride.", 5, 100, "I need to kill five hawks in the Forest ruins for Gregor Earthstride in the Elddar Grove.", 80, 1960013,8270026)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
-    UpdateQuestZone(Quest,"The Forest Ruins")
+    UpdateQuestZone(Quest,"Forest Ruins")
 end
 
 function Accepted(Quest, QuestGiver, Player)

+ 9 - 6
server/Quests/TheElddarGrove/pelles_manuscript.lua

@@ -11,6 +11,7 @@
 	Followed by		:	None
 --]]
 
+require "SpawnScripts/Generic/DialogModule"
 
 function Init(Quest)
 	AddQuestStepChat(Quest, 1, "I need to speak with Rune Shimmerstar in South Qeynos.", 1, "I must give this manuscript to Rune Shimmerstar at the mage's tower in South Qeynos.", 711, 2310081)
@@ -19,12 +20,14 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-    local conversation = CreateConversation()
-    PlayFlavor(QuestGiver, "voiceover/english/pelle_shinkicker/qey_elddar/pelleshinkicker003.mp3", "", "thank", 2052304892, 1411111467, Player)	
 	FaceTarget(QuestGiver, Player)
-	AddConversationOption(conversation, "I'll be back shortly.")
-	AddConversationOption(conversation, "If we don't stop talking now I may never get there!")
-	StartConversation(conversation, QuestGiver, Player, "Great news!  Best I've had all day really.  Now, make certain it is a human by the name of Rune Shimmerstar who recieves this.  He's the only one at the Three Towers I'll trust!  Hehe, never made it much of a habbit to put much faith in those magi-folk.  You know, we had quite a number of adventures together, Rune and me!  Quite a nice chap once you get to know him.")
+	Dialog.New(QuestGiver, Player)
+	Dialog.AddDialog("Great news!  Best I've had all day really.  Now, make certain it is a human by the name of Rune Shimmerstar who recieves this.  He's the only one at the Three Towers I'll trust!  Hehe, never made it much of a habbit to put much faith in those magi-folk.  You know, we had quite a number of adventures together, Rune and me!  Quite a nice chap once you get to know him.")
+	Dialog.AddVoiceover("voiceover/english/pelle_shinkicker/qey_elddar/pelleshinkicker003.mp3", 2052304892, 1411111467)
+    PlayFlavor(QuestGiver, "", "", "smile", 0, 0, Player)	
+	Dialog.AddOption("I'll be back shortly.")
+	Dialog.AddOption("If we don't stop talking now I may never get there!")
+	Dialog.Start()
 end
 
 function Declined(Quest, QuestGiver, Player)
@@ -40,7 +43,7 @@ function QuestStep2(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I've spoken with Rune Shimmerstar.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "Rune Shimmerstar has laid an enchantment on the book to preserve it.")
     UpdateQuestZone(Quest, "Oakmyst Forest")
-	AddQuestStepChat(Quest, 2, "I need to deliver this book to Aundor Singingsword in the Oakmyst Forest", 1, "Rune Shimmerstar asked me to show Aundor Singingsword the newly bound book.", 720, 1950021)
+	AddQuestStepChat(Quest, 2, "I need to deliver this book to Aundor Singingsword in the Oakmyst Forest", 1, "Rune Shimmerstar asked me to show Aundor Singingsword the newly bound book.", 720, 1950021,8300020)
 	AddQuestStepCompleteAction(Quest, 2, "QuestStep3")
 end
 

+ 2 - 1
server/Quests/TheElddarGrove/visiting_the_windstalker_grave.lua

@@ -14,6 +14,7 @@
 function Init(Quest)
 	 AddQuestStepZoneLoc(Quest, 1, "I need to find Holly Windstalker's grave in Antonica.", 10, "I should go to Holly Windstalker's grave to see if there is any truth to the rumor.", 2339,-1854.52, -2.89, -624.46,12)
 	AddQuestStepCompleteAction(Quest, 1, "QuestComplete")
+    UpdateQuestZone(Quest,"Antonica")
 end
 
 function Accepted(Quest, QuestGiver, Player)
@@ -32,7 +33,7 @@ function QuestComplete(Quest, QuestGiver, Player)
 	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
 	UpdateQuestStepDescription(Quest, 1, "I found Holly Windstalker's grave.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I found Holly Windstalker's grave.")
-
+    UpdateQuestZone(Quest,"The Elddar Grove")
 	UpdateQuestDescription(Quest, "I found Holly Windstalker's grave on the hill overlooking Windstalker Village.  I didn't see any sign of the grave being disturbed though, I did remove a dirty mug near the site.  The rangers may just be overly cautious as of late. <br> <br>")
 	GiveQuestReward(Quest, Player)
 end

+ 1 - 1
server/Quests/TheForestRuins/far_seas_direct_requisition_frn0378.lua

@@ -11,7 +11,7 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must kill some sun beetles.", 10, 100, " To fill the requisition, I must hunt down the creatures in the Forest Ruins, reachable by mariner bell in the City of Qeynos.", 164, 1960034)
+	AddQuestStepKill(Quest, 1, "I must kill some sun beetles.", 10, 100, " To fill the requisition, I must hunt down the creatures in the Forest Ruins, reachable by mariner bell in the City of Qeynos.", 164, 1960034, 8270020)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 end
 

+ 2 - 2
server/Quests/TheForestRuins/far_seas_direct_requisition_frn0931.lua

@@ -11,8 +11,8 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "I must collect four Antonican hawk feathers.", 4, 100, " To fill the requisition, I must hunt down the creatures in the Forest Ruins, reachable by mariner bell in the City of Qeynos.", 150, 1960034)
-	AddQuestStepKill(Quest, 2, "I must collect six stoneshell snapper tails.", 6, 100, " To fill the requisition, I must hunt down the creatures in the Forest Ruins, reachable by mariner bell in the City of Qeynos.", 172, 1960034)
+	AddQuestStepKill(Quest, 1, "I must collect four Antonican hawk feathers.", 4, 100, " To fill the requisition, I must hunt down the creatures in the Forest Ruins, reachable by mariner bell in the City of Qeynos.", 150, 1960034,8270026)
+	AddQuestStepKill(Quest, 2, "I must collect six stoneshell snapper tails.", 6, 100, " To fill the requisition, I must hunt down the creatures in the Forest Ruins, reachable by mariner bell in the City of Qeynos.", 172, 1960034,8270019)
 	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 end

+ 13 - 9
server/Quests/TheForestRuins/forest_ruins_volunteer.lua

@@ -17,29 +17,33 @@ function Init(Quest)
 	SetQuestFeatherColor(Quest, 3)
 	SetQuestRepeatable(Quest)
 	if RandomChoice == 1 then
-	AddQuestStepKill(Quest, 1, "Hunt badgers.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960017,1960011)
+	AddQuestStepKill(Quest, 1, "Hunt badgers.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960017,1960011,8270016,8270025)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 	elseif RandomChoice == 2 then
-	AddQuestStepKill(Quest, 1, "Hunt turtles.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960012,1960009)
+	AddQuestStepKill(Quest, 1, "Hunt turtles.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960012,1960009,8270014,8270019)
 	AddQuestStepCompleteAction(Quest, 1, "Step2Complete")    
 	elseif RandomChoice == 3 then
-	AddQuestStepKill(Quest, 1, "Hunt snakes.", MakeRandomInt(6, 7), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960018,1960122)
+	AddQuestStepKill(Quest, 1, "Hunt snakes.", MakeRandomInt(6, 7), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960018,1960122,8270002,8270017)
 	AddQuestStepCompleteAction(Quest, 1, "Step3Complete") 
 	elseif RandomChoice == 4 then
-	AddQuestStepKill(Quest, 1, "Hunt beetles.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960034)
+	AddQuestStepKill(Quest, 1, "Hunt beetles.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960034,8270020)
 	AddQuestStepCompleteAction(Quest, 1, "Step4Complete") 
 	elseif RandomChoice == 5 then
-	AddQuestStepKill(Quest, 1, "Hunt spiders.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960022,1960031,1960033,1960082)
+	AddQuestStepKill(Quest, 1, "Hunt spiders.", MakeRandomInt(6, 9), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960022,1960031,1960033,1960082,8270037,8270015)
 	AddQuestStepCompleteAction(Quest, 1, "Step5Complete") 
     elseif RandomChoice == 6 then
-	AddQuestStepKill(Quest, 1, "Hunt centipedes.", MakeRandomInt(6, 8), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960026)
+	AddQuestStepKill(Quest, 1, "Hunt centipedes.", MakeRandomInt(6, 8), 100, "I'm supposed to reduce the local population of vermin here in the Forest Ruins.", 611, 1960026,8270006)
 	AddQuestStepCompleteAction(Quest, 1, "Step6Complete") 
    end
 end
 
 
 function Accepted(Quest, QuestGiver, Player)
-
+	FaceTarget(QuestGiver, Player)
+	conversation = CreateConversation()
+    PlayFlavor(QuestGiver, "voiceover/english/sergeant_at_arms_uthros/qey_adv02_ruins/quests/sergeant_uthros/sergeant_uthros003.mp3", "", "salute", 827162019, 3003960469,Player)
+	AddConversationOption(conversation, "You bet.")
+	StartConversation(conversation, QuestGiver, Player, "Great! Then go and kill more vermin.")
 end
 
 function Declined(Quest, QuestGiver, Player)
@@ -79,7 +83,7 @@ end
 function CheckProgress(Quest, QuestGiver, Player)
 if QuestStepIsComplete(Player, 5486, 1)  then
 	UpdateQuestTaskGroupDescription(Quest, 2, "I've slain many of the local vermin in the area, I should report back to the Sergeant.")
-	AddQuestStepChat(Quest, 2, "I need to report to Sergeant Uthros.", 1, "I should report back to Sergeant at Arms Uthros.", 11, 1960004)
+	AddQuestStepChat(Quest, 2, "I need to report to Sergeant Uthros.", 1, "I should report back to Sergeant at Arms Uthros.", 11, 1960004,8270030)
 	AddQuestStepCompleteAction(Quest, 2, "QuestComplete")
 end
    end
@@ -109,7 +113,7 @@ function Reload(Quest, QuestGiver, Player, Step)
 	    elseif RandomChoice == 6 then
 		Step6Complete(Quest, QuestGiver, Player)		
 		end
-	elseif Step == 2 then
+    elseif Step == 2 then
 		CheckProgress(Quest, QuestGiver, Player)
     end
 end

+ 6 - 1
server/Quests/TheForestRuins/letter_for_hunter_forestdeep.lua

@@ -19,7 +19,12 @@ function Init(Quest)
 end
 
 function Accepted(Quest, QuestGiver, Player)
-	-- Add dialog here for when the quest is accepted
+	FaceTarget(QuestGiver, Player)
+	conversation = CreateConversation()
+
+	PlayFlavor(QuestGiver, "voiceover/english/outlander_vaughn/qey_adv02_ruins/quests/outlander_dakota/outlander_dakota004.mp3", "", "", 3189315384, 2954944318, Player)
+	AddConversationOption(conversation, "I'll deliver this letter for you to the Willow Wood.")
+	StartConversation(conversation, QuestGiver, Player, "I need you to take this letter to Hunter Forestdeep. You'll find him in the Willow Wood village.")
 end
 
 function Declined(Quest, QuestGiver, Player)

+ 5 - 5
server/Quests/TheForestRuins/vaughns_stuff.lua

@@ -11,8 +11,8 @@
 --]]
 
 function Init(Quest)
-	AddQuestStepKill(Quest, 1, "Recover the satchel.", 1, 25, " I need to recover the Outlander's satchel and the items that were in it. The Blackfurl deckhands were the ones that stole the Outlanders gear, I'll start with them.", 399, 1960060 )
-	AddQuestStepKill(Quest, 2, "Recover the journal.", 1, 25, " I need to recover the Outlander's satchel and the items that were in it. The Blackfurl deckhands were the ones that stole the Outlanders gear, I'll start with them.", 195, 1960060 ) -- need correct icon
+	AddQuestStepKill(Quest, 1, "Recover the satchel.", 1, 15, " I need to recover the Outlander's satchel and the items that were in it. The Blackfurl deckhands were the ones that stole the Outlanders gear, I'll start with them.", 399, 1960060,8270058, 8270059, 8270060)
+	AddQuestStepKill(Quest, 2, "Recover the journal.", 1, 30, " I need to recover the Outlander's satchel and the items that were in it. The Blackfurl deckhands were the ones that stole the Outlanders gear, I'll start with them.", 195, 1960060 ) -- need correct icon
 	AddQuestStepKill(Quest, 3, "Recover the ring.", 1, 20, " I need to recover the Outlander's satchel and the items that were in it. The Blackfurl deckhands were the ones that stole the Outlanders gear, I'll start with them.", 596, 1960060 ) -- need correct icon
 	AddQuestStepKill(Quest, 4, "Recover the sealed letter.", 1, 25, " I need to recover the Outlander's satchel and the items that were in it. The Blackfurl deckhands were the ones that stole the Outlanders gear, I'll start with them.", 1223, 1960060) -- need correct icon
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
@@ -48,9 +48,9 @@ end
 
 function CheckProgress(Quest, QuestGiver, Player)
  if QuestStepIsComplete(Player, 5483, 1) and QuestStepIsComplete(Player, 5483, 2)  and QuestStepIsComplete(Player, 5483, 3) and QuestStepIsComplete(Player, 5483, 4) then
-	UpdateQuestTaskGroupDescription(Quest,1, "I've recovered all of the Outlander's gear.")
+	UpdateQuestTaskGroupDescription(Quest,2, "I've recovered all of the Outlander's gear.")
 	
-	AddQuestStepChat(Quest, 5, "I should return to Outlander Vaughn.", 1, "I need to return to Outlander Vaughn and give him back his items.", 399, 1960053)
+	AddQuestStepChat(Quest, 5, "I should return to Outlander Vaughn.", 1, "I need to return to Outlander Vaughn and give him back his items.", 399, 1960053,8270029)
     AddQuestStepCompleteAction(Quest, 5, "QuestComplete")
 end
    end
@@ -70,7 +70,7 @@ end
 function QuestComplete(Quest, QuestGiver, Player)
 	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
 	UpdateQuestStepDescription(Quest, 5, "I've returned the items to the Outlander.")
-	UpdateQuestTaskGroupDescription(Quest, 1, "The Outlander was grateful to get his gear back.")
+	UpdateQuestTaskGroupDescription(Quest, 2, "The Outlander was grateful to get his gear back.")
 
 	UpdateQuestDescription(Quest, "I eventually found all of Outlander Vaughn's items. He was grateful and asked if I would help him with something else.")
 	GiveQuestReward(Quest, Player)

+ 92 - 0
server/Quests/TheForestRuins/vaughns_stuff_CLASSIC.lua

@@ -0,0 +1,92 @@
+--[[
+    Script Name    : Quests/TheForestRuins/vaughns_stuff_CLASSIC.lua
+    Script Author  : Dorbin
+    Script Date    : 2022.10.17 04:10:45
+    Script Purpose : CLASSIC version of this quest
+
+        Zone       : TheForestRuins
+        Quest Giver: Outlander Vaughn (8270029)
+        Preceded by: None
+        Followed by: Letter for Hunter Forestdeep (5484)
+--]]
+
+function Init(Quest)
+	AddQuestStepKill(Quest, 1, "Recover the satchel.", 1, 15, " I need to recover the Outlander's satchel and the items that were in it. The Ruins Skulkers were the ones that stole the Outlanders gear, I'll start with them.", 399, 1960060,8270058, 8270059, 8270060)
+	AddQuestStepKill(Quest, 2, "Recover the journal.", 1, 20, " I need to recover the Outlander's satchel and the items that were in it. The Ruins Skulkers were the ones that stole the Outlanders gear, I'll start with them.", 195, 1960060,8270058, 8270059, 8270060) -- need correct icon
+	AddQuestStepKill(Quest, 3, "Recover the ring.", 1, 13, " I need to recover the Outlander's satchel and the items that were in it. The Ruins Skulkers were the ones that stole the Outlanders gear, I'll start with them.", 596, 1960060,8270058, 8270059, 8270060)
+	AddQuestStepKill(Quest, 4, "Recover the sealed letter.", 1, 20, " I need to recover the Outlander's satchel and the items that were in it. The Ruins Skulkers were the ones that stole the Outlanders gear, I'll start with them.", 1223, 1960060,8270058, 8270059, 8270060)
+	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
+	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
+	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")
+	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")	
+end
+
+
+
+function Step1Complete(Quest, QuestGiver, Player)
+	UpdateQuestStepDescription(Quest, 1, "I've found the satchel.")
+	CheckProgress(Quest, QuestGiver, Player)
+end
+
+
+function Step2Complete(Quest, QuestGiver, Player)
+    	UpdateQuestStepDescription(Quest, 2, "I've found the journal.")
+CheckProgress(Quest, QuestGiver, Player)
+end
+
+
+function Step3Complete(Quest, QuestGiver, Player)
+    	UpdateQuestStepDescription(Quest, 3, "I've found the ring.")
+   CheckProgress(Quest, QuestGiver, Player)
+end
+
+function Step4Complete(Quest, QuestGiver, Player)
+    	UpdateQuestStepDescription(Quest, 4, "I've found the letter.")
+   CheckProgress(Quest, QuestGiver, Player)
+end
+
+
+function CheckProgress(Quest, QuestGiver, Player)
+ if QuestStepIsComplete(Player, 5759, 1) and QuestStepIsComplete(Player, 5759, 2)  and QuestStepIsComplete(Player, 5759, 3) and QuestStepIsComplete(Player, 5759, 4) then
+	UpdateQuestTaskGroupDescription(Quest,2, "I've recovered all of the Outlander's gear.")
+	
+	AddQuestStepChat(Quest, 5, "I should return to Outlander Vaughn.", 1, "I need to return to Outlander Vaughn and give him back his items.", 399, 1960053,8270029)
+    AddQuestStepCompleteAction(Quest, 5, "QuestComplete")
+end
+   end
+
+function Accepted(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is accepted
+end
+
+function Declined(Quest, QuestGiver, Player)
+	-- Add dialog here for when the quest is declined
+end
+
+function Deleted(Quest, QuestGiver, Player)
+	-- Remove any quest specific items here when the quest is deleted
+end
+
+function QuestComplete(Quest, QuestGiver, Player)
+	-- The following UpdateQuestStepDescription and UpdateTaskGroupDescription are not needed, parser adds them for completion in case stuff needs to be moved around
+	UpdateQuestStepDescription(Quest, 5, "I've returned the items to the Outlander.")
+	UpdateQuestTaskGroupDescription(Quest, 2, "The Outlander was grateful to get his gear back.")
+
+	UpdateQuestDescription(Quest, "I eventually found all of Outlander Vaughn's items. He was grateful and asked if I would help him with something else.")
+	GiveQuestReward(Quest, Player)
+end
+
+function Reload(Quest, QuestGiver, Player, Step)
+	if Step == 1 then
+	    Step1Complete(Quest, QuestGiver, Player)
+     elseif Step == 2 then	    
+          Step2Complete(Quest, QuestGiver, Player)
+    elseif Step == 3 then	    
+        Step3Complete(Quest, QuestGiver, Player)
+    elseif Step == 4 then
+		Step4Complete(Quest, QuestGiver, Player)
+	 elseif Step == 5 then
+		QuestComplete(Quest, QuestGiver, Player)
+	end
+end
+

+ 7 - 7
server/Quests/ThePeatBog/the_path_of_the_sun_wolf_.lua

@@ -12,7 +12,7 @@
 
 
 function Init(Quest)
-	AddQuestStepLocation(Quest, 1, "Find the Qeynos drain.", 4, "Visit the Qeynos Drain to the north in the Peat Bog.", 11, 666.14, -32.67, 396.23)
+	AddQuestStepZoneLoc(Quest, 1, "Find the Qeynos drain.", 4, "Visit the Qeynos Drain to the north in the Peat Bog.", 11, 666.14, -32.67, 396.23,829)
 	AddQuestStepCompleteAction(Quest, 1, "Step1Complete")
 end
 
@@ -32,7 +32,7 @@ function Step1Complete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 1, "I have visited the Qeynos drain.")
 	UpdateQuestTaskGroupDescription(Quest, 1, "I visited the Qeynos Drain in the Peat Bog.")
 
-	AddQuestStepLocation(Quest, 2, "Find and enter the hollow tree by the pond.", 8, "Investigate the hollow tree at the pond south of the Qeynos drain.", 11, 652.73, -32.04, 477.94 )
+	AddQuestStepZoneLoc(Quest, 2, "Find and enter the hollow tree by the pond.", 8, "Investigate the hollow tree at the pond south of the Qeynos drain.", 11, 652.73, -32.04, 477.94,829 )
 	AddQuestStepCompleteAction(Quest, 2, "Step2Complete")
 end
 
@@ -40,7 +40,7 @@ function Step2Complete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 2, "Entered the hollow tree at the pond.")
 	UpdateQuestTaskGroupDescription(Quest, 2, "I visited the hollow tree at the pond.")
 
-	AddQuestStepLocation(Quest, 3, "Go to the hollowed stump.", 5, "Travel to the south of the Bog and find the hollowed stump in a corner of rock.", 11, 768.09, -31.64, 627.86)
+	AddQuestStepZoneLoc(Quest, 3, "Go to the hollowed stump.", 5, "Travel to the south of the Bog and find the hollowed stump in a corner of rock.", 11, 768.09, -31.64, 627.86,829)
 	AddQuestStepCompleteAction(Quest, 3, "Step3Complete")
 end
 
@@ -48,7 +48,7 @@ function Step3Complete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 3, "I have found the hollowed stump.")
 	UpdateQuestTaskGroupDescription(Quest, 3, "I investigated the hollowed stump at the southern end of the bog.")
 
-	AddQuestStepLocation(Quest, 4, "Go to the Lone Stump.", 8, "Travel north west of the hollowed stump and visit the Lone Stump Ring.", 11, 775.73, -31.64, 511.85)
+	AddQuestStepZoneLoc(Quest, 4, "Go to the Lone Stump.", 8, "Travel north west of the hollowed stump and visit the Lone Stump Ring.", 11, 775.73, -31.64, 511.85,829)
 	AddQuestStepCompleteAction(Quest, 4, "Step4Complete")
 end
 
@@ -56,7 +56,7 @@ function Step4Complete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 4, "Went to the Lone Stump.")
 	UpdateQuestTaskGroupDescription(Quest, 4, "Visited the ancient wood ring called the Lone Stump Ring and investigate the stump.")
 
-	AddQuestStepLocation(Quest, 5, "Go to the Deadend Niche.", 7, "Travel north a short distance from the Lone Stump Ring to find Deadend Niche.", 11, 757.73, -32.70, 489.06)
+	AddQuestStepZoneLoc(Quest, 5, "Go to the Deadend Niche.", 7, "Travel north a short distance from the Lone Stump Ring to find Deadend Niche.", 11, 757.73, -32.70, 489.06,829)
 	AddQuestStepCompleteAction(Quest, 5, "QuestComplete")
 end
 
@@ -65,8 +65,8 @@ function QuestComplete(Quest, QuestGiver, Player)
 	UpdateQuestStepDescription(Quest, 5, "Went to the Deadend Niche.")
 	UpdateQuestTaskGroupDescription(Quest, 5, "I found the Deadend Niche outside of the Lone Stump Ring in the Peat Bog.")
         local zone = GetZone(Player)
-		local Dog = GetSpawnByLocationID(zone, 133773176, false)
-        local SpawnDog = SpawnByLocationID(zone, 133773176,false)
+		local Dog = GetSpawnByLocationID(zone, 133779907, false)
+        local SpawnDog = SpawnByLocationID(zone, 133779907,false)
         AddHate(Player, SpawnDog, 100)    
 	UpdateQuestDescription(Quest, "I followed the path of the mythical Sun Wolf in the Peat Bog. At the end of my search the beast appeared, giving me an opportunity to face the creature in combat and emerge victorious.")
 	GiveQuestReward(Quest, Player)

+ 1 - 2
server/Quests/TheWillowWood/baynors_bent_tongs.lua

@@ -51,8 +51,7 @@ end
 function Reload(Quest, QuestGiver, Player, Step)
 	if Step == 1 then
 		Step1Complete(Quest, QuestGiver, Player)
-	end
-	if Step == 1 then
+	elseif Step == 2 then
 		QuestComplete(Quest, QuestGiver, Player)
 	end
 end

Some files were not shown because too many files changed in this diff