Marlin Trophy Quest

htc16 · Jul 9, 2024 · 4d864e1 · 4d864e1
1 parent 6b3f378
commit 4d864e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
@@ -2036,7 +2036,7 @@ Storage = {
 				AddonHatCloak = 40806,
 				AddonWandTimer = 40807,
 			},
-			MarlinTrophy = {},
+			MarlinTrophy = 40808,
 			Meriana = {},
 			NoblemanOutfits = {},
 			ObsidianKnife = {},

diff --git a/data-otservbr-global/npc/pemaret.lua b/data-otservbr-global/npc/pemaret.lua
@@ -59,14 +59,17 @@ local function creatureSayCallback(npc, creature, type, message)
 	end
 
 	if MsgContains(message, "marlin") then
-		if player:getItemCount(901) > 0 then
-			npcHandler:say("WOW! You have a marlin!! I could make a nice decoration for your wall from it. May I have it?", npc, creature)
-			npcHandler:setTopic(playerId, 1)
+		if player:getStorageValue(Storage.Quest.U7_8.MarlinTrophy) < 1 then
+			if player:getItemCount(901) > 0 then
+				npcHandler:say("WOW! You have a marlin!! I could make a nice decoration for your wall from it. May I have it?", npc, creature)
+				npcHandler:setTopic(playerId, 1)
+			end
 		end
-	elseif MsgContains(message, "yes") and npcHandler:getTopic(playerId) == 1 then
+	elseif MsgContains(message, "yes") and npcHandler:getTopic(playerId) == 1 and player:getStorageValue(Storage.Quest.U7_8.MarlinTrophy) < 1 then
 		if player:removeItem(901, 1) then
 			npcHandler:say("Yeah! Now let's see... <fumble fumble> There you go, I hope you like it!", npc, creature)
 			player:addItem(902, 1)
+			player:setStorageValue(Storage.Quest.U7_8.MarlinTrophy, 1)
 		else
 			npcHandler:say("You don't have the fish.", npc, creature)
 		end