Bläddra i källkod

Update to Pathing

devn00b 3 år sedan
förälder
incheckning
70f6b22e0c
65 ändrade filer med 2454 tillägg och 1457 borttagningar
  1. 71 71
      server/SpawnScripts/DownBelow/bloodsaber_initiate6.lua
  2. 71 71
      server/SpawnScripts/DownBelow/fuckrats.lua
  3. 42 0
      server/SpawnScripts/ElddarGrove/ArthurWaterway.lua
  4. 20 0
      server/SpawnScripts/ElddarGrove/GuardKaladenth.lua
  5. 100 0
      server/SpawnScripts/ElddarGrove/Junala.lua
  6. 33 0
      server/SpawnScripts/ElddarGrove/KaelarriIvyshae.lua
  7. 66 0
      server/SpawnScripts/ElddarGrove/Kaemon.lua
  8. 32 0
      server/SpawnScripts/ElddarGrove/KaylelleStarchaser.lua
  9. 44 0
      server/SpawnScripts/ElddarGrove/Kethelrune.lua
  10. 52 0
      server/SpawnScripts/ElddarGrove/MadrethalSummerspeak.lua
  11. 26 0
      server/SpawnScripts/ElddarGrove/Mina.lua
  12. 35 0
      server/SpawnScripts/ElddarGrove/SolomenStormwatch.lua
  13. 51 0
      server/SpawnScripts/ElddarGrove/ThomasBoatmend.lua
  14. 44 0
      server/SpawnScripts/ElddarGrove/VelisarrMorningdew.lua
  15. 15 99
      server/SpawnScripts/ElddarGrove/WesaelanBrookshadow.lua
  16. 22 22
      server/SpawnScripts/Qeynos/cahptor.lua
  17. 22 22
      server/SpawnScripts/Qeynos/chapman.lua
  18. 23 22
      server/SpawnScripts/Qeynos/cloudsend.lua
  19. 51 22
      server/SpawnScripts/Qeynos/dillon.lua
  20. 22 22
      server/SpawnScripts/Qeynos/erwin.lua
  21. 192 22
      server/SpawnScripts/Qeynos/iceslayer.lua
  22. 22 22
      server/SpawnScripts/Qeynos/ilgar.lua
  23. 23 22
      server/SpawnScripts/Qeynos/kelin.lua
  24. 26 22
      server/SpawnScripts/Qeynos/kenika.lua
  25. 23 22
      server/SpawnScripts/Qeynos/klenthall.lua
  26. 31 22
      server/SpawnScripts/Qeynos/lanalie.lua
  27. 22 22
      server/SpawnScripts/Qeynos/lawler.lua
  28. 41 22
      server/SpawnScripts/Qeynos/loowoonla.lua
  29. 23 22
      server/SpawnScripts/Qeynos/marrising.lua
  30. 22 22
      server/SpawnScripts/Qeynos/merriou.lua
  31. 43 22
      server/SpawnScripts/Qeynos/morgessa.lua
  32. 31 22
      server/SpawnScripts/Qeynos/ocoggin.lua
  33. 23 22
      server/SpawnScripts/Qeynos/percivous.lua
  34. 31 22
      server/SpawnScripts/Qeynos/quillfingers.lua
  35. 23 22
      server/SpawnScripts/Qeynos/raleigh.lua
  36. 26 22
      server/SpawnScripts/Qeynos/stanhyl.lua
  37. 39 22
      server/SpawnScripts/Qeynos/taseela.lua
  38. 39 22
      server/SpawnScripts/Qeynos/telethar.lua
  39. 40 22
      server/SpawnScripts/Qeynos/tesilah.lua
  40. 32 22
      server/SpawnScripts/Qeynos/theodoric.lua
  41. 42 22
      server/SpawnScripts/Qeynos/treeskipper.lua
  42. 22 22
      server/SpawnScripts/Qeynos/ward.lua
  43. 22 22
      server/SpawnScripts/Qeynos/woodrow.lua
  44. 26 14
      server/SpawnScripts/QeynosHarbor/Aliindar.lua
  45. 34 24
      server/SpawnScripts/QeynosHarbor/Bilur.lua
  46. 40 28
      server/SpawnScripts/QeynosHarbor/Groban.lua
  47. 34 22
      server/SpawnScripts/QeynosHarbor/Hanstock.lua
  48. 33 22
      server/SpawnScripts/QeynosHarbor/Highgold.lua
  49. 34 24
      server/SpawnScripts/QeynosHarbor/Oakhall.lua
  50. 33 22
      server/SpawnScripts/QeynosHarbor/Warland.lua
  51. 55 6
      server/SpawnScripts/QeynosHarbor/aQeynoscitizen.lua
  52. 23 23
      server/SpawnScripts/QeynosHarbor/aduck.lua
  53. 24 24
      server/SpawnScripts/QeynosHarbor/arat.lua
  54. 70 22
      server/SpawnScripts/QeynosHarbor/boulden.lua
  55. 22 22
      server/SpawnScripts/QeynosHarbor/captsalty.lua
  56. 22 42
      server/SpawnScripts/QeynosHarbor/charlene.lua
  57. 22 22
      server/SpawnScripts/QeynosHarbor/fluffy.lua
  58. 25 22
      server/SpawnScripts/QeynosHarbor/hilldon.lua
  59. 49 22
      server/SpawnScripts/QeynosHarbor/nathan.lua
  60. 22 22
      server/SpawnScripts/QeynosHarbor/quackers.lua
  61. 22 22
      server/SpawnScripts/QeynosHarbor/ratthree.lua
  62. 22 22
      server/SpawnScripts/QeynosHarbor/rattwo.lua
  63. 122 46
      server/SpawnScripts/QeynosHarbor/tabina.lua
  64. 36 22
      server/SpawnScripts/QeynosHarbor/wyrmdon.lua
  65. 4 105
      server/SpawnScripts/VerminSnye/ZaenKalystir.lua

+ 71 - 71
server/SpawnScripts/DownBelow/bloodsaber_initiate6.lua

@@ -1,71 +1,71 @@
---[[
-	Script Name     : SpawnScripts/Generic/tiny_movement_loop.lua 
-	Script Purpose  : a tiny movement loop
-	Script Author   : theFoof
-	Script Date     : 2013.5.22
-	Script Notes    :
---]]
-function hailed(NPC, Spawn)
-    FaceTarget(NPC, Spawn)
-end
-
-function spawn(NPC)
-    ChooseMovement(NPC)
-end
-
-function ChooseMovement(NPC)
-	local choice = math.random(1, 4)
-	if choice == 1 then
-		clockwise1(NPC)
-	elseif choice == 2 then
-		clockwise2(NPC)
-	elseif choice == 3 then
-		counter_clockwise1(NPC)
-	elseif choice == 4 then
-		counter_clockwise2(NPC)
-	end
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
-function clockwise1(NPC)
-	local x = GetX(NPC)
-	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x + 3 , y, z - 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x - 1 , y, z - 6, 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x - 6, y, z + 5 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x + 1 , y, z + 4 , 2, math.random(2, 5))
-end
-
-function clockwise2(NPC)
-	local x = GetX(NPC)
- 	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x + 2 , y, z - 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x - 7 , y, z - 1 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x     , y, z + 2 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x + 5 , y, z + 1 , 2, math.random(2, 5))
-end
-
-function counter_clockwise1(NPC)
-	local x = GetX(NPC)
-	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x - 3 , y, z + 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x + 1 , y, z + 6, 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x + 4, y, z - 5 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x - 1 , y, z - 4 , 2, math.random(2, 5))
-end
-
-function counter_clockwise2(NPC)
-	local x = GetX(NPC)
-	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x - 2 , y, z + 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x + 3 , y, z + 1 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x     , y, z - 2 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x - 5 , y, z - 1 , 2, math.random(2, 5))
-end
+--[[
+	Script Name     : SpawnScripts/Generic/tiny_movement_loop.lua 
+	Script Purpose  : a tiny movement loop
+	Script Author   : theFoof
+	Script Date     : 2013.5.22
+	Script Notes    :
+--]]
+function hailed(NPC, Spawn)
+    FaceTarget(NPC, Spawn)
+end
+
+function spawn(NPC)
+    ChooseMovement(NPC)
+end
+
+function ChooseMovement(NPC)
+	local choice = math.random(1, 4)
+	if choice == 1 then
+		clockwise1(NPC)
+	elseif choice == 2 then
+		clockwise2(NPC)
+	elseif choice == 3 then
+		counter_clockwise1(NPC)
+	elseif choice == 4 then
+		counter_clockwise2(NPC)
+	end
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function clockwise1(NPC)
+	local x = GetX(NPC)
+	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x + 3 , y, z - 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x - 1 , y, z - 6, 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x - 6, y, z + 5 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x + 1 , y, z + 4 , 2, math.random(2, 5))
+end
+
+function clockwise2(NPC)
+	local x = GetX(NPC)
+ 	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x + 2 , y, z - 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x - 7 , y, z - 1 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x     , y, z + 2 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x + 5 , y, z + 1 , 2, math.random(2, 5))
+end
+
+function counter_clockwise1(NPC)
+	local x = GetX(NPC)
+	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x - 3 , y, z + 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x + 1 , y, z + 6, 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x + 4, y, z - 5 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x - 1 , y, z - 4 , 2, math.random(2, 5))
+end
+
+function counter_clockwise2(NPC)
+	local x = GetX(NPC)
+	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x - 2 , y, z + 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x + 3 , y, z + 1 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x     , y, z - 2 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x - 5 , y, z - 1 , 2, math.random(2, 5))
+end

+ 71 - 71
server/SpawnScripts/DownBelow/fuckrats.lua

@@ -1,71 +1,71 @@
---[[
-	Script Name     : SpawnScripts/Generic/tiny_movement_loop.lua 
-	Script Purpose  : a tiny movement loop
-	Script Author   : theFoof
-	Script Date     : 2013.5.22
-	Script Notes    :
---]]
-function hailed(NPC, Spawn)
-    FaceTarget(NPC, Spawn)
-end
-
-function spawn(NPC)
-    ChooseMovement(NPC)
-end
-
-function ChooseMovement(NPC)
-	local choice = math.random(1, 4)
-	if choice == 1 then
-		clockwise1(NPC)
-	elseif choice == 2 then
-		clockwise2(NPC)
-	elseif choice == 3 then
-		counter_clockwise1(NPC)
-	elseif choice == 4 then
-		counter_clockwise2(NPC)
-	end
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
-function clockwise1(NPC)
-	local x = GetX(NPC)
-	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x + 3 , y, z - 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x - 1 , y, z - 6, 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x - 6, y, z + 5 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x + 1 , y, z + 4 , 2, math.random(2, 5))
-end
-
-function clockwise2(NPC)
-	local x = GetX(NPC)
- 	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x + 2 , y, z - 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x - 7 , y, z - 1 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x     , y, z + 2 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x + 5 , y, z + 1 , 2, math.random(2, 5))
-end
-
-function counter_clockwise1(NPC)
-	local x = GetX(NPC)
-	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x - 3 , y, z + 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x + 1 , y, z + 6, 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x + 4, y, z - 5 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x - 1 , y, z - 4 , 2, math.random(2, 5))
-end
-
-function counter_clockwise2(NPC)
-	local x = GetX(NPC)
-	local y = GetY(NPC)
-	local z = GetZ(NPC)
-	MovementLoopAddLocation(NPC, x - 2 , y, z + 4 , 2, math.random(2, 5))
-	MovementLoopAddLocation(NPC, x + 3 , y, z + 1 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x     , y, z - 2 , 2, math.random(2, 5))
-	--MovementLoopAddLocation(NPC, x - 5 , y, z - 1 , 2, math.random(2, 5))
-end
+--[[
+	Script Name     : SpawnScripts/Generic/tiny_movement_loop.lua 
+	Script Purpose  : a tiny movement loop
+	Script Author   : theFoof
+	Script Date     : 2013.5.22
+	Script Notes    :
+--]]
+function hailed(NPC, Spawn)
+    FaceTarget(NPC, Spawn)
+end
+
+function spawn(NPC)
+    ChooseMovement(NPC)
+end
+
+function ChooseMovement(NPC)
+	local choice = math.random(1, 4)
+	if choice == 1 then
+		clockwise1(NPC)
+	elseif choice == 2 then
+		clockwise2(NPC)
+	elseif choice == 3 then
+		counter_clockwise1(NPC)
+	elseif choice == 4 then
+		counter_clockwise2(NPC)
+	end
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function clockwise1(NPC)
+	local x = GetX(NPC)
+	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x + 3 , y, z - 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x - 1 , y, z - 6, 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x - 6, y, z + 5 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x + 1 , y, z + 4 , 2, math.random(2, 5))
+end
+
+function clockwise2(NPC)
+	local x = GetX(NPC)
+ 	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x + 2 , y, z - 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x - 7 , y, z - 1 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x     , y, z + 2 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x + 5 , y, z + 1 , 2, math.random(2, 5))
+end
+
+function counter_clockwise1(NPC)
+	local x = GetX(NPC)
+	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x - 3 , y, z + 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x + 1 , y, z + 6, 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x + 4, y, z - 5 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x - 1 , y, z - 4 , 2, math.random(2, 5))
+end
+
+function counter_clockwise2(NPC)
+	local x = GetX(NPC)
+	local y = GetY(NPC)
+	local z = GetZ(NPC)
+	MovementLoopAddLocation(NPC, x - 2 , y, z + 4 , 2, math.random(2, 5))
+	MovementLoopAddLocation(NPC, x + 3 , y, z + 1 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x     , y, z - 2 , 2, math.random(2, 5))
+	--MovementLoopAddLocation(NPC, x - 5 , y, z - 1 , 2, math.random(2, 5))
+end

+ 42 - 0
server/SpawnScripts/ElddarGrove/ArthurWaterway.lua

@@ -21,3 +21,45 @@ function hailed(NPC, Spawn)
 
 end
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 802.94, -21.54, -552.06, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 781.61, -22.18, -510.68, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 754.8, -21.82, -481.71, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 713.01, -20.96, -456.39, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 701.91, -16.92, -427.47, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 691.7, -13.19, -403.38, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 678.25, -11.64, -393.92, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 650.19, -11.56, -399.55, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 640.41, -13.1, -371.98, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 609.56, -18.44, -369.61, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 562.49, -20.75, -362.57, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 539.17, -20.64, -292.83, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 562.36, -19.83, -268.2, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 591.98, -21.09, -255.38, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 562.36, -19.83, -268.2, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 539.17, -20.64, -292.83, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 562.49, -20.75, -362.57, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 609.56, -18.44, -369.61, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 640.41, -13.1, -371.98, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 650.19, -11.56, -399.55, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 678.25, -11.64, -393.92, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 691.7, -13.19, -403.38, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 701.91, -16.92, -427.47, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 713.01, -20.96, -456.39, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 754.8, -21.82, -481.71, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 781.61, -22.18, -510.68, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 802.94, -21.54, -552.06, 2, math.random(0,5))
+end
+
+

+ 20 - 0
server/SpawnScripts/ElddarGrove/GuardKaladenth.lua

@@ -6,6 +6,10 @@
 	Script Notes	: Auto-Generated Conversation from PacketParser Data
 --]]
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
 function hailed(NPC, Spawn)
 	FaceTarget(NPC, Spawn)
 	choice = math.random(1,2)
@@ -19,3 +23,19 @@ function hailed(NPC, Spawn)
 
 end
 
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 594.35, -21.42, -257.29, 2, 5)
+	MovementLoopAddLocation(NPC, 580.75, -20.84, -259, 2, 0)
+	MovementLoopAddLocation(NPC, 553.51, -20.04, -277.93, 2, 0)
+	MovementLoopAddLocation(NPC, 518.75, -20.64, -286.51, 2, 0)
+	MovementLoopAddLocation(NPC, 550.5, -21.45, -311.58, 2, 0)
+	MovementLoopAddLocation(NPC, 545.01, -21.17, -325.85, 2, 0)
+	MovementLoopAddLocation(NPC, 530.36, -21.04, -314.28, 2, 0)
+	MovementLoopAddLocation(NPC, 520.82, -20.75, -290.82, 2, 0)
+	MovementLoopAddLocation(NPC, 538.52, -20.27, -282.51, 2, 0)
+	MovementLoopAddLocation(NPC, 550.93, -20.18, -281.09, 2, 0)
+	MovementLoopAddLocation(NPC, 555.04, -20.01, -277.3, 2, 0)
+	MovementLoopAddLocation(NPC, 574.43, -20.55, -266.52, 2, 0)
+	MovementLoopAddLocation(NPC, 584.22, -20.78, -258.42, 2, 0)
+	MovementLoopAddLocation(NPC, 594.35, -21.42, -257.29, 2, 5)
+end

+ 100 - 0
server/SpawnScripts/ElddarGrove/Junala.lua

@@ -6,6 +6,11 @@
 	Script Notes	: Auto-Generated Conversation from PacketParser Data
 --]]
 
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
 function hailed(NPC, Spawn)
 	FaceTarget(NPC, Spawn)
 	choice = math.random(1,3)
@@ -21,3 +26,98 @@ function hailed(NPC, Spawn)
 
 end
 
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 605.96, -20.89, -259.09, 2, 0)
+	MovementLoopAddLocation(NPC, 614, -20.95, -229.58, 2, 0)
+	MovementLoopAddLocation(NPC, 634.96, -19.08, -234.01, 2, 0)
+	MovementLoopAddLocation(NPC, 668.9, -17.01, -245.59, 2, 0)
+	MovementLoopAddLocation(NPC, 695.49, -16.99, -266.47, 2, 0)
+	MovementLoopAddLocation(NPC, 727.35, -17.06, -285.49, 2, 0)
+	MovementLoopAddLocation(NPC, 734.16, -17.04, -294.26, 2, 0)
+	MovementLoopAddLocation(NPC, 765.1, -18.47, -326.74, 2, 0)
+	MovementLoopAddLocation(NPC, 782.61, -20.65, -340.07, 2, 0)
+	MovementLoopAddLocation(NPC, 770.4, -19.3, -332.35, 2, 0)
+	MovementLoopAddLocation(NPC, 753.74, -20.15, -332.09, 2, 0)
+	MovementLoopAddLocation(NPC, 742.81, -20.21, -332.7, 2, 0)
+	MovementLoopAddLocation(NPC, 712.98, -17.1, -329.32, 2, 0)
+	MovementLoopAddLocation(NPC, 686.74, -19.94, -317.7, 2, 0)
+	MovementLoopAddLocation(NPC, 657.75, -20.95, -289.69, 2, 0)
+	MovementLoopAddLocation(NPC, 652.1, -21.54, -292.41, 2, 0)
+	MovementLoopAddLocation(NPC, 647.82, -16.62, -334.4, 2, 0)
+	MovementLoopAddLocation(NPC, 678.13, -13.8, -354.18, 2, 0)
+	MovementLoopAddLocation(NPC, 730.27, -20.06, -375.56, 2, 0)
+	MovementLoopAddLocation(NPC, 707.55, -15.61, -383.54, 2, 0)
+	MovementLoopAddLocation(NPC, 697.97, -14.96, -419.59, 2, 0)
+	MovementLoopAddLocation(NPC, 702.31, -16.73, -428.28, 2, 0)
+	MovementLoopAddLocation(NPC, 710.67, -20.53, -452.09, 2, 0)
+	MovementLoopAddLocation(NPC, 746.91, -22.31, -474.65, 2, 0)
+	MovementLoopAddLocation(NPC, 766, -21.8, -491.51, 2, 0)
+	MovementLoopAddLocation(NPC, 781.11, -22.01, -508.27, 2, 0)
+	MovementLoopAddLocation(NPC, 797.01, -22.28, -536.9, 2, 0)
+	MovementLoopAddLocation(NPC, 807.31, -21.34, -533.66, 2, 0)
+	MovementLoopAddLocation(NPC, 798.56, -22.21, -535.94, 2, 0)
+	MovementLoopAddLocation(NPC, 784.07, -21.95, -507.11, 2, 0)
+	MovementLoopAddLocation(NPC, 770.84, -21.8, -491.93, 2, 0)
+	MovementLoopAddLocation(NPC, 751.67, -22.16, -473.85, 2, 0)
+	MovementLoopAddLocation(NPC, 713.99, -20.93, -455.41, 2, 0)
+	MovementLoopAddLocation(NPC, 709.61, -19.78, -445.62, 2, 0)
+	MovementLoopAddLocation(NPC, 702.09, -16.88, -427.62, 2, 0)
+	MovementLoopAddLocation(NPC, 698.2, -13.79, -406.51, 2, 0)
+	MovementLoopAddLocation(NPC, 678.26, -11.62, -394.41, 2, 0)
+	MovementLoopAddLocation(NPC, 648.9, -11.71, -398.5, 2, 0)
+	MovementLoopAddLocation(NPC, 591.21, -18.51, -409.57, 2, 0)
+	MovementLoopAddLocation(NPC, 589.83, -18.82, -394.65, 2, 0)
+	MovementLoopAddLocation(NPC, 602.64, -18.96, -382, 2, 0)
+	MovementLoopAddLocation(NPC, 600.09, -20.02, -368.1, 2, 0)
+	MovementLoopAddLocation(NPC, 544.86, -19.53, -359.49, 2, 0)
+	MovementLoopAddLocation(NPC, 542.58, -20.61, -338.53, 2, 0)
+	MovementLoopAddLocation(NPC, 547.61, -21.13, -303.98, 2, 0)
+	MovementLoopAddLocation(NPC, 521.75, -20.73, -290.78, 2, 0)
+	MovementLoopAddLocation(NPC, 547.61, -21.13, -303.98, 2, 0)
+	MovementLoopAddLocation(NPC, 542.58, -20.61, -338.53, 2, 0)
+	MovementLoopAddLocation(NPC, 544.86, -19.53, -359.49, 2, 0)
+	MovementLoopAddLocation(NPC, 600.09, -20.02, -368.1, 2, 0)
+	MovementLoopAddLocation(NPC, 602.64, -18.96, -382, 2, 0)
+	MovementLoopAddLocation(NPC, 589.83, -18.82, -394.65, 2, 0)
+	MovementLoopAddLocation(NPC, 591.21, -18.51, -409.57, 2, 0)
+	MovementLoopAddLocation(NPC, 648.9, -11.71, -398.5, 2, 0)
+	MovementLoopAddLocation(NPC, 678.26, -11.62, -394.41, 2, 0)
+	MovementLoopAddLocation(NPC, 698.2, -13.79, -406.51, 2, 0)
+	MovementLoopAddLocation(NPC, 702.09, -16.88, -427.62, 2, 0)
+	MovementLoopAddLocation(NPC, 709.61, -19.78, -445.62, 2, 0)
+	MovementLoopAddLocation(NPC, 713.99, -20.93, -455.41, 2, 0)
+	MovementLoopAddLocation(NPC, 751.67, -22.16, -473.85, 2, 0)
+	MovementLoopAddLocation(NPC, 770.84, -21.8, -491.93, 2, 0)
+	MovementLoopAddLocation(NPC, 784.07, -21.95, -507.11, 2, 0)
+	MovementLoopAddLocation(NPC, 798.56, -22.21, -535.94, 2, 0)
+	MovementLoopAddLocation(NPC, 807.31, -21.34, -533.66, 2, 0)
+	MovementLoopAddLocation(NPC, 797.01, -22.28, -536.9, 2, 0)
+	MovementLoopAddLocation(NPC, 781.11, -22.01, -508.27, 2, 0)
+	MovementLoopAddLocation(NPC, 766, -21.8, -491.51, 2, 0)
+	MovementLoopAddLocation(NPC, 746.91, -22.31, -474.65, 2, 0)
+	MovementLoopAddLocation(NPC, 710.67, -20.53, -452.09, 2, 0)
+	MovementLoopAddLocation(NPC, 702.31, -16.73, -428.28, 2, 0)
+	MovementLoopAddLocation(NPC, 697.97, -14.96, -419.59, 2, 0)
+	MovementLoopAddLocation(NPC, 707.55, -15.61, -383.54, 2, 0)
+	MovementLoopAddLocation(NPC, 730.27, -20.06, -375.56, 2, 0)
+	MovementLoopAddLocation(NPC, 678.13, -13.8, -354.18, 2, 0)
+	MovementLoopAddLocation(NPC, 647.82, -16.62, -334.4, 2, 0)
+	MovementLoopAddLocation(NPC, 652.1, -21.54, -292.41, 2, 0)
+	MovementLoopAddLocation(NPC, 657.75, -20.95, -289.69, 2, 0)
+	MovementLoopAddLocation(NPC, 686.74, -19.94, -317.7, 2, 0)
+	MovementLoopAddLocation(NPC, 712.98, -17.1, -329.32, 2, 0)
+	MovementLoopAddLocation(NPC, 742.81, -20.21, -332.7, 2, 0)
+	MovementLoopAddLocation(NPC, 753.74, -20.15, -332.09, 2, 0)
+	MovementLoopAddLocation(NPC, 770.4, -19.3, -332.35, 2, 0)
+	MovementLoopAddLocation(NPC, 782.61, -20.65, -340.07, 2, 0)
+	MovementLoopAddLocation(NPC, 765.1, -18.47, -326.74, 2, 0)
+	MovementLoopAddLocation(NPC, 734.16, -17.04, -294.26, 2, 0)
+	MovementLoopAddLocation(NPC, 727.35, -17.06, -285.49, 2, 0)
+	MovementLoopAddLocation(NPC, 695.49, -16.99, -266.47, 2, 0)
+	MovementLoopAddLocation(NPC, 668.9, -17.01, -245.59, 2, 0)
+	MovementLoopAddLocation(NPC, 634.96, -19.08, -234.01, 2, 0)
+	MovementLoopAddLocation(NPC, 614, -20.95, -229.58, 2, 0)
+	MovementLoopAddLocation(NPC, 605.96, -20.89, -259.09, 2, 0)
+end
+
+

+ 33 - 0
server/SpawnScripts/ElddarGrove/KaelarriIvyshae.lua

@@ -25,3 +25,36 @@ function hailed(NPC, Spawn)
 
 end
 
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 649.78, -17.86, -205.23, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 648.62, -18.52, -254.29, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.62, -21.7, -293.3, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.1, -21.9, -302.8, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 639.36, -20.31, -310.61, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 608.37, -20.8, -313.51, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 550.27, -21.46, -312.73, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 537.88, -20.8, -297.38, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 576.67, -20.63, -261.1, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 591.64, -21.03, -254.6, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 576.67, -20.63, -261.1, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 537.88, -20.8, -297.38, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 550.27, -21.46, -312.73, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 608.37, -20.8, -313.51, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 639.36, -20.31, -310.61, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.1, -21.9, -302.8, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.62, -21.7, -293.3, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 648.62, -18.52, -254.29, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 649.78, -17.86, -205.23, 2, math.random(0,8))
+end

+ 66 - 0
server/SpawnScripts/ElddarGrove/Kaemon.lua

@@ -21,3 +21,69 @@ function hailed(NPC, Spawn)
 
 end
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 796.48, -22.29, -532.16, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 784.51, -22.31, -509.94, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 774.51, -21.8, -496.87, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 753.33, -22.02, -475.7, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 720.13, -21.34, -459.29, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 709.1, -19.77, -445.47, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 704.38, -15.94, -433.44, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 699.07, -15.15, -419.15, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 705.79, -15.79, -379.66, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 755.38, -19.33, -378.63, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 755.38, -19.33, -378.63, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 698.79, -14.76, -379.16, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.9, -13.1, -359.49, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 638.81, -13.23, -369.1, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 576.91, -21.66, -364.32, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 568.64, -19.87, -373.3, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 550.27, -21.34, -323.28, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 560.2, -21.9, -314.32, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 596.45, -21.15, -314.94, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.73, -21.28, -308, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 649.68, -21.67, -304.18, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 650.22, -21.66, -293.1, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 650.98, -18.01, -207.74, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.83, -19.38, -271.75, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 681.02, -19.61, -276.77, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 704.77, -17.08, -331.67, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 723.53, -17.55, -330.58, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 747.75, -20.22, -332.03, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 772.13, -19.09, -331.47, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 747.75, -20.22, -332.03, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 723.53, -17.55, -330.58, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 704.77, -17.08, -331.67, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 681.02, -19.61, -276.77, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.83, -19.38, -271.75, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 650.98, -18.01, -207.74, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 650.22, -21.66, -293.1, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 649.68, -21.67, -304.18, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.73, -21.28, -308, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 596.45, -21.15, -314.94, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 560.2, -21.9, -314.32, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 550.27, -21.34, -323.28, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 568.64, -19.87, -373.3, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 576.91, -21.66, -364.32, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 638.81, -13.23, -369.1, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.9, -13.1, -359.49, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 698.79, -14.76, -379.16, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 755.38, -19.33, -378.63, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 755.38, -19.33, -378.63, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 705.79, -15.79, -379.66, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 699.07, -15.15, -419.15, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 704.38, -15.94, -433.44, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 709.1, -19.77, -445.47, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 720.13, -21.34, -459.29, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 753.33, -22.02, -475.7, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 774.51, -21.8, -496.87, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 784.51, -22.31, -509.94, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 796.48, -22.29, -532.16, 2, math.random(0,5))
+end

+ 32 - 0
server/SpawnScripts/ElddarGrove/KaylelleStarchaser.lua

@@ -21,3 +21,35 @@ function hailed(NPC, Spawn)
 
 end
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 614.94, -20.82, -260.61, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 630.77, -19.78, -256.17, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 644.08, -19.01, -263.39, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 649.33, -20.72, -284.7, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 650.01, -21.79, -293.97, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 649.67, -21.64, -304.66, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 639.98, -20.33, -310.22, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 592.56, -21.15, -316.11, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 558.55, -21.89, -316.44, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 541.91, -18.75, -367.38, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 558.55, -21.89, -316.44, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 592.56, -21.15, -316.11, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 639.98, -20.33, -310.22, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 649.67, -21.64, -304.66, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 650.01, -21.79, -293.97, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 649.33, -20.72, -284.7, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 644.08, -19.01, -263.39, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 630.77, -19.78, -256.17, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 614.94, -20.82, -260.61, 2, math.random(0,8))
+end

+ 44 - 0
server/SpawnScripts/ElddarGrove/Kethelrune.lua

@@ -21,3 +21,47 @@ function hailed(NPC, Spawn)
 
 end
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 805.49, -21.7, -551.99, 2, math.random(0,25))
+	MovementLoopAddLocation(NPC, 786.92, -22.61, -512.9, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 752.87, -21.98, -477.23, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 717.53, -21.25, -459.67, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 709.29, -19.56, -445.07, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 701.44, -16.56, -426.22, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 701.09, -14.85, -412.3, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 683.34, -11.89, -390.41, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 687.32, -13.38, -371.73, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 668.08, -11.74, -363.53, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.9, -13.05, -360.14, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.55, -14.81, -343.63, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.22, -18.15, -328.01, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 651.9, -21.82, -304.38, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 651.91, -19.07, -268.92, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 635.14, -19.34, -256.68, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 613.61, -20.98, -262.87, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 635.14, -19.34, -256.68, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 651.91, -19.07, -268.92, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 651.9, -21.82, -304.38, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.22, -18.15, -328.01, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.55, -14.81, -343.63, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 648.9, -13.05, -360.14, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 668.08, -11.74, -363.53, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 687.32, -13.38, -371.73, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 683.34, -11.89, -390.41, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 701.09, -14.85, -412.3, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 701.44, -16.56, -426.22, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 709.29, -19.56, -445.07, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 717.53, -21.25, -459.67, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 752.87, -21.98, -477.23, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 786.92, -22.61, -512.9, 2, math.random(0,5))
+	MovementLoopAddLocation(NPC, 805.49, -21.7, -551.99, 2, math.random(0,25))
+end
+
+

+ 52 - 0
server/SpawnScripts/ElddarGrove/MadrethalSummerspeak.lua

@@ -27,3 +27,55 @@ function hailed(NPC, Spawn)
 
 end
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 648.84, -18.91, -234.92, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 646.07, -18.74, -257.91, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 606.34, -20.89, -257.81, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 642.56, -18.86, -258.37, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 650.43, -21.07, -288.05, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.37, -21.69, -293.22, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 651.99, -21.73, -305.33, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 647.05, -19.16, -323.38, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 647.29, -11.71, -388.38, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 658.21, -10.61, -396.95, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 680.99, -11.78, -392.94, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 697.53, -14.19, -410.92, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 701.38, -16.57, -426.35, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 709.3, -20.04, -448.29, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 712.45, -20.97, -456.77, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 744.98, -22.31, -472.95, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 768.56, -21.8, -495.14, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 780.53, -21.99, -508.32, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 803.66, -21.61, -551.4, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 780.53, -21.99, -508.32, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 768.56, -21.8, -495.14, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 744.98, -22.31, -472.95, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 712.45, -20.97, -456.77, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 709.3, -20.04, -448.29, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 701.38, -16.57, -426.35, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 697.53, -14.19, -410.92, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 680.99, -11.78, -392.94, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 658.21, -10.61, -396.95, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 647.29, -11.71, -388.38, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 647.05, -19.16, -323.38, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 651.99, -21.73, -305.33, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.37, -21.69, -293.22, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 650.43, -21.07, -288.05, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 642.56, -18.86, -258.37, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 606.34, -20.89, -257.81, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 646.07, -18.74, -257.91, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 648.84, -18.91, -234.92, 2, math.random(0,8))
+end
+
+

+ 26 - 0
server/SpawnScripts/ElddarGrove/Mina.lua

@@ -21,3 +21,29 @@ function hailed(NPC, Spawn)
 
 end
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 610.73, -21.11, -232.03, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 634.45, -19.4, -257.15, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 653.33, -19.06, -269.45, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 683.06, -19.57, -277.29, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 699.51, -17.27, -324.09, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 716.17, -17.04, -329.63, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 734.96, -17.92, -326.29, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 743.56, -20.67, -334.42, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 734.96, -17.92, -326.29, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 716.17, -17.04, -329.63, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 699.51, -17.27, -324.09, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 683.06, -19.57, -277.29, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 653.33, -19.06, -269.45, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 634.45, -19.4, -257.15, 2, math.random(0,15))
+	MovementLoopAddLocation(NPC, 610.73, -21.11, -232.03, 2, math.random(0,15))
+end
+
+

+ 35 - 0
server/SpawnScripts/ElddarGrove/SolomenStormwatch.lua

@@ -20,4 +20,39 @@ function hailed(NPC, Spawn)
 	end
 
 end
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+end
 
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 777.54, -21.87, -343.22, 2, math.random(0,20))
+	MovementLoopAddLocation(NPC, 772.62, -18.87, -330.06, 2, 0)
+	MovementLoopAddLocation(NPC, 740.87, -16.36, -299.49, 2, 0)
+	MovementLoopAddLocation(NPC, 732.93, -17.04, -292.62, 2, 0)
+	MovementLoopAddLocation(NPC, 722.48, -17.15, -283.36, 2, 0)
+	MovementLoopAddLocation(NPC, 652.64, -18.32, -241.32, 2, 0)
+	MovementLoopAddLocation(NPC, 651.35, -21.59, -292.71, 2, 0)
+	MovementLoopAddLocation(NPC, 642.38, -13.12, -368.42, 2, 0)
+	MovementLoopAddLocation(NPC, 650.67, -11.5, -392.98, 2, 0)
+	MovementLoopAddLocation(NPC, 639.35, -12.48, -397.18, 2, 0)
+	MovementLoopAddLocation(NPC, 618.26, -15.59, -401.83, 2, 0)
+	MovementLoopAddLocation(NPC, 603.65, -17.89, -390.81, 2, math.random(0,20))
+	MovementLoopAddLocation(NPC, 618.26, -15.59, -401.83, 2, 0)
+	MovementLoopAddLocation(NPC, 639.35, -12.48, -397.18, 2, 0)
+	MovementLoopAddLocation(NPC, 650.67, -11.5, -392.98, 2, 0)
+	MovementLoopAddLocation(NPC, 642.38, -13.12, -368.42, 2, 0)
+	MovementLoopAddLocation(NPC, 651.35, -21.59, -292.71, 2, 0)
+	MovementLoopAddLocation(NPC, 652.64, -18.32, -241.32, 2, 0)
+	MovementLoopAddLocation(NPC, 722.48, -17.15, -283.36, 2, 0)
+	MovementLoopAddLocation(NPC, 732.93, -17.04, -292.62, 2, 0)
+	MovementLoopAddLocation(NPC, 740.87, -16.36, -299.49, 2, 0)
+	MovementLoopAddLocation(NPC, 772.62, -18.87, -330.06, 2, 0)
+	MovementLoopAddLocation(NPC, 777.54, -21.87, -343.22, 2, math.random(0,20))
+end

+ 51 - 0
server/SpawnScripts/ElddarGrove/ThomasBoatmend.lua

@@ -21,3 +21,54 @@ function hailed(NPC, Spawn)
 
 end
 
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 608.2, -22.42, -262.67, 2, math.random(0,40))
+	MovementLoopAddLocation(NPC, 628, -19.98, -255.72, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 648.99, -18.69, -259.97, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 668.55, -17.16, -252.57, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 696.95, -16.92, -266.28, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 727.46, -17.12, -283.24, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 748.5, -16.63, -286.53, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 772.33, -18.05, -316.26, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 771.52, -21.32, -339.44, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 769.78, -19.46, -332.72, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 707.06, -17.27, -330.28, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.79, -20.69, -284.66, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 648.31, -13.81, -350.1, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 649, -13.04, -360.21, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 705.57, -15.84, -377.92, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 700.97, -16.22, -424.97, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 710.26, -20.39, -450.74, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 700.58, -16.23, -425.43, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 679.65, -12.02, -416.88, 2, math.random(0,40))
+	MovementLoopAddLocation(NPC, 700.58, -16.23, -425.43, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 710.26, -20.39, -450.74, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 700.97, -16.22, -424.97, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 705.57, -15.84, -377.92, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 649, -13.04, -360.21, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 648.31, -13.81, -350.1, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 652.79, -20.69, -284.66, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 707.06, -17.27, -330.28, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 769.78, -19.46, -332.72, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 771.52, -21.32, -339.44, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 772.33, -18.05, -316.26, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 748.5, -16.63, -286.53, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 727.46, -17.12, -283.24, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 696.95, -16.92, -266.28, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 668.55, -17.16, -252.57, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 648.99, -18.69, -259.97, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 628, -19.98, -255.72, 2, math.random(0,8))
+	MovementLoopAddLocation(NPC, 608.2, -22.42, -262.67, 2, math.random(0,40))
+end
+

+ 44 - 0
server/SpawnScripts/ElddarGrove/VelisarrMorningdew.lua

@@ -21,3 +21,47 @@ function hailed(NPC, Spawn)
 
 end
 
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 605.46, -20.85, -258.55, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 635.95, -19.24, -257.15, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 650.38, -20.6, -283.68, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 651.79, -21.73, -293.48, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 645.56, -13.32, -360.51, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 691.01, -13.83, -373.44, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 684.74, -11.95, -393.07, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 697.74, -14.25, -411.29, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 702.22, -16.71, -426.62, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 711.01, -20.44, -449.76, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 723.23, -21.69, -461.71, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 747.92, -22.31, -474.89, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 778.72, -21.82, -502.99, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 794.88, -22.25, -536.31, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 808.93, -21.16, -532.73, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 794.88, -22.25, -536.31, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 778.72, -21.82, -502.99, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 747.92, -22.31, -474.89, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 723.23, -21.69, -461.71, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 711.01, -20.44, -449.76, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 702.22, -16.71, -426.62, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 697.74, -14.25, -411.29, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 684.74, -11.95, -393.07, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 691.01, -13.83, -373.44, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 645.56, -13.32, -360.51, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 651.79, -21.73, -293.48, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 650.38, -20.6, -283.68, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 635.95, -19.24, -257.15, 2, math.random(0,3))
+	MovementLoopAddLocation(NPC, 605.46, -20.85, -258.55, 2, math.random(0,3))
+end
+

+ 15 - 99
server/SpawnScripts/ElddarGrove/WesaelanBrookshadow.lua

@@ -1,14 +1,11 @@
 --[[
 	Script Name	: SpawnScripts/ElddarGrove/WesaelanBrookshadow.lua
 	Script Purpose	: Wesaelan Brookshadow 
-	Script Author	: premierio015
-	Script Date	: 2020.05.24
-	Script Notes	: Offer quests Journal of Elkare, Recovery of The Bloodsaber Plans.
+	Script Author	: John Adams
+	Script Date	: 2008.09.28
+	Script Notes	: Auto-Generated Conversation from PacketParser Data
 --]]
 
-JournalOfElkare = 554
-RecoveryOfTheBloodsaberPlans = 555
-
 function spawn(NPC)
 end
 
@@ -20,101 +17,20 @@ function hailed(NPC, Spawn)
 	FaceTarget(NPC, Spawn)
 	conversation = CreateConversation()
 
-	PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_01.mp3", "", "", 2834600234, 1504715618, Spawn)
-        if not HasQuest(Spawn, JournalOfElkare) and not HasCompletedQuest(Spawn, JournalOfElkare) then
-        AddConversationOption(conversation, "Is there anything I can assist the order with?", "dlg_01")
-        end
-        if GetQuestStep(Spawn, JournalOfElkare) == 2 then
-        AddConversationOption(conversation, "I've returned with the tome, though I had to take it from a group of brigands.", "dlg_03")
-        end
-        if HasCompletedQuest(Spawn, JournalOfElkare) and not HasCompletedQuest(Spawn, RecoveryOfTheBloodsaberPlans) then
-        AddConversationOption(conversation, "Did you ever happen to find out more about the tome?", "dlg_04")
-        end
-        if GetQuestStep(Spawn, RecoveryOfTheBloodsaberPlans) == 2 then
-        AddConversationOption(conversation, "I managed to retrieve a letter from one of the Bloodsabers.", "RecoveryOfTheBloodsaberPlansComplete")
-        end
-	AddConversationOption(conversation, "Thank you, and good day to you.")
+		PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_01.mp3", "", "", 2834600234, 1504715618, Spawn)
+	AddConversationOption(conversation, "Thank you, and good day to you.", "dlg_13_1")
 	StartConversation(conversation, NPC, Spawn, "Hail traveler!  All friends of the Elddar are welcome.")
-end
-
-
--- JOURNAL OF ELKARE (QUEST 1)
-
-function dlg_01(NPC, Spawn)
-         FaceTarget(NPC, Spawn)
-         conversation = CreateConversation()
-
-         PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_06.mp3", "", "", 3658794713, 1958132476, Spawn)
-         AddConversationOption(conversation, "I'm certainly interested.", "dlg_02")
-         AddConversationOption(conversation, "If only I had more time myself...")
-         StartConversation(conversation, NPC, Spawn, "I've uncovered the location of a tome hidden by Karana's  followers long before the gods left this world.  I recently discovered its location with the aid of Duvos.  My duties here do not permit the time to recover the tome. I can charge you with recovering this treasure - if you're capable of such an invaluable task.")
-end
-
-function dlg_02(NPC,Spawn)
-        FaceTarget(NPC, Spawn)
-	conversation = CreateConversation()
-        PlayVoice(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_07.mp3", 2198545159, 1480496199)
-        AddConversationOption(conversation, "I can do this!", "qoffer")
-        StartConversation(conversation, NPC, Spawn, "You will need to venture to the great oak in the fields outside the city where the tome has been hidden for many decades. You must thoroughly search the tree. Remember, the tome has been missing for many years. Use care when handling this precious treasure.")
-end
-
+	if convo==14 then
+		PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_01.mp3", "", "", 2834600234, 1504715618, Spawn)
+		AddConversationOption(conversation, "Thank you, and good day to you.", "dlg_14_1")
+		StartConversation(conversation, NPC, Spawn, "Hail traveler!  All friends of the Elddar are welcome.")
+	end
 
-function dlg_03(NPC, Spawn)
-        FaceTarget(NPC, Spawn)
-        conversation = CreateConversation()
-        PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_08.mp3", "", "", 2710196423, 479366863, Spawn)
-        AddConversationOption(conversation, "They mentioned using the tome to raise some great leader.", "JournalOfElkareComplete")
-        StartConversation(conversation, NPC, Spawn, "Brigands!  How would they find the location of the tome? I don't believe mere bandits could achieve such a task. What did these fiends look like? Did they speak of anything peculiar?")
-end
- 
-
-function JournalOfElkareComplete(NPC, Spawn)
-     FaceTarget(NPC, Spawn)
-     SetStepComplete(Spawn, JournalOfElkare, 2)
-     conversation = CreateConversation()
-     PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_05.mp3", "", "", 3221820623, 129429736, Spawn)
-     AddConversationOption(conversation, "My pleasure to be of service.")
-     StartConversation(conversation, NPC, Spawn, "Please, say it isn't so ... Could they be attempting to raise an ancient Bloodsaber leader? How would this tome aid them in this task? To my knowledge, the tome is only a written historical record. Indeed, this requires further investigation! You've served us well, good friend. Take this coin with my blessing.")
-end
+	if convo==15 then
+		PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_01.mp3", "", "", 2834600234, 1504715618, Spawn)
+		AddConversationOption(conversation, "Thank you, and good day to you.", "dlg_15_1")
+		StartConversation(conversation, NPC, Spawn, "Hail traveler!  All friends of the Elddar are welcome.")
+	end
 
--- RECOVERY OF THE BLOODSABER PLANS (QUEST 2)
-
-function dlg_04(NPC, Spawn)
-     FaceTarget(NPC, Spawn)
-     conversation = CreateConversation()
-     PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_15.mp3", "", "", 2951793076, 1507607629, Spawn)
-     AddConversationOption(conversation, "Interesting... that would explain the brigands...", "dlg_05")
-     AddConversationOption(conversation, "Let them be.  I've no real quarrel with them.")
-     StartConversation(conversation, NPC, Spawn, "I do thank you. I'm very glad you've returned, for I have an urgent matter to discuss with you. The Bloodsabers have been active. I know it's hard to believe, but the evidence cannot be denied.")
-end 
-   
-function dlg_05(NPC, Spawn)
-     FaceTarget(NPC, Spawn)
-     conversation = CreateConversation()
-     PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_16.mp3", "", "", 111703684, 2397290337, Spawn)
-     AddConversationOption(conversation, "I certainly can.", "qoffer2")
-     StartConversation(conversation, NPC, Spawn, "According to the rumors, the more active members are lurking in the catacombs under the city. It's hard to find good help in the Down Below. We need you to penetrate the Vermin Snye and find out what the Bloodsabers' orders are. Can you do it?")
-end
-   
-function RecoveryOfTheBloodsaberPlansComplete(NPC, Spawn)
-    FaceTarget(NPC, Spawn)
-    SetStepComplete(Spawn, RecoveryOfTheBloodsaberPlans, 2)
-    conversation = CreateConversation()
-    PlayFlavor(NPC, "voiceover/english/optional4/wesaelan_brookshadow/brookshadow_18.mp3", "", "", 3046972163, 3011859959, Spawn)
-    AddConversationOption(conversation, "I will speak with her immediately.")
-    StartConversation(conversation, NPC, Spawn, "Take it to Captain Eitoa at once. The duty to stop this resurgence of the Bloodsabers has fallen on her shoulders. She's been watching their suspicious movements and will certainly welcome this piece of intelligence. The Bloodsabers will cease their scheming once and for all!")
-end
-   
-function qoffer(NPC, Spawn)
-       FaceTarget(NPC, Spawn)
-       OfferQuest(NPC, Spawn, JournalOfElkare)
 end
 
-function qoffer2(NPC, Spawn)
-       FaceTarget(NPC, Spawn)
-        OfferQuest(NPC, Spawn, RecoveryOfTheBloodsaberPlans)
-end
-
-
-
-

+ 22 - 22
server/SpawnScripts/Qeynos/cahptor.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	cahptor.lua
-	Script Purpose	:	Waypoint Path for cahptor.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:29:07 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	cahptor.lua
+	Script Purpose	:	Waypoint Path for cahptor.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:29:07 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 684.98, -20.52, 267.48, 2, 0)
 	MovementLoopAddLocation(NPC, 673.17, -19.49, 229.65, 2, 0)
@@ -44,6 +44,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 679.47, -19.74, 220.74, 2, 0)
 	MovementLoopAddLocation(NPC, 673.17, -19.49, 229.65, 2, 0)
 	MovementLoopAddLocation(NPC, 684.98, -20.52, 267.48, 2, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/Qeynos/chapman.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	chapman.lua
-	Script Purpose	:	Waypoint Path for chapman.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 12:23:48 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	chapman.lua
+	Script Purpose	:	Waypoint Path for chapman.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 12:23:48 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 413.02, -20.94, 157.49, 2, 0)
 	MovementLoopAddLocation(NPC, 431.34, -20.77, 177.7, 2, 0)
@@ -48,6 +48,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 452.04, -21.98, 240.54, 2, 0)
 	MovementLoopAddLocation(NPC, 431.34, -20.77, 177.7, 2, 0)
 	MovementLoopAddLocation(NPC, 413.02, -20.94, 157.49, 2, 0)
-end
-
+end
+
 

+ 23 - 22
server/SpawnScripts/Qeynos/cloudsend.lua

@@ -1,23 +1,24 @@
---[[
-	Script Name		:	cloudsend.lua
-	Script Purpose	:	Waypoint Path for cloudsend.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 01:50:27 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	cloudsend.lua
+	Script Purpose	:	Waypoint Path for cloudsend.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 01:50:27 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	PlayFlavor(NPC, "voiceover/english/optional2/woodelf_eco_good_2/ft/woodelf/woodelf_eco_good_2_aoi_gf_e67f1023.mp3", "Such a beautiful day!  All I need now is a nice vintage of elven mulberry and my relaxation will be complete.", "stretch", 3245673411, 1934163553, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 443.86, -20.59, 201.35, 2, 0)
 	MovementLoopAddLocation(NPC, 435.86, -20.59, 185.28, 2, 0)
@@ -64,6 +65,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 438.19, -20.52, 181.9, 2, 0)
 	MovementLoopAddLocation(NPC, 435.86, -20.59, 185.28, 2, 0)
 	MovementLoopAddLocation(NPC, 443.86, -20.59, 201.35, 2, 0)
-end
-
+end
+
 

+ 51 - 22
server/SpawnScripts/Qeynos/dillon.lua

@@ -1,23 +1,52 @@
---[[
-	Script Name		:	dillon.lua
-	Script Purpose	:	Waypoint Path for dillon.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 01:06:06 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	dillon.lua
+	Script Purpose	:	Waypoint Path for dillon.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 01:06:06 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_2_1004.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Nothing.", "dlg_0_1")
+	StartConversation(conversation, NPC, Spawn, "Excuse me?")
+	if convo==3 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_3_1004.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Nothing.", "dlg_3_1")
+		StartConversation(conversation, NPC, Spawn, "Excuse me?")
+	end
+
+	if convo==4 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_3_1004.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Nothing.", "dlg_4_1")
+		StartConversation(conversation, NPC, Spawn, "Excuse me?")
+	end
+
+	if convo==25 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_1_1004.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Nothing.", "dlg_25_1")
+		StartConversation(conversation, NPC, Spawn, "Excuse me?")
+	end
+
+	if convo==26 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_2_1004.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Nothing.", "dlg_26_1")
+		StartConversation(conversation, NPC, Spawn, "Excuse me?")
+	end
+
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 600.22, -18.07, 236.06, 2, 0)
 	MovementLoopAddLocation(NPC, 592.73, -18.05, 237.94, 2, 0)
@@ -52,6 +81,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 583.55, -17.95, 239.05, 2, 0)
 	MovementLoopAddLocation(NPC, 592.73, -18.05, 237.94, 2, 0)
 	MovementLoopAddLocation(NPC, 600.22, -18.07, 236.06, 2, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/Qeynos/erwin.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	erwin.lua
-	Script Purpose	:	Waypoint Path for erwin.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 02:39:02 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	erwin.lua
+	Script Purpose	:	Waypoint Path for erwin.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 02:39:02 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 698.34, -19.9, 131.15, 2, 0)
 	MovementLoopAddLocation(NPC, 677.48, -21.02, 142.28, 2, 0)
@@ -36,6 +36,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 680.55, -20.76, 155.63, 2, 0)
 	MovementLoopAddLocation(NPC, 677.48, -21.02, 142.28, 2, 0)
 	MovementLoopAddLocation(NPC, 698.34, -19.9, 131.15, 2, 30)
-end
-
+end
+
 

+ 192 - 22
server/SpawnScripts/Qeynos/iceslayer.lua

@@ -1,23 +1,193 @@
---[[
-	Script Name		:	iceslayer.lua
-	Script Purpose	:	Waypoint Path for iceslayer.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 07:24:41 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	iceslayer.lua
+	Script Purpose	:	Waypoint Path for iceslayer.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 07:24:41 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_2_1001.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Why didn't he get any sleep last night?", "dlg_2_1")
+		AddConversationOption(conversation, "No problem.  I'll just leave him be.  ")
+	StartConversation(conversation, NPC, Spawn, "Pay no attention to Warley down there he just probably didn't sleep last night and is a little grumpy. Isn't that right Warley?")
+	if convo==7 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_2_1001.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Why didn't he get any sleep last night?", "dlg_7_1")
+		AddConversationOption(conversation, "No bother... any chores I can help with?")
+		AddConversationOption(conversation, "No problem.  I'll just leave him be.  ")
+		StartConversation(conversation, NPC, Spawn, "Pay no attention to Warley down there he just probably didn't sleep last night and is a little grumpy. Isn't that right Warley?")
+	end
+
+	if convo==8 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_1_1001.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Why didn't he get any sleep last night?", "dlg_8_1")
+		AddConversationOption(conversation, "No bother... any chores I can help with?")
+		AddConversationOption(conversation, "No problem.  I'll just leave him be.  ")
+		StartConversation(conversation, NPC, Spawn, "Pay no attention to Warley down there he just probably didn't sleep last night and is a little grumpy. Isn't that right Warley?")
+	end
+
+	if convo==9 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_1_1001.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Why didn't he get any sleep last night?", "dlg_9_1")
+		AddConversationOption(conversation, "No bother... any chores I can help with?")
+		AddConversationOption(conversation, "No problem.  I'll just leave him be.  ")
+		StartConversation(conversation, NPC, Spawn, "Pay no attention to Warley down there he just probably didn't sleep last night and is a little grumpy. Isn't that right Warley?")
+	end
+
+	if convo==10 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_2_1001.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Why didn't he get any sleep last night?", "dlg_10_1")
+		AddConversationOption(conversation, "No bother... any chores I can help with?")
+		AddConversationOption(conversation, "No problem.  I'll just leave him be.  ")
+		StartConversation(conversation, NPC, Spawn, "Pay no attention to Warley down there he just probably didn't sleep last night and is a little grumpy. Isn't that right Warley?")
+	end
+
+	if convo==11 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_3_1001.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Why didn't he get any sleep last night?", "dlg_11_1")
+		AddConversationOption(conversation, "No bother... any chores I can help with?")
+		AddConversationOption(conversation, "No problem.  I'll just leave him be.  ")
+		StartConversation(conversation, NPC, Spawn, "Pay no attention to Warley down there he just probably didn't sleep last night and is a little grumpy. Isn't that right Warley?")
+	end
+
+	if convo==12 then
+		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_3_1001.mp3", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Why didn't he get any sleep last night?", "dlg_12_1")
+		AddConversationOption(conversation, "No bother... any chores I can help with?")
+		AddConversationOption(conversation, "No problem.  I'll just leave him be.  ")
+		StartConversation(conversation, NPC, Spawn, "Pay no attention to Warley down there he just probably didn't sleep last night and is a little grumpy. Isn't that right Warley?")
+	end
+
+end
+
+function dlg_2_1(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "What is so scary about the Tomb of Varsoon?", "dlg_2_2")
+		AddConversationOption(conversation, "Sounds like a place I don't want to go to myself.  ")
+	StartConversation(conversation, NPC, Spawn, "Warley went to the Tomb of Varsoon to prove he wasn't afraid of walking around on those islands. Sure enough, he didn't get to the first bridge before turning tail and running back home. Poor thing ... all grumpy ... no sleep.")
+end
+
+function dlg_2_2(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "It sounds like a place I'd like to explore.", "dlg_2_3")
+		AddConversationOption(conversation, "I'll be sure to steer clear from it.  ")
+	StartConversation(conversation, NPC, Spawn, "The tomb once held an evil mage - Varsoon the Undying. He was involved in the War of the Plagues centuries ago.  The Cataclysm must have weakened the mage's spells on that place, because he didn't stick around.  The Concordium says that Varsoon is long gone, but you wouldn't catch me dead there!")
+end
+
+function dlg_2_3(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "I'll be careful.  Thank you for the directions.", "dlg_2_4")
+	StartConversation(conversation, NPC, Spawn, "Heck, I'll tell you where it is! Turn left as you leave the city gates; go through Klicnik Fields. You'll see the islands the tomb rests on.  You go any further ... well, that's your decision, not mine.")
+end
+
+function dlg_8_1(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Ready, willing and able!")
+	StartConversation(conversation, NPC, Spawn, "Chores you ask? I planned on heading out to the caves to gather some spider venom sacs, but if you're willing and able, I'll let you handle this task. I'll need at least five of the sacs.")
+end
+
+function dlg_9_1(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "What is so scary about the Tomb of Varsoon?", "dlg_9_2")
+		AddConversationOption(conversation, "Sounds like a place I don't want to go to myself.  ")
+	StartConversation(conversation, NPC, Spawn, "Warley went to the Tomb of Varsoon to prove he wasn't afraid of walking around on those islands. Sure enough, he didn't get to the first bridge before turning tail and running back home. Poor thing ... all grumpy ... no sleep.")
+end
+
+function dlg_10_1(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "What is so scary about the Tomb of Varsoon?", "dlg_10_2")
+		AddConversationOption(conversation, "Sounds like a place I don't want to go to myself.  ")
+	StartConversation(conversation, NPC, Spawn, "Warley went to the Tomb of Varsoon to prove he wasn't afraid of walking around on those islands. Sure enough, he didn't get to the first bridge before turning tail and running back home. Poor thing ... all grumpy ... no sleep.")
+end
+
+function dlg_10_2(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "It sounds like a place I'd like to explore.", "dlg_10_3")
+		AddConversationOption(conversation, "I'll be sure to steer clear from it.  ")
+	StartConversation(conversation, NPC, Spawn, "The tomb once held an evil mage - Varsoon the Undying. He was involved in the War of the Plagues centuries ago.  The Cataclysm must have weakened the mage's spells on that place, because he didn't stick around.  The Concordium says that Varsoon is long gone, but you wouldn't catch me dead there!")
+end
+
+function dlg_11_1(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "What is so scary about the Tomb of Varsoon?", "dlg_11_2")
+		AddConversationOption(conversation, "Sounds like a place I don't want to go to myself.  ")
+	StartConversation(conversation, NPC, Spawn, "Warley went to the Tomb of Varsoon to prove he wasn't afraid of walking around on those islands. Sure enough, he didn't get to the first bridge before turning tail and running back home. Poor thing ... all grumpy ... no sleep.")
+end
+
+function dlg_11_2(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "It sounds like a place I'd like to explore.", "dlg_11_3")
+		AddConversationOption(conversation, "I'll be sure to steer clear from it.  ")
+	StartConversation(conversation, NPC, Spawn, "The tomb once held an evil mage - Varsoon the Undying. He was involved in the War of the Plagues centuries ago.  The Cataclysm must have weakened the mage's spells on that place, because he didn't stick around.  The Concordium says that Varsoon is long gone, but you wouldn't catch me dead there!")
+end
+
+function dlg_11_3(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "I'll be careful.  Thank you for the directions.", "dlg_11_4")
+	StartConversation(conversation, NPC, Spawn, "Heck, I'll tell you where it is! Turn left as you leave the city gates; go through Klicnik Fields. You'll see the islands the tomb rests on.  You go any further ... well, that's your decision, not mine.")
+end
+
+function dlg_12_1(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "Ready, willing and able!")
+	StartConversation(conversation, NPC, Spawn, "Chores you ask? I planned on heading out to the caves to gather some spider venom sacs, but if you're willing and able, I'll let you handle this task. I'll need at least five of the sacs.")
+end
+
+function dlg_12_2(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "", "", "", 0, 0, Spawn)
+		AddConversationOption(conversation, "All right.", "dlg_12_3")
+	StartConversation(conversation, NPC, Spawn, "Good! Bring them back here as soon as you have them.")
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 541.45, -3.5, 136.91, 2, 0)
 	MovementLoopAddLocation(NPC, 526.93, -3.5, 136.14, 2, 0)
@@ -46,6 +216,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 510.52, -3.48, 134.38, 2, 0)
 	MovementLoopAddLocation(NPC, 526.93, -3.5, 136.14, 2, 0)
 	MovementLoopAddLocation(NPC, 541.45, -3.5, 136.91, 2, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/Qeynos/ilgar.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	ilgar.lua
-	Script Purpose	:	Waypoint Path for ilgar.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 02:45:39 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	ilgar.lua
+	Script Purpose	:	Waypoint Path for ilgar.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 02:45:39 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 469.14, -20.96, 194.86, 2, 0)
 	MovementLoopAddLocation(NPC, 406.76, -20.87, 145.25, 2, 0)
@@ -34,6 +34,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 421.86, -20.93, 168.96, 2, 0)
 	MovementLoopAddLocation(NPC, 406.76, -20.87, 145.25, 2, 0)
 	MovementLoopAddLocation(NPC, 469.14, -20.96, 194.86, 2, 0)
-end
-
+end
+
 

+ 23 - 22
server/SpawnScripts/Qeynos/kelin.lua

@@ -1,23 +1,24 @@
---[[
-	Script Name		:	kelin.lua
-	Script Purpose	:	Waypoint Path for kelin.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 04:25:35 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	kelin.lua
+	Script Purpose	:	Waypoint Path for kelin.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 04:25:35 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+		PlayFlavor(NPC, "voiceover/english/highelf_eco_race_good/ft/eco/good/highelf_eco_race_good_hail_gf_910f06b6.mp3", "Tunare blesses those who remain faithful and trust in her return.", "", 2463890902, 2461742088, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 471.49, -11.52, 134.86, 2, 30)
 	MovementLoopAddLocation(NPC, 492.73, -11.49, 142.63, 2, 0)
@@ -68,6 +69,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 504.77, -11.33, 145.99, 2, 0)
 	MovementLoopAddLocation(NPC, 492.73, -11.49, 142.63, 2, 0)
 	MovementLoopAddLocation(NPC, 471.49, -11.52, 134.86, 2, 0)
-end
-
+end
+
 

+ 26 - 22
server/SpawnScripts/Qeynos/kenika.lua

@@ -1,23 +1,27 @@
---[[
-	Script Name		:	kenika.lua
-	Script Purpose	:	Waypoint Path for kenika.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 02:29:10 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	
-	end
-
+--[[
+	Script Name		:	kenika.lua
+	Script Purpose	:	Waypoint Path for kenika.lua
+	Script Author	:	Devn00b additions by Cynnar
+	Script Date		:	04/10/2020 02:29:10 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+
+function spawn(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+	waypoints(NPC)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function InRange(NPC, Spawn)
+end
+
+function LeaveRange(NPC, Spawn)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 469.88, -11.53, 130.15, 2, 0)
 	MovementLoopAddLocation(NPC, 474.56, -11.53, 136.07, 2, 0)
@@ -62,6 +66,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 478.76, -11.53, 137.32, 2, 0)
 	MovementLoopAddLocation(NPC, 474.56, -11.53, 136.07, 2, 0)
 	MovementLoopAddLocation(NPC, 469.88, -11.53, 130.15, 2, 0)
-end
-
+end
+
 

+ 23 - 22
server/SpawnScripts/Qeynos/klenthall.lua

@@ -1,23 +1,24 @@
---[[
-	Script Name		:	klenthall.lua
-	Script Purpose	:	Waypoint Path for klenthall.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 02:44:46 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	klenthall.lua
+	Script Purpose	:	Waypoint Path for klenthall.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 02:44:46 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	PlayFlavor(NPC, "", "I am not at all interested in fish, so please, do not mention them to me.", "", 1689589577, 4560189, Spawn)
+	end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 618.33, -12.24, 145.93, 2, 0)
 	MovementLoopAddLocation(NPC, 621.58, -16.61, 198.95, 2, 0)
@@ -90,6 +91,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 605.95, -15.67, 202.3, 2, 0)
 	MovementLoopAddLocation(NPC, 621.58, -16.61, 198.95, 2, 0)
 	MovementLoopAddLocation(NPC, 618.33, -12.24, 145.93, 2, 0)
-end
-
+end
+
 

+ 31 - 22
server/SpawnScripts/Qeynos/lanalie.lua

@@ -1,23 +1,32 @@
---[[
-	Script Name		:	lanalie.lua
-	Script Purpose	:	Waypoint Path for raleigh.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:51:30 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	raleigh.lua
+	Script Purpose	:	Waypoint Path for raleigh.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:51:30 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+	waypoints(NPC)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function InRange(NPC, Spawn)
+		FaceTarget(NPC, Spawn)
+		PlayFlavor(NPC, "voiceover/english/optional2/highelf_eco_good_1/ft/service/guard/highelf_guard_service_good_1_hail_gf_fb093bc0.mp3", "Good day to you, citizen! All preserve Queen Antonia.", "salute", 3107888555, 4143955557, Spawn)
+end
+
+function LeaveRange(NPC, Spawn)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 518.13, -10.48, 148.06, 6.0, 1)
 	MovementLoopAddLocation(NPC, 546.76, -10.58, 151.7, 6, 0)
@@ -50,6 +59,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 619.74, -12.25, 144.07, 6, 0)
 	MovementLoopAddLocation(NPC, 546.76, -10.58, 151.7, 6, 0)
 	MovementLoopAddLocation(NPC, 518.13, -10.48, 148.06, 6, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/Qeynos/lawler.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	lawler.lua
-	Script Purpose	:	Waypoint Path for lawler.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 03:26:50 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-end
-
+--[[
+	Script Name		:	lawler.lua
+	Script Purpose	:	Waypoint Path for lawler.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 03:26:50 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 382.78, -20.35, 209.21, 2, 30)
 	MovementLoopAddLocation(NPC, 416.29, -20.5, 224.76, 2, 0)
@@ -52,6 +52,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 422.42, -20.16, 228.13, 2, 0)
 	MovementLoopAddLocation(NPC, 416.29, -20.5, 224.76, 2, 0)
 	MovementLoopAddLocation(NPC, 382.78, -20.35, 209.21, 2, 0)
-end
-
+end
+
 

+ 41 - 22
server/SpawnScripts/Qeynos/loowoonla.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	loowoonla.lua
-	Script Purpose	:	Waypoint Path for loowoonla.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 02:13:55 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-end
-
+--[[
+	Script Name		:	loowoonla.lua
+	Script Purpose	:	Waypoint Path for loowoonla.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 02:13:55 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+		end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 673.87, -17.95, 193.59, 2, 0)
 	MovementLoopAddLocation(NPC, 680.77, -19.28, 191.96, 2, 0)
@@ -52,6 +52,25 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 679.3, -19.37, 187.84, 2, 0)
 	MovementLoopAddLocation(NPC, 680.77, -19.28, 191.96, 2, 0)
 	MovementLoopAddLocation(NPC, 673.87, -17.95, 193.59, 2, 0)
-end
-
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,5)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/erudite_eco_good_1/ft/erudite/erudite_eco_good_1_aoi_gf_7fcbca60.mp3", "An era of darkness has finally come to a close. Now we must see what future Norrath has in store.", "confused", 2437621868, 2071976840, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/erudite_eco_good_1/ft/erudite/erudite_eco_good_1_hail_gf_5453f96d.mp3", "Paradise has always been here on Norrath for those who are thoughtful and responsible for their actions.", "thanks", 3529954798, 1064012556, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/erudite_eco_good_1/ft/erudite/erudite_eco_good_1_hail_gf_e0bc946.mp3", "I have felt the stirrings of a strong magical influence.  Good fortune will follow to those with the will to persevere!", "ponder", 4152344209, 239250643, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/erudite_eco_good_1/ft/erudite/erudite_eco_good_1_hail_gf_84882e21.mp3", "You must not be afraid to trust others.  Openness is the key to finding a correct solution.", "sigh", 1792907516, 2786700542, Spawn)
+	elseif choice == 5 then
+		PlayFlavor(NPC, "voiceover/english/erudite_eco_good_1/ft/erudite/erudite_eco_good_1_hail_gf_7895591c.mp3", "If we focus on the higher truths that govern our actions, we fathom the underlying power within them.", "curtsey", 2416988832, 3319542974, Spawn)
+	else
+	end
+
+end
 

+ 23 - 22
server/SpawnScripts/Qeynos/marrising.lua

@@ -1,23 +1,24 @@
---[[
-	Script Name		:	Marrising.lua
-	Script Purpose	:	Waypoint Path for Marrising.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 04:46:03 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	Marrising.lua
+	Script Purpose	:	Waypoint Path for Marrising.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 04:46:03 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	PlayFlavor(NPC, "voiceover/english/froglok_eco_good_1/ft/froglok/froglok_eco_good_1_hail_gf_a64f6eec.mp3", "What hast thou done?  When thou greets a Daughter of Marr, a small bow is in order.", "", 2184035287, 59673464, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 707.61, -19.46, 175.9, 2, 0)
 	MovementLoopAddLocation(NPC, 713.7, -19.4, 179.73, 2, 0)
@@ -78,6 +79,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 716.28, -19.45, 181.76, 2, 0)
 	MovementLoopAddLocation(NPC, 713.7, -19.4, 179.73, 2, 0)
 	MovementLoopAddLocation(NPC, 707.61, -19.46, 175.9, 2, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/Qeynos/merriou.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	merriou.lua
-	Script Purpose	:	Waypoint Path for merriou.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:01:50 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	merriou.lua
+	Script Purpose	:	Waypoint Path for merriou.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:01:50 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 678.69, -19.63, 101.23, 2, 0)
 	MovementLoopAddLocation(NPC, 668.32, -21.03, 102.1, 2, 0)
@@ -52,6 +52,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 671.73, -21.21, 136.74, 2, 0)
 	MovementLoopAddLocation(NPC, 668.32, -21.03, 102.1, 2, 0)
 	MovementLoopAddLocation(NPC, 678.69, -19.63, 101.23, 2, 0)
-end
-
+end
+
 

+ 43 - 22
server/SpawnScripts/Qeynos/morgessa.lua

@@ -1,23 +1,44 @@
---[[
-	Script Name		:	morgessa.lua
-	Script Purpose	:	Waypoint Path for morgessa.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:08:55 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	morgessa.lua
+	Script Purpose	:	Waypoint Path for morgessa.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:08:55 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function InRange(NPC, Spawn)
+	local choice = math.random(1,5)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/halfelf_eco_good_1/ft/halfelf/halfelf_eco_good_1_hail_gf_cbbaf023.mp3", "I've gotta get rid of these clothes; they're so one-hundred years ago.", "grumble", 3038038462, 3464193459, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/halfelf_eco_good_1/ft/halfelf/halfelf_eco_good_1_hail_gf_5b0f480.mp3", "I'm tired of waiting!  I want to make something of myself!", "pout", 3723196832, 16921270, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/halfelf_eco_good_1/ft/halfelf/halfelf_eco_good_1_hail_gf_4a0665a0.mp3", "I'm so depressed!  I had to work all day!", "sad", 3176397311, 2616932103, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/halfelf_eco_good_1/ft/halfelf/halfelf_eco_good_1_hail_gf_1f61925a.mp3", "Are my roots showing?  I think I'll go for a light blueberry mixed with jum-jum highlights.", "ponder", 4153154191, 497875539, Spawn)
+	elseif choice == 5 then
+		PlayFlavor(NPC, "voiceover/english/halfelf_eco_good_1/ft/halfelf/halfelf_eco_good_1_hail_gf_5c8eceae.mp3", "My ancestors don't understand me.  They're from a completely different era.", "flustered", 2843616704, 1740340084, Spawn)
+	else
+	end
+end
+
+function LeaveRange(NPC, Spawn)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 704.12, -19.53, 193.02, 2, 0)
 	MovementLoopAddLocation(NPC, 689.53, -19.52, 198.07, 2, 0)
@@ -92,6 +113,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 677.71, -19.31, 186, 2, 0)
 	MovementLoopAddLocation(NPC, 689.53, -19.52, 198.07, 2, 0)
 	MovementLoopAddLocation(NPC, 704.12, -19.53, 193.02, 2, 0)
-end
-
+end
+
 

+ 31 - 22
server/SpawnScripts/Qeynos/ocoggin.lua

@@ -1,23 +1,32 @@
---[[
-	Script Name		:	ocoggin.lua
-	Script Purpose	:	Waypoint Path for ocoggin.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:22:22 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	ocoggin.lua
+	Script Purpose	:	Waypoint Path for ocoggin.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:22:22 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/gnome_eco_race_good/ft/eco/good/gnome_eco_race_good_hail_gf_39da4f6d.mp3", "Cheers and boggle chippers to you!", "", 3143145827, 3768593316, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/gnome_eco_race_good/ft/eco/good/gnome_eco_race_good_barbarian_gf_68486376.mp3", "Watch your step, you rusty-pated, slow-witted, half-turned knob on a cognizoid!  Can't you see I'm busy?", "", 2020911566, 1624319994, Spawn)
+	else
+	end
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 454.21, -11.27, 119.32, 2, 0)
 	MovementLoopAddLocation(NPC, 462.96, -11.34, 117.26, 2, 0)
@@ -46,6 +55,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 473.17, -11.51, 115.77, 2, 0)
 	MovementLoopAddLocation(NPC, 462.96, -11.34, 117.26, 2, 0)
 	MovementLoopAddLocation(NPC, 454.21, -11.27, 119.32, 2, 0)
-end
-
+end
+
 

+ 23 - 22
server/SpawnScripts/Qeynos/percivous.lua

@@ -1,23 +1,24 @@
---[[
-	Script Name		:	percivous.lua
-	Script Purpose	:	Waypoint Path for percivous.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/10/2020 01:16:00 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	percivous.lua
+	Script Purpose	:	Waypoint Path for percivous.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/10/2020 01:16:00 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	PlayFlavor(NPC, "voiceover/english/froglok_eco_good_1/ft/froglok/froglok_eco_good_1_hail_gm_3f899525.mp3", "Alack!  Dost yon adventurers think to aid in the search for the Sons of Marr?", "", 8384978, 3425989342, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 664.3, -21.16, 100.37, 2, 0)
 	MovementLoopAddLocation(NPC, 668.74, -21.28, 142.24, 2, 0)
@@ -48,6 +49,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 705.64, -19.45, 178.15, 2, 0)
 	MovementLoopAddLocation(NPC, 668.74, -21.28, 142.24, 2, 0)
 	MovementLoopAddLocation(NPC, 664.3, -21.16, 100.37, 2, 0)
-end
-
+end
+
 

+ 31 - 22
server/SpawnScripts/Qeynos/quillfingers.lua

@@ -1,23 +1,32 @@
---[[
-	Script Name		:	quillfingers.lua
-	Script Purpose	:	Waypoint Path for quillfingers.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:17:43 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	quillfingers.lua
+	Script Purpose	:	Waypoint Path for quillfingers.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:17:43 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gm_cd9164d6.mp3", "You're a stranger. And I don't like strangers, no sir I don't!", "sulk", 785726454, 3155500140, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gm_75c0e97c.mp3", "Welcome to the city, adventurer. Be mindful of the peace and quiet.  Here in Qeynos, we value our privacy.", "bow", 1955296899, 2249687997, Spawn)
+	else
+	end
+	end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 451.46, -11.41, 116.82, 2, 0)
 	MovementLoopAddLocation(NPC, 470.39, -11.52, 134.93, 2, 0)
@@ -62,6 +71,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 489.07, -11.4, 142.29, 2, 0)
 	MovementLoopAddLocation(NPC, 470.39, -11.52, 134.93, 2, 0)
 	MovementLoopAddLocation(NPC, 451.46, -11.41, 116.82, 2, 0)
-end
-
+end
+
 

+ 23 - 22
server/SpawnScripts/Qeynos/raleigh.lua

@@ -1,23 +1,24 @@
---[[
-	Script Name		:	raleigh.lua
-	Script Purpose	:	Waypoint Path for raleigh.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:51:30 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	raleigh.lua
+	Script Purpose	:	Waypoint Path for raleigh.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:51:30 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	PlayFlavor(NPC, "", "", "no", 1689589577, 4560189, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 518.13, -10.48, 148.06, 6, 0)
 	MovementLoopAddLocation(NPC, 546.76, -10.58, 151.7, 6, 0)
@@ -50,6 +51,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 619.74, -12.25, 144.07, 6, 0)
 	MovementLoopAddLocation(NPC, 546.76, -10.58, 151.7, 6, 0)
 	MovementLoopAddLocation(NPC, 518.13, -10.48, 148.06, 6, 0)
-end
-
+end
+
 

+ 26 - 22
server/SpawnScripts/Qeynos/stanhyl.lua

@@ -1,23 +1,27 @@
---[[
-	Script Name		:	stanhyl.lua
-	Script Purpose	:	Waypoint Path for raleigh.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:51:30 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	raleigh.lua
+	Script Purpose	:	Waypoint Path for raleigh.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:51:30 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function InRange(NPC, Spawn)
+	PlayFlavor(NPC, "voiceover/english/highelf_eco_good_1/ft/service/guard/highelf_guard_service_good_1_hail_gm_ee473c11.mp3", "Good day to you, citizen. All preserve Queen Antonia.", "salute", 2088886924, 3736631596, Spawn)
+end
+
+function LeaveRange(NPC, Spawn)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 518.13, -10.48, 148.06, 6.0, 1.5)
 	MovementLoopAddLocation(NPC, 546.76, -10.58, 151.7, 6.0, 0)
@@ -50,6 +54,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 619.74, -12.25, 144.07, 6, 0)
 	MovementLoopAddLocation(NPC, 546.76, -10.58, 151.7, 6, 0)
 	MovementLoopAddLocation(NPC, 518.13, -10.48, 148.06, 6, 0)
-end
-
+end
+
 

+ 39 - 22
server/SpawnScripts/Qeynos/taseela.lua

@@ -1,23 +1,40 @@
---[[
-	Script Name		:	taseela.lua
-	Script Purpose	:	Waypoint Path for taseela.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 04:00:49 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	taseela.lua
+	Script Purpose	:	Waypoint Path for taseela.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 04:00:49 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	
+	local choice = math.random(1,6)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gf_bc49d3d0.mp3", "Laziness is nothing more than the habit of resting before you get tired.", "yawn", 2068417649, 3867807288, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gf_a3259538.mp3", "You should head by the tavern later on! Every night in Qeynos is cause for celebration.", "cheer", 3875741901, 4154770080, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gf_5b6e8d2f.mp3", "Do you like muffins?  Muffins are my favorite, I eat them every chance I get.", "sigh", 4155434475, 829232573, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gf_3dc6b124.mp3", "Get the wash, get the wash.  This whole city would fall apart if I didn't deliver the clothes on time.  ", "frustrated", 4277096439, 928366048, Spawn)
+	elseif choice == 5 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gf_1b77439f.mp3", "Be on the lookout, friend!  I just spoke to the guards.  I've no doubt gnolls are scouting the nearby area.", "lookaway", 495282965, 1739106402, Spawn)
+	elseif choice == 6 then
+		PlayFlavor(NPC, "voiceover/english/halfling_eco_good_1/ft/halfling/halfling_eco_good_1_hail_gf_6594953c.mp3", "If a thing isn't worth saying, you sing it.", "wink", 1056697572, 3706271932, Spawn)
+	else
+	end
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 471.7, -20.99, 193.86, 2, 0)
 	MovementLoopAddLocation(NPC, 493.1, -12.32, 147.33, 2, 0)
@@ -136,6 +153,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 491.13, -11.45, 135.98, 2, 0)
 	MovementLoopAddLocation(NPC, 493.1, -12.32, 147.33, 2, 0)
 	MovementLoopAddLocation(NPC, 471.7, -20.99, 193.86, 2, 0)
-end
-
+end
+
 

+ 39 - 22
server/SpawnScripts/Qeynos/telethar.lua

@@ -1,23 +1,40 @@
---[[
-	Script Name		:	telethar.lua
-	Script Purpose	:	Waypoint Path for telethar.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 03:06:09 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	telethar.lua
+	Script Purpose	:	Waypoint Path for telethar.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 03:06:09 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+		local choice = math.random(1,6)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/highelf_eco_good_concordium/ft/eco/good/highelf_eco_good_concordium_hail_gf_4121a9b2.mp3", "The Concordium uses ancient and forgotten knowledge to protect us from the shadows that surround Qeynos.", "", 1945306751, 352506246, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/highelf_eco_good_concordium/ft/eco/good/highelf_eco_good_concordium_hail_gf_15aa4eed.mp3", "Those who have neither the abilities nor the aspirations to pursue the intellectual arts will find a home at the Ironforge Exchange.", "", 523104392, 3732258776, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/highelf_eco_good_concordium/ft/eco/good/highelf_eco_good_concordium_hail_gf_88bbd1aa.mp3", "The Tunarian Alliance does not see the greater issues beyond individual evils. Their forests might be scorched wastelands and they would still be fending off poachers.", "", 3133325899, 3316523299, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/highelf_eco_good_concordium/ft/eco/good/highelf_eco_good_concordium_hail_gf_987a9a3c.mp3", "While the Celestial Watch futilely awaits word from its forgotten gods the Concordium has harnessed the true power that blazes within each of us.", "", 3806603086, 3205979382, Spawn)
+	elseif choice == 5 then
+		PlayFlavor(NPC, "voiceover/english/highelf_eco_good_concordium/ft/eco/good/highelf_eco_good_concordium_hail_gf_b52cd580.mp3", "The Qeynos Guard cannot defend us from dark forces it neither sees nor understands.", "", 1941375851, 1104708565, Spawn)
+	elseif choice == 6 then
+		PlayFlavor(NPC, "voiceover/english/highelf_eco_good_concordium/ft/eco/good/highelf_eco_good_concordium_30_gf_1e49a37f.mp3", "Your courageous actions have assisted the Concordium in its quest for all knowledge.", "", 1170821333, 3893107670, Spawn)
+	else
+	end
+
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 566.15, -17.12, 258.02, 2, 0)
 	MovementLoopAddLocation(NPC, 570.57, -17.12, 255.62, 2, 0)
@@ -86,6 +103,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 576.24, -17.12, 254.42, 2, 0)
 	MovementLoopAddLocation(NPC, 570.57, -17.12, 255.62, 2, 0)
 	MovementLoopAddLocation(NPC, 566.15, -17.12, 258.02, 2, 0)
-end
-
+end
+
 

+ 40 - 22
server/SpawnScripts/Qeynos/tesilah.lua

@@ -1,23 +1,41 @@
---[[
-	Script Name		:	tesilah.lua
-	Script Purpose	:	Waypoint Path for tesilah.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 03:21:57 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	tesilah.lua
+	Script Purpose	:	Waypoint Path for tesilah.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 03:21:57 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	local choice = math.random(1,7)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/human/human_eco_good_1_aoi_gm_2c5409ba.mp3", "Another lovely day in the city of Qeynos!", "sigh", 2759856909, 614688407, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/human/human_eco_good_1_hail_gm_ef2b9651.mp3", "Will you quit pestering me?  Don't force me to summon the guards!", "tapfoot", 3345611839, 1442739842, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/human/human_eco_good_1_aoi_gm_4d212798.mp3", "I'm confident that the merchants of our village will fill all equipment needs with the utmost hospitality.", "smile", 2600666744, 586734676, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/human/human_eco_good_1_hail_gm_e58035f3.mp3", "What do you want? Leave me be!", "shrug", 1323474108, 3355478224, Spawn)
+	elseif choice == 5 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/human/human_eco_good_1_hail_gm_9b2049a3.mp3", "Well met, friend.  It's good to make your acquaintance!", "bow", 754727055, 3165426316, Spawn)
+	elseif choice == 6 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/human/human_eco_good_1_hail_gm_7e3b456a.mp3", "Hail, pleasure to meet you.", "agree", 471367832, 2417424572, Spawn)
+	elseif choice == 7 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/human/human_eco_good_1_hail_gm_13b79d2d.mp3", "Welcome...welcome traveler, to the fair city of Qeynos! My, isn't it a magnificent day?", "hello", 3746934207, 794965138, Spawn)
+	else
+	end
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 710.44, -19.45, 176.78, 2, 0)
 	MovementLoopAddLocation(NPC, 708.82, -19.45, 180.77, 2, 0)
@@ -64,6 +82,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 705.8, -19.54, 188.21, 2, 0)
 	MovementLoopAddLocation(NPC, 708.82, -19.45, 180.77, 2, 0)
 	MovementLoopAddLocation(NPC, 710.44, -19.45, 176.78, 2, 0)
-end
-
+end
+
 

+ 32 - 22
server/SpawnScripts/Qeynos/theodoric.lua

@@ -1,23 +1,33 @@
---[[
-	Script Name		:	theodoric.lua
-	Script Purpose	:	Waypoint Path for theodoric.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 07:19:05 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	theodoric.lua
+	Script Purpose	:	Waypoint Path for theodoric.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 07:19:05 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+		local choice = math.random(1,3)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_evil_drunk/ft/eco/evil/human_eco_evil_drunk_barmaid_gm_a1d96f41.mp3", "My stein hasn't any legs to walk over and fill itself up.", "glare", 2656968471, 1396939792, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_evil_drunk/ft/eco/evil/human_eco_evil_drunk_hail_gm_622bfa69.mp3", "What do you mean ye drank more than I did?", "boggle", 3046379177, 1648095152, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_evil_drunk/ft/eco/evil/human_eco_evil_drunk_barmaid_gm_7f76ecc6.mp3", "Hurry up! My stomach's near dry thanks to ya.", "frustrated", 2014105974, 2128019974, Spawn)
+	else
+	end
+	end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 516.1, -9.57, 128.35, 2, 30)
 	MovementLoopAddLocation(NPC, 516.74, -9.57, 131.87, 2, 30)
@@ -31,6 +41,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 572.91, -8.47, 131.8, 2, 0)
 	MovementLoopAddLocation(NPC, 580.87, -8.48, 130.61, 2, 10)
 	MovementLoopAddLocation(NPC, 578.34, -8.48, 127.68, 2, 60)
-end
-
+end
+
 

+ 42 - 22
server/SpawnScripts/Qeynos/treeskipper.lua

@@ -1,23 +1,43 @@
---[[
-	Script Name		:	treeskipper.lua
-	Script Purpose	:	Waypoint Path for treeskipper.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 04:12:39 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	treeskipper.lua
+	Script Purpose	:	Waypoint Path for treeskipper.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 04:12:39 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+function InRange(NPC, Spawn)
+		local choice = math.random(1,5)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_tunarianalliance/ft/eco/good/human_eco_good_tunarianalliance_hail_gm_1bda6347.mp3", "The destructive methods of the Qeynos Guard will ravage that which it seeks to defend.", "", 421213855, 4168573173, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_tunarianalliance/ft/eco/good/human_eco_good_tunarianalliance_hail_gm_e274bc0f.mp3", "The mechanical beasts of the Ironforge Exchange belch forth black clouds to choke out life within the forests.", "", 1242578412, 4198131350, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_tunarianalliance/ft/eco/good/human_eco_good_tunarianalliance_hail_gm_c57df74b.mp3", "I fear that the Concordium is unable to control its disciples. If corrupted the sorcerers would surely bring harm to the woodlands and their creatures.", "", 63339104, 2681140716, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_tunarianalliance/ft/eco/good/human_eco_good_tunarianalliance_hail_gm_2c2d0ef6.mp3", "The Tunarian Alliance preserves our memories of the breathing trees and singing streams of Jaggedpine.", "", 1912930054, 3530428976, Spawn)
+	elseif choice == 5 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_tunarianalliance/ft/eco/good/human_eco_good_tunarianalliance_hail_gm_24723d84.mp3", "While the land suffers and cries out for immediate protection the Celestial Watch is content to look to myths and superstitions for our salvation.", "", 1704735533, 1025969438, Spawn)
+	else
+	end
+end
+
+function LeaveRange(NPC, Spawn)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 448.85, -20.75, 212.18, 2, 0)
 	MovementLoopAddLocation(NPC, 448.56, -19.39, 195.8, 2, 0)
@@ -84,6 +104,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 462.67, -20.87, 199.08, 2, 0)
 	MovementLoopAddLocation(NPC, 448.56, -19.39, 195.8, 2, 0)
 	MovementLoopAddLocation(NPC, 448.85, -20.75, 212.18, 2, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/Qeynos/ward.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	ward.lua
-	Script Purpose	:	Waypoint Path for ward.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 07:14:21 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-	end
-
+--[[
+	Script Name		:	ward.lua
+	Script Purpose	:	Waypoint Path for ward.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 07:14:21 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 516.21, -9.57, 127.12, 2, 0)
 	MovementLoopAddLocation(NPC, 520.3, -9.56, 131.57, 2, 0)
@@ -38,6 +38,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 528.81, -9.56, 132.14, 2, 0)
 	MovementLoopAddLocation(NPC, 520.3, -9.56, 131.57, 2, 0)
 	MovementLoopAddLocation(NPC, 516.21, -9.57, 127.12, 2, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/Qeynos/woodrow.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	woodrow.lua
-	Script Purpose	:	Waypoint Path for woodrow.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/11/2020 06:13:14 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-		spawn(NPC)
-end
-
+--[[
+	Script Name		:	woodrow.lua
+	Script Purpose	:	Waypoint Path for woodrow.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/11/2020 06:13:14 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+		spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 673.7, -21.14, 144.6, 2, 0)
 	MovementLoopAddLocation(NPC, 682.32, -20.67, 157.2, 2, 0)
@@ -56,6 +56,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 721.58, -19.64, 183.31, 2, 0)
 	MovementLoopAddLocation(NPC, 682.32, -20.67, 157.2, 2, 0)
 	MovementLoopAddLocation(NPC, 673.7, -21.14, 144.6, 2, 0)
-end
-
+end
+
 

+ 26 - 14
server/SpawnScripts/QeynosHarbor/Aliindar.lua

@@ -1,29 +1,41 @@
 --[[
-    Script Name    : SpawnScripts/QeynosHarbor/Aliindar.lua
-    Script Author  : TyroneSWG
-    Script Date    : 2019.01.23 03:01:35
-    Script Purpose : Broker Aliindar's Voiceover files. (Note: they aren't playing not sure why.)
-                   : 
+	Script Name	: SpawnScripts/QeynosHarbor/Aliindar.lua
+	Script Purpose	: Aliindar <Broker>
+	Script Author	: Cynnar
+	Script Date	: 2020.04.12
+	Script Notes	: Auto-Generated Conversation from PacketParser Data
 --]]
 
 function spawn(NPC)
-	SetPlayerProximityFunction(NPC, 5, "InRange", "LeaveRange")
-end
-
-function hailed(NPC, Spawn)
-    --PlayVoice(Spawn, "voiceover/english/broker_aliidar/qey_harbor/031_con_merchant_aliindar_erudite_2_hail_52cd8074.mp3", mp3_key1, mp3_key2)
-    Say(NPC, "Something something hailed voiceover here", Spawn)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
 end
 
 function respawn(NPC)
-
+	spawn(NPC)
 end
 
 function InRange(NPC, Spawn)
-    --PlayVoice(Spawn, "voiceover/english/broker_aliidar/qey_harbor/031_con_merchant_aliindar_erudite_2_aoi_1fefa590.mp3", mp3_key1, mp3_key2)
-    Say(NPC, "Something Something area voice trigger here")
 end
 
 function LeaveRange(NPC, Spawn)
 end
 
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,5)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/broker_aliindar/qey_harbor/031_con_merchant_aliindar_erudite_2_hail_3ff007fa.mp3", "Welcome, friend! The wares of an entire city are at your fingertips. So please make your selection.", "bye", 3892169564, 2246767706, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/broker_aliindar/qey_harbor/031_con_merchant_aliindar_erudite_2_aoi_1fefa590.mp3", "Hello there!  Let's not waste any time shall we?  What is it I can get for you?", "beckon", 1746996390, 2674526000, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/broker_aliindar/qey_harbor/031_con_merchant_aliindar_erudite_2_hail_6a21669e.mp3", "Yes, I know you seek what I have access to. Then again, who doesn't?  So what can I help you acquire?", "flustered", 224844673, 1559511128, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "", "Hello there. Could we please speed along this transaction?  I have an appointment with Queen Antonia herself!", "nod", 1689589577, 4560189, Spawn)
+	elseif choice == 5 then
+		PlayFlavor(NPC, "voiceover/english/broker_aliindar/qey_harbor/031_con_merchant_aliindar_erudite_2_hail_52cd8074.mp3", "The Ironforge Exchange?  The Far Seas Trading Company?  Insects of industry, my friend, waiting to be crushed beneath my boot heel!", "royalwave", 946110005, 2012982404, Spawn)
+	else
+	end
+
+end

+ 34 - 24
server/SpawnScripts/QeynosHarbor/Bilur.lua

@@ -1,32 +1,42 @@
---[[
-	Script Name		:	Bilur.lua
-	Script Purpose	:	Waypoint Path for Bilur.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 01:10:38 AM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	Bilur.lua
+	Script Purpose	:	Waypoint Path for Bilur.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 01:10:38 AM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/dwarf_eco_good_1/ft/service/guard/dwarf_guard_service_good_1_hail_gm_76da37c9.mp3", "I hate working this shift!  If the gnolls don't attack now I may die of boredom.", "grumble", 31199107, 4082603014, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/dwarf_eco_good_1/ft/service/guard/dwarf_guard_service_good_1_hail_gm_c865a827.mp3", "Duty above all else citizen, except honor!", "scold", 3958491070, 1651361777, Spawn)
+	else
+	end
+
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 803.77, -20.99, 135.44, 2, 20)
 	MovementLoopAddLocation(NPC, 817.09, -23.31, 82.45, 2, 0)
 	MovementLoopAddLocation(NPC, 833.86, -23.31, 44.3, 2, 0)
 	MovementLoopAddLocation(NPC, 858.41, -25.37, 40.72, 2, 0)
 	MovementLoopAddLocation(NPC, 911.08, -25.39, 37.14, 2, 0)
-	MovementLoopAddLocation(NPC, 901.46, -25.37, -20.28, 2, 0)
+	MovementLoopAddLocation(NPC, 901.46, -25.37, -20.28, 2, 0)
 	MovementLoopAddLocation(NPC, 893.95, -25.34, -48.41, 2, 0)
-	MovementLoopAddLocation(NPC, 860.97, -25.44, -73.48, 2, 30)
+	MovementLoopAddLocation(NPC, 860.97, -25.44, -73.48, 2, 30)
 	MovementLoopAddLocation(NPC, 893.95, -25.34, -48.41, 2, 0)
 	MovementLoopAddLocation(NPC, 901.46, -25.37, -20.28, 2, 0)
 	MovementLoopAddLocation(NPC, 911.08, -25.39, 37.14, 2, 0)
@@ -34,6 +44,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 833.86, -23.31, 44.3, 2, 0)
 	MovementLoopAddLocation(NPC, 817.09, -23.31, 82.45, 2, 0)
 	MovementLoopAddLocation(NPC, 803.77, -20.99, 135.44, 2, 20)
-end
-
+end
+
 

+ 40 - 28
server/SpawnScripts/QeynosHarbor/Groban.lua

@@ -1,29 +1,41 @@
---[[
-	Script Name		:	Groban.lua
-	Script Purpose	:	Waypoint Path for Highgold.lua
-	Script Author	:	Auto Generated
-	Script Date		:	04/08/2020 08:13:18 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	Highgold.lua
+	Script Purpose	:	Waypoint Path for Highgold.lua
+	Script Author	:	Auto Generated
+	Script Date		:	04/08/2020 08:13:18 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,3)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/dwarf_eco_good_1/ft/service/guard/dwarf_guard_service_good_1_hail_gm_ee473c11.mp3", "Good day to you citizen, all preserve Queen Antonia.", "salute", 2539353309, 3288832983, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/dwarf_eco_good_1/ft/service/guard/dwarf_guard_service_good_1_hail_gm_ebfceda5.mp3", "Greetings, citizen. I am on guard duty.  Should you get into trouble, seek me out.", "attention", 1717559969, 1730005307, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/dwarf_eco_good_1/ft/service/guard/dwarf_guard_service_good_1_hail_gm_c865a827.mp3", "Duty above all else citizen, except honor!", "scold", 3958491070, 1651361777, Spawn)
+	else
+	end
+
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 679.82, -21.04, -115.09, 2, 0)
-	MovementLoopAddLocation(NPC, 708.6, -20.89, -66.2, 2, 2)
-	MovementLoopAddLocation(NPC, 698.37, -20.64, -15.85, 2, 5)
-	MovementLoopAddLocation(NPC, 739.96, -21.2, -14.13, 2, 8)
-	MovementLoopAddLocation(NPC, 755.77, -20.81, 7.22, 2, 1)
+	MovementLoopAddLocation(NPC, 710.6, -20.89, -66.2, 2, 2)
+	MovementLoopAddLocation(NPC, 700.37, -20.64, -15.85, 2, 5)
+	MovementLoopAddLocation(NPC, 741.96, -21.2, -14.13, 2, 8)
+	MovementLoopAddLocation(NPC, 757.77, -20.81, 7.22, 2, 1)
 	MovementLoopAddLocation(NPC, 762.62, -21.48, -45.59, 2, 0)
 	MovementLoopAddLocation(NPC, 779.17, -21.13, -45.52, 2, 0)
 	MovementLoopAddLocation(NPC, 795.39, -21, -58.93, 2, 12)
@@ -32,14 +44,14 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 676.46, -20.65, -124.59, 2, 17)
 	MovementLoopAddLocation(NPC, 715.91, -21.27, -61.53, 2, 0)
 	MovementLoopAddLocation(NPC, 745.01, -21.46, -58.01, 2, 0)
-	MovementLoopAddLocation(NPC, 793.71 -21.05 -58.65, 2, 9)
+	MovementLoopAddLocation(NPC, 795.39, -21, -58.93, 2, 5)
 	MovementLoopAddLocation(NPC, 779.17, -21.13, -45.52, 2, 0)
 	MovementLoopAddLocation(NPC, 762.62, -21.48, -45.59, 2, 0)
 	MovementLoopAddLocation(NPC, 757.77, -20.81, 7.22, 2, 0)
 	MovementLoopAddLocation(NPC, 741.96, -21.2, -14.13, 2, 0)
-	MovementLoopAddLocation(NPC, 698.37, -20.64, -15.85, 2, 0)
+	MovementLoopAddLocation(NPC, 700.37, -20.64, -15.85, 2, 0)
 	MovementLoopAddLocation(NPC, 710.6, -20.89, -66.2, 2, 0)
 	MovementLoopAddLocation(NPC, 679.82, -21.04, -115.09, 2, 0)
-end
-
+end
+
 

+ 34 - 22
server/SpawnScripts/QeynosHarbor/Hanstock.lua

@@ -1,23 +1,35 @@
---[[
-	Script Name		:	Hanstock.lua
-	Script Purpose	:	Waypoint Path for Hanstock.lua
-	Script Author	:	Auto Generated
-	Script Date		:	04/08/2020 11:54:53 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	Hanstock.lua
+	Script Purpose	:	Waypoint Path for Hanstock.lua
+	Script Author	:	Auto Generated
+	Script Date		:	04/08/2020 11:54:53 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,3)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_ebfceda5.mp3", "Greetings, citizen. I am on guard duty.  Should you get into trouble, seek me out.", "attention", 1945337199, 2685949436, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_76da37c9.mp3", "I hate working this shift!  If the gnolls don't attack now, I may die of boredom.", "grumble", 4099618783, 4191002419, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_ee473c11.mp3", "Good day to you, citizen. All preserve Queen Antonia.", "salute", 2997871263, 2912813719, Spawn)
+	else
+	end
+
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 874.28, -25.36, -62.98, 2, 0)
 	MovementLoopAddLocation(NPC, 894.59, -25.36, -50.05, 2, 0)
@@ -50,6 +62,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 905.14, -25.37, -20.73, 2, 0)
 	MovementLoopAddLocation(NPC, 894.59, -25.36, -50.05, 2, 0)
 	MovementLoopAddLocation(NPC, 874.28, -25.36, -62.98, 2, 0)
-end
-
+end
+
 

+ 33 - 22
server/SpawnScripts/QeynosHarbor/Highgold.lua

@@ -1,23 +1,34 @@
---[[
-	Script Name		:	Highgold.lua
-	Script Purpose	:	Waypoint Path for Highgold.lua
-	Script Author	:	Auto Generated
-	Script Date		:	04/08/2020 08:13:18 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	Highgold.lua
+	Script Purpose	:	Waypoint Path for Highgold.lua
+	Script Author	:	Auto Generated
+	Script Date		:	04/08/2020 08:13:18 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/optional2/highelf_eco_good_1/ft/service/guard/highelf_guard_service_good_1_hail_gf_d7fdb65.mp3", "Greetings, citizen. I am on guard duty.  Should you get into trouble, seek me out.", "attention", 2772203714, 1169089481, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/optional2/highelf_eco_good_1/ft/service/guard/highelf_guard_service_good_1_hail_gf_9e30d7b1.mp3", "I hate the night shift!  If the gnolls don't attack now, I may die of boredom.", "grumble", 1243870883, 2445109433, Spawn)
+	else
+	end
+
+end
+
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 679.82, -21.04, -115.09, 2, 0)
 	MovementLoopAddLocation(NPC, 708.6, -20.89, -66.2, 2, 2)
@@ -40,6 +51,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 698.37, -20.64, -15.85, 2, 0)
 	MovementLoopAddLocation(NPC, 710.6, -20.89, -66.2, 2, 0)
 	MovementLoopAddLocation(NPC, 679.82, -21.04, -115.09, 2, 0)
-end
-
+end
+
 

+ 34 - 24
server/SpawnScripts/QeynosHarbor/Oakhall.lua

@@ -1,32 +1,42 @@
---[[
-	Script Name		:	Bilur.lua
-	Script Purpose	:	Waypoint Path for Oakhall.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 01:10:38 AM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	Bilur.lua
+	Script Purpose	:	Waypoint Path for Bilur.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 01:10:38 AM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_ee473c11.mp3", "Good day to you, citizen. All preserve Queen Antonia.", "salute", 2997871263, 2912813719, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_ebfceda5.mp3", "Greetings, citizen. I am on guard duty.  Should you get into trouble, seek me out.", "attention", 1945337199, 2685949436, Spawn)
+	else
+	end
+
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 802.60, -20.97, 136.78, 2, 20)
 	MovementLoopAddLocation(NPC, 817.09, -23.31, 82.45, 2, 0)
 	MovementLoopAddLocation(NPC, 833.86, -23.31, 44.3, 2, 0)
 	MovementLoopAddLocation(NPC, 858.41, -25.37, 40.72, 2, 0)
 	MovementLoopAddLocation(NPC, 911.08, -25.39, 37.14, 2, 0)
-	MovementLoopAddLocation(NPC, 901.46, -25.37, -20.28, 2, 0)
+	MovementLoopAddLocation(NPC, 901.46, -25.37, -20.28, 2, 0)
 	MovementLoopAddLocation(NPC, 893.95, -25.34, -48.41, 2, 0)
-	MovementLoopAddLocation(NPC, 862.91, -25.43, -73.88, 2, 30)
+	MovementLoopAddLocation(NPC, 862.91, -25.43, -73.88, 2, 30)
 	MovementLoopAddLocation(NPC, 893.95, -25.34, -48.41, 2, 0)
 	MovementLoopAddLocation(NPC, 901.46, -25.37, -20.28, 2, 0)
 	MovementLoopAddLocation(NPC, 911.08, -25.39, 37.14, 2, 0)
@@ -34,6 +44,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 833.86, -23.31, 44.3, 2, 0)
 	MovementLoopAddLocation(NPC, 817.09, -23.31, 82.45, 2, 0)
 	MovementLoopAddLocation(NPC, 802.60, -20.97, 136.78, 2, 20)
-end
-
+end
+
 

+ 33 - 22
server/SpawnScripts/QeynosHarbor/Warland.lua

@@ -1,23 +1,34 @@
---[[
-	Script Name		:	Warland.lua
-	Script Purpose	:	Waypoint Path for Warland.lua
-	Script Author	:	Auto Generated
-	Script Date		:	04/08/2020 10:30:14 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	Warland.lua
+	Script Purpose	:	Waypoint Path for Warland.lua
+	Script Author	:	Auto Generated
+	Script Date		:	04/08/2020 10:30:14 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_ebfceda5.mp3", "Greetings, citizen. I am on guard duty.  Should you get into trouble, seek me out.", "attention", 1945337199, 2685949436, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_c865a827.mp3", "Duty above all else, citizen, except honor!", "scold", 4141262779, 4227030045, Spawn)
+	else
+	end
+
+end
+
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 705.82, -20.64, -22.54, 2, 0)
 	MovementLoopAddLocation(NPC, 740.93, -21.44, -22.18, 2, 0)
@@ -30,6 +41,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 757.61, -20.88, -35.3, 2, 0)
 	MovementLoopAddLocation(NPC, 740.93, -21.44, -22.18, 2, 0)
 	MovementLoopAddLocation(NPC, 705.82, -20.64, -22.54, 2, 0)
-end
-
+end
+
 

+ 55 - 6
server/SpawnScripts/QeynosHarbor/aQeynoscitizen.lua

@@ -1,13 +1,62 @@
 --[[
-    Script Name    : SpawnScripts/QeynosHarbor/aQeynoscitizen.lua
-    Script Author  : Zcoretri
-    Script Date    : 2017.06.02 04:06:39
-    Script Purpose : 
-                   : 
+	Script Name	: SpawnScripts/QeynosHarbor/aQeynoscitizen.lua
+	Script Purpose	: a Qeynos citizen 
+	Script Author	: Cynnar
+	Script Date	: 2020.04.12
+	Script Notes	: Auto-Generated Conversation from PacketParser Data
 --]]
 
+function spawn(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+	waypoints(NPC)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function InRange(NPC, Spawn)
+end
+
+function LeaveRange(NPC, Spawn)
+end
+
 function hailed(NPC, Spawn)
 	FaceTarget(NPC, Spawn)
-	local conversation = CreateConversation()
 
+	local choice = math.random(1,4)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "", "Are they here as spies?  Are they planning an attack?", "ponder", 1689589577, 4560189, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "", "Have you seen them?  I've heard that ratonga have been spotted in the city!", "agree", 1689589577, 4560189, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "", "Argh, it's not enough that they filthy up Freeport, now they've come here to spread their disease and muck around our city?  PAH!", "angry", 1689589577, 4560189, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "", "The Council hasn't said anything about the ratonga yet.  I wonder what's going on?", "ponder", 1689589577, 4560189, Spawn)
+	else
+	end
+
+end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 822.63, -23.36, 108.25, 2, 30)
+	MovementLoopAddLocation(NPC, 818.87, -23.32, 104.58, 2, 0)
+	MovementLoopAddLocation(NPC, 820.26, -23.33, 81.49, 2, 0)
+	MovementLoopAddLocation(NPC, 835.95, -23.5, 52.35, 2, 15)
+	MovementLoopAddLocation(NPC, 836.02, -23.31, 46.13, 2, 0)
+	MovementLoopAddLocation(NPC, 857.63, -25.39, 43.18, 2, 0)
+	MovementLoopAddLocation(NPC, 882.96, -25.45, 48.95, 2, 0)
+	MovementLoopAddLocation(NPC, 895.26, -25.5, 45.79, 2, 0)
+	MovementLoopAddLocation(NPC, 926.1, -25.56, 55.37, 2, 0)
+	MovementLoopAddLocation(NPC, 954.75, -25.56, 66.07, 2, 30)
+	MovementLoopAddLocation(NPC, 926.1, -25.56, 55.37, 2, 0)
+	MovementLoopAddLocation(NPC, 895.26, -25.5, 45.79, 2, 0)
+	MovementLoopAddLocation(NPC, 882.96, -25.45, 48.95, 2, 0)
+	MovementLoopAddLocation(NPC, 857.63, -25.39, 43.18, 2, 0)
+	MovementLoopAddLocation(NPC, 836.02, -23.31, 46.13, 2, 0)
+	MovementLoopAddLocation(NPC, 835.95, -23.5, 52.35, 2, 15)
+	MovementLoopAddLocation(NPC, 820.26, -23.33, 81.49, 2, 0)
+	MovementLoopAddLocation(NPC, 818.87, -23.32, 104.58, 2, 0)
+	MovementLoopAddLocation(NPC, 822.63, -23.36, 108.25, 2, 30)
 end

+ 23 - 23
server/SpawnScripts/QeynosHarbor/aduck.lua

@@ -1,24 +1,24 @@
---[[
-	Script Name		:	quackers.lua
-	Script Purpose	:	Waypoint Path for quackers.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 07:37:55 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
-function waypoints(NPC)
+--[[
+	Script Name		:	quackers.lua
+	Script Purpose	:	Waypoint Path for quackers.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 07:37:55 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
+function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 710.33, -20.92, -33.26, 2, 0.5)
 	MovementLoopAddLocation(NPC, 768.24, -20.64, 16.21, 2, 0)
 	MovementLoopAddLocation(NPC, 775.48, -20.64, -20.75, 2, 0)
@@ -76,6 +76,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 775.48, -20.64, -20.75, 2, 0)
 	MovementLoopAddLocation(NPC, 768.24, -20.64, 16.21, 2, 0)
 	MovementLoopAddLocation(NPC, 710.33, -20.92, -33.26, 2, 0)
-end
-
+end
+
 

+ 24 - 24
server/SpawnScripts/QeynosHarbor/arat.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	arat.lua
-	Script Purpose	:	Waypoint Path for arat.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 01:33:42 AM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	arat.lua
+	Script Purpose	:	Waypoint Path for arat.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 01:33:42 AM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 952.27, -25.5, 26, 5, 0)
 	MovementLoopAddLocation(NPC, 950.07, -25.5, 30.93, 5, 0)
@@ -25,11 +25,11 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 923.16, -25.49, 51.47, 5, 0)
 	MovementLoopAddLocation(NPC, 905.32, -25.32, 46.06, 5, 0)
 	MovementLoopAddLocation(NPC, 885.13, -25.48, 49.76, 5, 0)
-	MovementLoopAddLocation(NPC, 876.7, -25.37, 56.62, 5, 0)
+	MovementLoopAddLocation(NPC, 876.7, -25.37, 56.62, 5, 0)
     MovementLoopAddLocation(NPC, 857.98, -25.37, 40.88, 5, 0)
 	MovementLoopAddLocation(NPC, 836.85, -23.28, 43.62, 5, 0)
 	MovementLoopAddLocation(NPC, 811.68, -23.35, 94.3, 5, 0)
-	MovementLoopAddLocation(NPC, 836.85, -23.28, 43.62, 5, 0)
+	MovementLoopAddLocation(NPC, 836.85, -23.28, 43.62, 5, 0)
 	MovementLoopAddLocation(NPC, 857.98, -25.37, 40.88, 5, 0)
 	MovementLoopAddLocation(NPC, 876.7, -25.37, 56.62, 5, 0)
 	MovementLoopAddLocation(NPC, 885.13, -25.48, 49.76, 5, 0)
@@ -38,6 +38,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 934.24, -25.56, 28.39, 5, 0)
 	MovementLoopAddLocation(NPC, 950.07, -25.5, 30.93, 5, 0)
 	MovementLoopAddLocation(NPC, 952.27, -25.5, 26, 5, 0)
-end
-
+end
+
 

+ 70 - 22
server/SpawnScripts/QeynosHarbor/boulden.lua

@@ -1,26 +1,74 @@
---[[
-	Script Name		:	boulden.lua
-	Script Purpose	:	Waypoint Path for boulden.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 02:06:40 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	boulden.lua
+	Script Purpose	:	Waypoint Path for boulden.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 02:06:40 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "", "We can't take any chances that the Rallosian Empire will rebuild itself.  Who will heed my call!?", "", 1689589577, 4560189, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "", "Now is the time we must band together and find what's left of the Feerrott!", "", 1689589577, 4560189, Spawn)
+	else
+	end
+
+		PlayFlavor(NPC, "voiceover/english/boulden_smitestone/boat_06p_feerrott/blackwater/boulden_smitestone_harbor001.mp3", "", "", 912083139, 1947162307, Spawn)
+		AddConversationOption(conversation, "I just might do that.", "dlg_0_1")
+	StartConversation(conversation, NPC, Spawn, "I'm sorry, but you look a bit green for something as momentous as this.  Come and talk to me after you've sunk your teeth into some real adventure.")
+	if convo==2 then
+		PlayFlavor(NPC, "voiceover/english/boulden_smitestone/boat_06p_feerrott/blackwater/boulden_smitestone_harbor001.mp3", "", "", 912083139, 1947162307, Spawn)
+		AddConversationOption(conversation, "I just might do that.", "dlg_2_1")
+		StartConversation(conversation, NPC, Spawn, "I'm sorry, but you look a bit green for something as momentous as this.  Come and talk to me after you've sunk your teeth into some real adventure.")
+	end
+
+	if convo==15 then
+		PlayFlavor(NPC, "voiceover/english/boulden_smitestone/boat_06p_feerrott/blackwater/boulden_smitestone_harbor001.mp3", "", "", 912083139, 1947162307, Spawn)
+		AddConversationOption(conversation, "I just might do that.", "dlg_15_1")
+		StartConversation(conversation, NPC, Spawn, "I'm sorry, but you look a bit green for something as momentous as this.  Come and talk to me after you've sunk your teeth into some real adventure.")
+	end
+
+end
+
+function dlg_0_1(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	conversation = CreateConversation()
+
+	PlayFlavor(NPC, "voiceover/english/boulden_smitestone/boat_06p_feerrott/blackwater/boulden_smitestone_harbor001.mp3", "", "", 912083139, 1947162307, Spawn)
+		AddConversationOption(conversation, "I just might do that.", "dlg_0_2")
+	StartConversation(conversation, NPC, Spawn, "I'm sorry, but you look a bit green for something as momentous as this.  Come and talk to me after you've sunk your teeth into some real adventure.")
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 949.48, -25.5, 33.63, 2, 60)
 	MovementLoopAddLocation(NPC, 932.52, -25.51, 24.28, 2, 60)
+end
+
+function InRange(NPC, Spawn)
+	local choice = math.random(1,2)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "", "We can't take any chances that the Rallosian Empire will rebuild itself.  Who will heed my call!?", "", 1689589577, 4560189, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "", "Now is the time we must band together and find what's left of the Feerrott!", "", 1689589577, 4560189, Spawn)
+	else
+	end
+end
+
+function LeaveRange(NPC, Spawn)
 end
-
-

+ 22 - 22
server/SpawnScripts/QeynosHarbor/captsalty.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	captsalty.lua
-	Script Purpose	:	Waypoint Path for captsalty.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 03:52:17 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	captsalty.lua
+	Script Purpose	:	Waypoint Path for captsalty.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 03:52:17 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 972.47, -25.45, 10.02, 4, 0)
 	MovementLoopAddLocation(NPC, 961.84, -25.44, 9.71, 4, 0)
@@ -58,6 +58,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 958.16, -25.44, 21.02, 4, 0)
 	MovementLoopAddLocation(NPC, 961.84, -25.44, 9.71, 4, 0)
 	MovementLoopAddLocation(NPC, 972.47, -25.45, 10.02, 4, 0)
-end
-
+end
+
 

+ 22 - 42
server/SpawnScripts/QeynosHarbor/charlene.lua

@@ -1,34 +1,23 @@
---[[
-    Script Name    : SpawnScripts/QeynosHarbor/charlene.lua
-    Script Author  : Cynnar
-    Script Date    : 2020.04.11 11:04:00
-    Script Purpose : 
-                   : 
---]]
-
-function spawn(NPC)
-
-end
---[[
-	Script Name		:	charlene.lua
-	Script Purpose	:	Waypoint Path for charlene.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 04:14:49 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	charlene.lua
+	Script Purpose	:	Waypoint Path for charlene.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 04:14:49 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 832.06, -23.31, 45.72, 2, 0)
 	MovementLoopAddLocation(NPC, 879.32, -25.43, 35.83, 2, 0)
@@ -81,15 +70,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 903.88, -25.37, 13.02, 2, 0)
 	MovementLoopAddLocation(NPC, 879.32, -25.43, 35.83, 2, 0)
 	MovementLoopAddLocation(NPC, 832.06, -23.31, 45.72, 2, 0)
-end
-
-
-
-function hailed(NPC, Spawn)
-    FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-
-end
+end
+
 

+ 22 - 22
server/SpawnScripts/QeynosHarbor/fluffy.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	fluffy.lua
-	Script Purpose	:	Waypoint Path for fluffy.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 04:38:15 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	fluffy.lua
+	Script Purpose	:	Waypoint Path for fluffy.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 04:38:15 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 809.06, -23.31, 118.9, 2, 0)
 	MovementLoopAddLocation(NPC, 814.98, -23.31, 81.14, 2, 0)
@@ -56,6 +56,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 832.46, -23.35, 41.37, 2, 0)
 	MovementLoopAddLocation(NPC, 814.98, -23.31, 81.14, 2, 0)
 	MovementLoopAddLocation(NPC, 809.06, -23.31, 118.9, 2, 0)
-end
-
+end
+
 

+ 25 - 22
server/SpawnScripts/QeynosHarbor/hilldon.lua

@@ -1,23 +1,26 @@
---[[
-	Script Name		:	wyrmdon.lua
-	Script Purpose	:	Waypoint Path for wyrmdon.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 02:14:17 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	wyrmdon.lua
+	Script Purpose	:	Waypoint Path for wyrmdon.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 02:14:17 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_76da37c9.mp3", "I hate working this shift!  If the gnolls don't attack now, I may die of boredom.", "grumble", 4099618783, 4191002419, Spawn)
+end
+
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 939.72, -25.56, 72.05, 2, 30)
 	MovementLoopAddLocation(NPC, 925.65, -25.56, 66.65, 2, 0)
@@ -34,6 +37,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 910.81, -25.36, 84.67, 2, 0)
 	MovementLoopAddLocation(NPC, 925.65, -25.56, 66.65, 2, 0)
 	MovementLoopAddLocation(NPC, 939.72, -25.56, 72.05, 2, 60)
-end
-
+end
+
 

+ 49 - 22
server/SpawnScripts/QeynosHarbor/nathan.lua

@@ -1,23 +1,50 @@
---[[
-	Script Name		:	nathanironforge.lua
-	Script Purpose	:	Waypoint Path for nathanironforge.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 01:25:37 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	nathanironforge.lua
+	Script Purpose	:	Waypoint Path for nathanironforge.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 01:25:37 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	SetPlayerProximityFunction(NPC, 10, "InRange", "LeaveRange")
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function InRange(NPC, Spawn)
+		local choice = math.random(1,3)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_annoyingkid/ft/eco/good/human_eco_good_annoyingkid_cat_gm_fdc32a9.mp3", "Come back here kitty!", "wave", 204283170, 334524744, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_evil_badkid/ft/eco/evil/human_eco_evil_badkid_pig_gm_9fa4475d.mp3", "Run ya swine. Run!", "wave", 1654188343, 2070658176, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_annoyingkid/ft/eco/good/human_eco_good_annoyingkid_hail_gm_dc9519d6.mp3", "I want to join the Qeynos Guard when I grow up!", "salute", 3878579501, 1793000405, Spawn)
+	else
+		local choice = math.random(1,2)
+
+		if choice == 1 then
+			PlayFlavor(NPC, "voiceover/english/human_eco_good_annoyingkid/ft/eco/good/human_eco_good_annoyingkid_hail_gm_5674cc18.mp3", "Have you seen a Gnoll before?", "", 3064755312, 374536170, Spawn)
+		elseif choice == 2 then
+			PlayFlavor(NPC, "voiceover/english/human_eco_good_annoyingkid/ft/eco/good/human_eco_good_annoyingkid_hail_gm_110eef44.mp3", "Have you been inside the castle? I want to go there someday!", "smile", 2372987392, 3554768792, Spawn)
+		else
+		end
+	end
+	end
+
+function LeaveRange(NPC, Spawn)
+end
+
+
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 780.46, -23.28, 81.74, 6, 0)
 	MovementLoopAddLocation(NPC, 812.79, -23.34, 79.12, 6, 0)
@@ -56,6 +83,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 832.09, -23.31, 46.9, 6, 0)
 	MovementLoopAddLocation(NPC, 812.79, -23.34, 79.12, 6, 0)
 	MovementLoopAddLocation(NPC, 780.46, -23.28, 81.74, 6, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/QeynosHarbor/quackers.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	quackers.lua
-	Script Purpose	:	Waypoint Path for quackers.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 07:37:55 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	quackers.lua
+	Script Purpose	:	Waypoint Path for quackers.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 07:37:55 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 710.33, -20.92, -33.26, 2, 0)
 	MovementLoopAddLocation(NPC, 768.24, -20.64, 16.21, 2, 0)
@@ -76,6 +76,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 775.48, -20.64, -20.75, 2, 0)
 	MovementLoopAddLocation(NPC, 768.24, -20.64, 16.21, 2, 0)
 	MovementLoopAddLocation(NPC, 710.33, -20.92, -33.26, 2, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/QeynosHarbor/ratthree.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	ratthree.lua
-	Script Purpose	:	Waypoint Path for ratthree.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 04:30:37 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-end
-
+--[[
+	Script Name		:	ratthree.lua
+	Script Purpose	:	Waypoint Path for ratthree.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 04:30:37 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 734.57, -21.39, -41.69, 4, 0)
 	MovementLoopAddLocation(NPC, 804.71, -20.41, -59.3, 4, 0)
@@ -46,6 +46,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 845.7, -25.43, -58.79, 4, 0)
 	MovementLoopAddLocation(NPC, 804.71, -20.41, -59.3, 4, 0)
 	MovementLoopAddLocation(NPC, 734.57, -21.39, -41.69, 4, 0)
-end
-
+end
+
 

+ 22 - 22
server/SpawnScripts/QeynosHarbor/rattwo.lua

@@ -1,23 +1,23 @@
---[[
-	Script Name		:	rattwo.lua
-	Script Purpose	:	Waypoint Path for rattwo.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 01:44:20 AM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	rattwo.lua
+	Script Purpose	:	Waypoint Path for rattwo.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 01:44:20 AM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 686.64, -20.64, -14.49, 5, 0)
 	MovementLoopAddLocation(NPC, 704.74, -20.64, -22.94, 5, 0)
@@ -66,6 +66,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 704.4, -20.87, -61.16, 5, 0)
 	MovementLoopAddLocation(NPC, 704.74, -20.64, -22.94, 5, 0)
 	MovementLoopAddLocation(NPC, 686.64, -20.64, -14.49, 5, 0)
-end
-
+end
+
 

+ 122 - 46
server/SpawnScripts/QeynosHarbor/tabina.lua

@@ -1,47 +1,123 @@
---[[
-	Script Name		:	soothsayertabina.lua
-	Script Purpose	:	Waypoint Path for soothsayertabina.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 01:54:12 AM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
-function waypoints(NPC)
-	MovementLoopAddLocation(NPC, 839.82, -25.47, -0.55, 2, 45)
-	MovementLoopAddLocation(NPC, 848.38, -25.46, 13.55, 2, 0)
-	MovementLoopAddLocation(NPC, 858.11, -25.47, 22.81, 2, 0)
-	MovementLoopAddLocation(NPC, 862.36, -25.51, 34.89, 2, 0)
-	MovementLoopAddLocation(NPC, 881.65, -25.43, 35, 2, 0)
-	MovementLoopAddLocation(NPC, 893.92, -25.48, 29.49, 2, 0)
-	MovementLoopAddLocation(NPC, 900.82, -25.43, 6.34, 2, 0)
-	MovementLoopAddLocation(NPC, 899.15, -23.46, -35.74, 2, 0)
-	MovementLoopAddLocation(NPC, 892.55, -25.38, -58.9, 2, 0)
-	MovementLoopAddLocation(NPC, 812.24, -20.4, -59.15, 2, 0)
-	MovementLoopAddLocation(NPC, 792.62, -21.09, -57.06, 2, 0)
-	MovementLoopAddLocation(NPC, 775.75, -20.64, -24.43, 2, 60)
-	MovementLoopAddLocation(NPC, 792.62, -21.09, -57.06, 2, 0)
-	MovementLoopAddLocation(NPC, 812.24, -20.4, -59.15, 2, 0)
-	MovementLoopAddLocation(NPC, 892.55, -25.38, -58.9, 2, 0)
-	MovementLoopAddLocation(NPC, 899.15, -23.46, -35.74, 2, 0)
-	MovementLoopAddLocation(NPC, 900.82, -25.43, 6.34, 2, 0)
-	MovementLoopAddLocation(NPC, 893.92, -25.48, 29.49, 2, 0)
-	MovementLoopAddLocation(NPC, 881.65, -25.43, 35, 2, 0)
-	MovementLoopAddLocation(NPC, 862.36, -25.51, 34.89, 2, 0)
-	MovementLoopAddLocation(NPC, 858.11, -25.47, 22.81, 2, 0)
-	MovementLoopAddLocation(NPC, 848.38, -25.46, 13.55, 2, 0)
-	MovementLoopAddLocation(NPC, 839.82, -25.47, -0.55, 2, 45)
-end
-
+--[[
+	Script Name		:	soothsayertabina.lua
+	Script Purpose	:	Waypoint Path for soothsayertabina.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 01:54:12 AM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+	
+	local choice = math.random(1,4)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_seer/ft/eco/good/human_eco_good_seer_fighter_gf_544e4a58.mp3", "Epic battles await your future, but the strength of your arm shall tame them all!", "", 2750782728, 2274979632, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_seer/ft/eco/good/human_eco_good_seer_barmaid_gf_23d3c5ab.mp3", "You seek a life to make yourself happy than trying to please others.", "", 2950244318, 54283461, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_seer/ft/eco/good/human_eco_good_seer_mage_gf_f18445ae.mp3", "Clearly your intellect is your best asset. The world shall marvel at the wonders you control.", "", 2143349270, 291509869, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_seer/ft/eco/good/human_eco_good_seer_guard_gf_8cbf41a3.mp3", "A profound sense of loyalty to your duty is your greatest strength.", "", 1355126191, 913914779, Spawn)
+	else
+	end
+
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
+function waypoints(NPC)
+	MovementLoopAddLocation(NPC, 797.49, -23.26, 98.44, 2, 30)
+	MovementLoopAddLocation(NPC, 798.15, -23.26, 107.18, 2, 20)
+	MovementLoopAddLocation(NPC, 805.71, -23.32, 107.4, 2, 0)
+	MovementLoopAddLocation(NPC, 807.27, -23.33, 99.33, 2, 0)
+	MovementLoopAddLocation(NPC, 819.55, -23.34, 64.6, 2, 0)
+	MovementLoopAddLocation(NPC, 814.05, -23.27, 61.7, 2, 0)
+	MovementLoopAddLocation(NPC, 809.61, -23.27, 62.88, 2, 0)
+	MovementLoopAddLocation(NPC, 808.99, -23.27, 63.88, 2, 0)
+	MovementLoopAddLocation(NPC, 809.29, -23.24, 66.71, 2, 0)
+	MovementLoopAddLocation(NPC, 806.88, -23.27, 74, 2, 0)
+	MovementLoopAddLocation(NPC, 798.86, -20.27, 69.6, 2, 0)
+	MovementLoopAddLocation(NPC, 803.77, -17.27, 60.15, 2, 0)
+	MovementLoopAddLocation(NPC, 809.55, -17.27, 51.81, 2, 0)
+	MovementLoopAddLocation(NPC, 803.01, -17.27, 62.37, 2, 0)
+	MovementLoopAddLocation(NPC, 798.64, -20.27, 68.82, 2, 0)
+	MovementLoopAddLocation(NPC, 799.61, -20.27, 69.98, 2, 0)
+	MovementLoopAddLocation(NPC, 806.66, -23.27, 73.81, 2, 0)
+	MovementLoopAddLocation(NPC, 809.86, -23.24, 67.32, 2, 0)
+	MovementLoopAddLocation(NPC, 813.33, -23.27, 65.58, 2, 0)
+	MovementLoopAddLocation(NPC, 815.09, -23.27, 62.05, 2, 0)
+	MovementLoopAddLocation(NPC, 820.09, -23.33, 64.4, 2, 0)
+	MovementLoopAddLocation(NPC, 831.65, -23.33, 43.01, 2, 0)
+	MovementLoopAddLocation(NPC, 835.95, -23.31, 41.23, 2, 0)
+	MovementLoopAddLocation(NPC, 856.03, -25.25, 38.54, 2, 0)
+	MovementLoopAddLocation(NPC, 860.98, -25.43, 37.91, 2, 0)
+	MovementLoopAddLocation(NPC, 861.98, -25.43, 24.43, 2, 0)
+	MovementLoopAddLocation(NPC, 848.36, -25.47, 14.77, 2, 0)
+	MovementLoopAddLocation(NPC, 832.3, -25.43, -11.42, 2, 0)
+	MovementLoopAddLocation(NPC, 835.61, -25.43, -23.7, 2, 0)
+	MovementLoopAddLocation(NPC, 867.36, -25.46, -33.22, 2, 0)
+	MovementLoopAddLocation(NPC, 875.66, -25.47, -32.07, 2, 0)
+	MovementLoopAddLocation(NPC, 882.76, -25.46, -29.24, 2, 0)
+	MovementLoopAddLocation(NPC, 897.46, -25.46, -19.43, 2, 0)
+	MovementLoopAddLocation(NPC, 889.44, -25.35, -46.95, 2, 0)
+	MovementLoopAddLocation(NPC, 882.31, -25.45, -54.72, 2, 0)
+	MovementLoopAddLocation(NPC, 877.78, -25.49, -56.75, 2, 0)
+	MovementLoopAddLocation(NPC, 874.21, -25.46, -58.26, 2, 0)
+	MovementLoopAddLocation(NPC, 841.61, -25.46, -58.23, 2, 0)
+	MovementLoopAddLocation(NPC, 812.05, -20.4, -58.23, 2, 0)
+	MovementLoopAddLocation(NPC, 805.57, -20.4, -58.35, 2, 0)
+	MovementLoopAddLocation(NPC, 791.84, -21.11, -57.67, 2, 0)
+	MovementLoopAddLocation(NPC, 775.18, -20.64, -24.61, 2, 30)
+	MovementLoopAddLocation(NPC, 791.84, -21.11, -57.67, 2, 0)
+	MovementLoopAddLocation(NPC, 805.57, -20.4, -58.35, 2, 0)
+	MovementLoopAddLocation(NPC, 812.05, -20.4, -58.23, 2, 0)
+	MovementLoopAddLocation(NPC, 841.61, -25.46, -58.23, 2, 0)
+	MovementLoopAddLocation(NPC, 874.21, -25.46, -58.26, 2, 0)
+	MovementLoopAddLocation(NPC, 877.78, -25.49, -56.75, 2, 0)
+	MovementLoopAddLocation(NPC, 882.31, -25.45, -54.72, 2, 0)
+	MovementLoopAddLocation(NPC, 889.44, -25.35, -46.95, 2, 0)
+	MovementLoopAddLocation(NPC, 897.46, -25.46, -19.43, 2, 0)
+	MovementLoopAddLocation(NPC, 882.76, -25.46, -29.24, 2, 0)
+	MovementLoopAddLocation(NPC, 875.66, -25.47, -32.07, 2, 0)
+	MovementLoopAddLocation(NPC, 867.36, -25.46, -33.22, 2, 0)
+	MovementLoopAddLocation(NPC, 835.61, -25.43, -23.7, 2, 0)
+	MovementLoopAddLocation(NPC, 832.3, -25.43, -11.42, 2, 0)
+	MovementLoopAddLocation(NPC, 848.36, -25.47, 14.77, 2, 0)
+	MovementLoopAddLocation(NPC, 861.98, -25.43, 24.43, 2, 0)
+	MovementLoopAddLocation(NPC, 860.98, -25.43, 37.91, 2, 0)
+	MovementLoopAddLocation(NPC, 856.03, -25.25, 38.54, 2, 0)
+	MovementLoopAddLocation(NPC, 835.95, -23.31, 41.23, 2, 0)
+	MovementLoopAddLocation(NPC, 831.65, -23.33, 43.01, 2, 0)
+	MovementLoopAddLocation(NPC, 820.09, -23.33, 64.4, 2, 0)
+	MovementLoopAddLocation(NPC, 815.09, -23.27, 62.05, 2, 0)
+	MovementLoopAddLocation(NPC, 813.33, -23.27, 65.58, 2, 0)
+	MovementLoopAddLocation(NPC, 809.86, -23.24, 67.32, 2, 0)
+	MovementLoopAddLocation(NPC, 806.66, -23.27, 73.81, 2, 0)
+	MovementLoopAddLocation(NPC, 799.61, -20.27, 69.98, 2, 0)
+	MovementLoopAddLocation(NPC, 798.64, -20.27, 68.82, 2, 0)
+	MovementLoopAddLocation(NPC, 803.01, -17.27, 62.37, 2, 0)
+	MovementLoopAddLocation(NPC, 809.55, -17.27, 51.81, 2, 0)
+	MovementLoopAddLocation(NPC, 803.77, -17.27, 60.15, 2, 0)
+	MovementLoopAddLocation(NPC, 798.86, -20.27, 69.6, 2, 0)
+	MovementLoopAddLocation(NPC, 806.88, -23.27, 74, 2, 0)
+	MovementLoopAddLocation(NPC, 809.29, -23.24, 66.71, 2, 0)
+	MovementLoopAddLocation(NPC, 808.99, -23.27, 63.88, 2, 0)
+	MovementLoopAddLocation(NPC, 809.61, -23.27, 62.88, 2, 0)
+	MovementLoopAddLocation(NPC, 814.05, -23.27, 61.7, 2, 0)
+	MovementLoopAddLocation(NPC, 819.55, -23.34, 64.6, 2, 0)
+	MovementLoopAddLocation(NPC, 807.27, -23.33, 99.33, 2, 0)
+	MovementLoopAddLocation(NPC, 805.71, -23.32, 107.4, 2, 0)
+	MovementLoopAddLocation(NPC, 798.15, -23.26, 107.18, 2, 20)
+	MovementLoopAddLocation(NPC, 797.49, -23.26, 98.44, 2, 30)
+end
+
+
+
 

+ 36 - 22
server/SpawnScripts/QeynosHarbor/wyrmdon.lua

@@ -1,23 +1,37 @@
---[[
-	Script Name		:	wyrmdon.lua
-	Script Purpose	:	Waypoint Path for wyrmdon.lua
-	Script Author	:	Devn00b
-	Script Date		:	04/09/2020 02:14:17 PM
-	Script Notes	:	Locations collected from Live
---]]
-
-function spawn(NPC)
-	waypoints(NPC)
-end
-
-function hailed(NPC, Spawn)
-	FaceTarget(NPC, Spawn)
-end
-
-function respawn(NPC)
-	spawn(NPC)
-	end
-
+--[[
+	Script Name		:	wyrmdon.lua
+	Script Purpose	:	Waypoint Path for wyrmdon.lua
+	Script Author	:	Devn00b
+	Script Date		:	04/09/2020 02:14:17 PM
+	Script Notes	:	Locations collected from Live
+--]]
+
+function spawn(NPC)
+	waypoints(NPC)
+end
+
+function hailed(NPC, Spawn)
+	FaceTarget(NPC, Spawn)
+
+	local choice = math.random(1,4)
+
+	if choice == 1 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_c865a827.mp3", "Duty above all else, citizen, except honor!", "scold", 4141262779, 4227030045, Spawn)
+	elseif choice == 2 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_ebfceda5.mp3", "Greetings, citizen. I am on guard duty.  Should you get into trouble, seek me out.", "attention", 1945337199, 2685949436, Spawn)
+	elseif choice == 3 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_ee473c11.mp3", "Good day to you, citizen. All preserve Queen Antonia.", "salute", 2997871263, 2912813719, Spawn)
+	elseif choice == 4 then
+		PlayFlavor(NPC, "voiceover/english/human_eco_good_1/ft/service/guard/human_guard_service_good_1_hail_gm_76da37c9.mp3", "I hate working this shift!  If the gnolls don't attack now, I may die of boredom.", "grumble", 4099618783, 4191002419, Spawn)
+	else
+	end
+
+end
+
+function respawn(NPC)
+	spawn(NPC)
+	end
+
 function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 936.72, -25.56, 72.05, 2, 30)
 	MovementLoopAddLocation(NPC, 925.65, -25.56, 66.65, 2, 0)
@@ -34,6 +48,6 @@ function waypoints(NPC)
 	MovementLoopAddLocation(NPC, 910.81, -25.36, 84.67, 2, 0)
 	MovementLoopAddLocation(NPC, 925.65, -25.56, 66.65, 2, 0)
 	MovementLoopAddLocation(NPC, 936.72, -25.56, 72.05, 2, 60)
-end
-
+end
+
 

+ 4 - 105
server/SpawnScripts/VerminSnye/ZaenKalystir.lua

@@ -1,121 +1,20 @@
 --[[
     Script Name    : SpawnScripts/VerminSnye/ZaenKalystir.lua
-    Script Author  : premierio015
+    Script Author  : Premierio015
     Script Date    : 2020.05.03 03:05:34
-    Script Purpose : Zaen Kalystir Dialog
-    Script Notes   : Offer Quests "Ruins of Varsoon Investigation Of The Mausoleum(532)", "Ruins of Varsoon: Revealing the Entrance(532)".
+    Script Purpose : 
+                   : 
 --]]
 
-local roviotm = 532   -- Ruins of Varsoon: Investigation Of The Mausoleum
-local rovrte = 534  -- Ruins of Varsoon: Revealing the Entrance
-
 function spawn(NPC)
-SetPlayerProximityFunction(NPC, 7, "InRange", "LeaveRange", Spawn)
-end
 
-function respawn(NPC)
-         spawn(NPC)
 end
 
 function hailed(NPC, Spawn)
     FaceTarget(NPC, Spawn)
-    conversation = CreateConversation()
-    PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir000.mp3", "", "", 2139010176, 3598277774, Spawn)
-    AddConversationOption(conversation, "I'll get going then if you don't want my help. ")
-    if not HasQuest(Spawn, roviotm) and not HasCompletedQuest(Spawn, roviotm) then
-    AddConversationOption(conversation, "I just wanted to find out if you needed help down here.", "dlg01")
-    elseif GetQuestStep(Spawn, roviotm) == 2 then
-    AddConversationOption(conversation, "Yeah, thanks a ton for letting me know about the undead.", "dlg01_03")
-    elseif HasCompletedQuest(Spawn, roviotm) and not HasCompletedQuest (Spawn, rovrte) then
-    AddConversationOption(conversation, "I'm willing to work for you now.", "dlg01_05")
-    elseif GetQuestStep(Spawn, rovrte) == 2  then
-    AddConversationOption(conversation, "Even more undead... but I found the area you were looking for.", "dlg02")
-    elseif GetQuestStep(Spawn, rovrte) == 4 then
-    AddConversationOption(conversation, "The key you requested now hangs from my own neck.", "dlg02_03")
-    end
-    StartConversation(conversation, NPC, Spawn, "Who are you, and why are you interrupting my work?  As if it's not bad enough in the catacombs, beset by beasts on all sides, I have to listen to your prattle as well?")
-    end
-
-
-function dlg01(NPC, Spawn)
-  FaceTarget(NPC, Spawn)
-  conversation = CreateConversation()
-  PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir001.mp3", "", "", 4133661300, 3305124382, Spawn)
-  AddConversationOption(conversation, "What would you have me do to prove that I am trustworthy, Zaen?", "dlg01_02")
-  AddConversationOption(conversation, "No thanks.")
-  StartConversation(conversation, NPC, Spawn, "That depends ... I have need of someone, but I do not know if I can trust you ... perhaps if you prove you're trustworthy then I can speak with you of more important events and their significance. I suppose I should actually introduce myself, though. I am Zaen Kalystir, a ... long time ... resident ... of Qeynos.")
-end
-
-function dlg01_02(NPC, Spawn)
- FaceTarget(NPC, Spawn)
- OfferQuest(NPC, Spawn, roviotm)
- conversation = CreateConversation()
- PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir002.mp3", "", "", 2969583789, 4109517252, Spawn)
- AddConversationOption(conversation, "Very well, I shall do so.")
- StartConversation(conversation, NPC, Spawn, "There is an ancient crypt just north of Qeynos, which held a once-powerful lich named Varsoon. If you go to this place, it is said the dead will speak with the living about events past and present. Mostly believed to be a rumor, I now think there may be more to this than was previously thought.  Go, and go quickly. Do not forget what is said.")
-end
-
-
-function dlg01_03(NPC, Spawn)
- FaceTarget(NPC, Spawn)
- conversation = CreateConversation()
- PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir003.mp3", "", "", 206522910, 1176970855, Spawn)
- AddConversationOption(conversation, "They spoke of their master, researching in peace.", "dlg01_04")
- StartConversation(conversation, NPC, Spawn, "So you did... meet them?  I thought I mentioned that to you... I guess I must have left it out. Purely accidental, I assure you.  Now... what did they say?  Out with it, and I'll let you in on what you can do for me if I can trust you.")
 end
 
-function dlg01_04(NPC, Spawn)
- FaceTarget(NPC, Spawn)
- SetStepComplete(Spawn, roviotm, 2)
- conversation = CreateConversation()
- PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir004.mp3", "", "", 857926629, 2251167415, Spawn)
- AddConversationOption(conversation, "Yes, I believe we can perhaps help each other here...", "dlg01_05")
- AddConversationOption(conversation, "I think this is a bit too dangerous for me. ")
- StartConversation(conversation, NPC, Spawn, "Excellent... I trust you don't believe any of their misleading information... it would be a shame that the dead convinced you their lich-master was up to no good... The lich we are speaking of is of course Varsoon, one of the greatest enemies of this fair city.  He must not be allowed to rise. Are you willing to work for me?")
- end
- 
-function dlg01_05(NPC, Spawn)
- FaceTarget(NPC, Spawn)
- OfferQuest(NPC, Spawn, rovrte)
- conversation = CreateConversation()
- PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir005.mp3", "", "", 3727042667, 450556516, Spawn)
- AddConversationOption(conversation, "I'll find it.")
- StartConversation(conversation, NPC, Spawn, "Then go swiftly to the Thundering Steppes.  I believe it is there that you shall find Varsoon's new lair.  A previous stronghold of his, the Keep of Immortality, lays in ruins there.  My... informants... report a much larger number of undead than is usual for the area. You must find the entrance to his new dwelling and return to me with this information.")
- end
-
-
-function dlg02(NPC, Spawn)
- FaceTarget(NPC, Spawn)
- SetStepComplete(Spawn, rovrte, 2)
- conversation = CreateConversation()
- PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir006.mp3", "", "", 2478413998, 2228458144, Spawn)
- AddConversationOption(conversation, "Here we go again...", "dlg02_02")
- StartConversation(conversation, NPC, Spawn, "You don't disappoint, that's for certain. One last task I have for you now... Certainly it will not be a challenge for you...")
-end
-
-
-function dlg02_02(NPC,Spawn)
- FaceTarget(NPC, Spawn)
- conversation = CreateConversation()
- PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir007.mp3", "", "", 894539318, 4057027116, Spawn)
- AddConversationOption(conversation, "I'm not so sure... but I suppose I don't have a choice.")
- StartConversation(conversation, NPC, Spawn, "In the next level of the catacombs, you'll find the ancient skeletal remains of one of the original druids to imprison Varsoon.  Around its neck, it wears a key to the keep, pulled from the lich-king's body before it was entombed.  Get that key and return to me.  Do not disturb me until you are able to retrieve it.")
-end	
-
-function dlg02_03(NPC, Spawn)
- FaceTarget(NPC, Spawn)
- SetStepComplete(Spawn, rovrte, 4)
- conversation = CreateConversation()
- PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaenkalystir008.mp3", "", "", 81391876, 574533119, Spawn)
- AddConversationOption(conversation, "I'll do what I can.")
- StartConversation(conversation, NPC, Spawn, "Splendid... you have done quite well.  You must interfere with Varsoon's plans. That key you now possess will allow you access to his lair.  Let him know... that Qeynos shall once again prevent his evil from spreading!")
-end
+function respawn(NPC)
 
-function InRange(NPC, Spawn)
-FaceTarget(NPC, Spawn)
-PlayFlavor(NPC, "voiceover/english/zaen_kalystir/qey_catacomb02/zaen_kalystir_zaen_intro_fd754eff.mp3", "Blasted beetles, snakes, undead, and Bloodsabers!  Now you? Outta here!", "", 3736586527, 92716793, Spawn)
 end
 
-function LeaveRange(NPC, Spawn)
-
-end