Merge branch 'FixJacquesSpawnScript' of pboyd04/EQ2EMu into master

server/SpawnScripts/ThunderingSteppes/Brianna.lua

@@ -31,7 +31,12 @@ function hailed(NPC, Spawn)
 		PlayFlavor(NPC, "voiceover/english/voice_emotes/greetings/greetings_3_1009.mp3", "", "", 0, 0, Spawn)
 	end
 	
-	if HasQuest(Spawn, WatchYourStepinTheTSPartIII) and GetQuestStep(Spawn, WatchYourStepinTheTSPartIII) == 3 then
+	if HasQuest(Spawn, SuppliesForBrianna) and GetQuestStep(Spawn, SuppliesForBrianna) == 2 then
+		-- turn in SuppliesForBrianna
+		AddConversationOption(conversation, "Yes right here.", "dlg_1_1")
+		AddConversationOption(conversation, "Um, I have some but not for you.")
+		StartConversation(conversation, NPC, Spawn, "Well, do you have the supplies?")
+	elseif HasQuest(Spawn, WatchYourStepinTheTSPartIII) and GetQuestStep(Spawn, WatchYourStepinTheTSPartIII) == 2 then
 		-- start SuppliesForBrianna
 		AddConversationOption(conversation, "No, I'm here to deliver a package to you.", "dlg_0_1")
 		AddConversationOption(conversation, "Oh okay. Thanks anyways.")
@@ -40,11 +45,6 @@ function hailed(NPC, Spawn)
 		-- on SuppliesForBrianna or HidesForBrianna but not ready for turn in
 		AddConversationOption(conversation, "No but I have my best people working on it.")
 		StartConversation(conversation, NPC, Spawn, "Well, did you bring the supplies yet?")
-	elseif HasQuest(Spawn, SuppliesForBrianna) and GetQuestStep(Spawn, SuppliesForBrianna) == 2 then
-		-- turn in SuppliesForBrianna
-		AddConversationOption(conversation, "Yes right here.", "dlg_1_1")
-		AddConversationOption(conversation, "Um, I have some but not for you.")
-		StartConversation(conversation, NPC, Spawn, "Well, do you have the supplies?")
 	elseif HasCompletedQuest(Spawn, SuppliesForBrianna) and not HasQuest(Spawn, HidesForBrianna) and not HasCompletedQuest(Spawn, HidesForBrianna) then
 		-- start HidesForBrianna
 		AddConversationOption(conversation, "Yes I am.", "dlg_2_1")
@@ -79,7 +79,7 @@ function dlg_0_2(NPC, Spawn)
 end
 
 function dlg_0_3(NPC, Spawn)
-	OfferQuest(NPC, Player, SuppliesForBrianna)
+	OfferQuest(NPC, Spawn, SuppliesForBrianna)
 end
 
 function dlg_1_1(NPC, Spawn)
@@ -102,7 +102,7 @@ function dlg_2_1(NPC, Spawn)
 end
 
 function dlg_2_2(NPC, Spawn)
-	OfferQuest(NPC, Player, HidesForBrianna)
+	OfferQuest(NPC, Spawn, HidesForBrianna)
 end
 
 function dlg_3_1(NPC, Spawn)
@@ -112,4 +112,4 @@ function dlg_3_1(NPC, Spawn)
 	SetStepComplete(Spawn, HidesForBrianna, 2)
 	AddConversationOption(conversation, "Thanks.")
 	StartConversation(conversation, NPC, Spawn, "Great, these look like it's the first time they have ever seen the sun. Thanks for your help. I don't have anything else for you today, but check back again.")
-end
+end

server/SpawnScripts/ThunderingSteppes/Jacques.lua

@@ -154,5 +154,5 @@ function dlg_5_1(NPC, Spawn)
 end
 
 function dlg_6_1(NPC, Spawn)
-	OfferQuest(NPC, Player, WatchYourStepInTheTSPartIV)
+	OfferQuest(NPC, Spawn, WatchYourStepInTheTSPartIV)
 end