The Explorer Society - The Undersea Kingdom - 3 part

htc16 · Jul 4, 2024 · 771f9af · 771f9af
1 parent 66354ad
commit 771f9af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/data-otservbr-global/lib/core/quests.lua b/data-otservbr-global/lib/core/quests.lua
@@ -4331,9 +4331,9 @@ if not Quests then
 					startValue = 1,
 					endValue = 3,
 					states = {
-						[1] = "Captain Max will bring you to Calassa whenever you are ready. \z
-							Please try to retrieve the missing logbook which must be in one of the sunken shipwrecks.",
+						[1] = "Captain Max will bring you to Calassa whenever you are ready. Please try to retrieve the missing logbook which must be in one of the sunken shipwrecks.",
 						[2] = "Report about your Calassa mission to Berenice in Liberty Bay.",
+						[3] = "Congratulations, you completed the remaining part of this mission!",
 					},
 				},
 			},

diff --git a/data-otservbr-global/npc/angus.lua b/data-otservbr-global/npc/angus.lua
@@ -504,11 +504,7 @@ local function creatureSayCallback(npc, creature, type, message)
 			-- Rune Writings
 			-- Ectoplasm
 		elseif npcHandler:getTopic(playerId) == 27 then
-			npcHandler:say(
-				{ "Fine. The society is looking for new means to travel. Some of our most brilliant minds have some theories about astral travel that they want to research further ...", "Therefore we need you to collect some ectoplasm from the corpse of a ghost. We will supply you with a collector that you can use on the body of a slain ghost ...", "Do you think you are ready for that mission?" },
-				npc,
-				creature
-			)
+			npcHandler:say("Fine. The society is looking for new means to travel. Some of our most brilliant minds have some theories about astral travel that they want to research further ...", "Therefore we need you to collect some ectoplasm from the corpse of a ghost. We will supply you with a collector that you can use on the body of a slain ghost ...", "Do you think you are ready for that mission?", npc, creature)
 			npcHandler:setTopic(playerId, 28)
 		elseif npcHandler:getTopic(playerId) == 28 then
 			npcHandler:say("Good! Take this container and use it on a ghost that was recently slain. Return with the collected ectoplasm and hand me that container ...", npc, creature)

diff --git a/data-otservbr-global/npc/berenice.lua b/data-otservbr-global/npc/berenice.lua
@@ -62,7 +62,7 @@ local function creatureSayCallback(npc, creature, type, message)
 		if player:getStorageValue(Storage.Quest.U7_6.ExplorerSociety.CalassaQuest) == 2 then
 			npcHandler:say("OH! So you have safely returned from Calassa! Congratulations, were you able to retrieve the logbook?", npc, creature)
 			npcHandler:setTopic(playerId, 5)
-		elseif player:getStorageValue(Storage.Quest.U7_6.ExplorerSociety.TheOrcPowder) > 34 and player:getStorageValue(Storage.Quest.U7_6.ExplorerSociety.QuestLine) > 34 then
+		elseif player:getStorageValue(Storage.Quest.U7_6.ExplorerSociety.TheOrcPowder) > 34 and player:getStorageValue(Storage.Quest.U7_6.ExplorerSociety.QuestLine) > 44 then
 			npcHandler:say("The most important mission we currently have is an expedition to {Calassa}.", npc, creature)
 			npcHandler:setTopic(playerId, 1)
 		end
@@ -72,8 +72,6 @@ local function creatureSayCallback(npc, creature, type, message)
 			npcHandler:setTopic(playerId, 2)
 		elseif npcHandler:getTopic(playerId) == 4 then
 			npcHandler:say("Captain Max will bring you to Calassa whenever you are ready. Please try to retrieve the missing logbook which must be in one of the sunken shipwrecks.", npc, creature)
-			player:setStorageValue(Storage.Quest.U7_6.ExplorerSociety.CalassaDoor, 1)
-			player:setStorageValue(Storage.Quest.U7_6.ExplorerSociety.CalassaQuest, 1)
 			npcHandler:setTopic(playerId, 0)
 		elseif player:getStorageValue(Storage.Quest.U7_6.ExplorerSociety.CalassaQuest) == 2 then
 			npcHandler:say("OH! So you have safely returned from Calassa! Congratulations, were you able to retrieve the logbook?", npc, creature)
@@ -94,6 +92,8 @@ local function creatureSayCallback(npc, creature, type, message)
 			npcHandler:setTopic(playerId, 3)
 		elseif npcHandler:getTopic(playerId) == 3 then
 			npcHandler:say("Excellent! I will immediately inform Captain Max to bring you to {Calassa} whenever you are ready. Don't forget to make thorough preparations!", npc, creature)
+			player:setStorageValue(Storage.Quest.U7_6.ExplorerSociety.CalassaQuest, 1)
+			player:setStorageValue(Storage.Quest.U7_6.ExplorerSociety.CalassaDoor, 1)
 			npcHandler:setTopic(playerId, 4)
 		elseif npcHandler:getTopic(playerId) == 5 then
 			if player:removeItem(21378, 1) then