Skip to content

fix: incorrect NPC interaction handling in The Djinn War Quest #3508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dudantas merged 2 commits into from
Apr 28, 2025
Merged

fix: incorrect NPC interaction handling in The Djinn War Quest #3508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc2a47
Revert "fix: djinn freequest (#3471)"
Apr 27, 2025
64fed64
Verificação de conclusão de quest para permitir que o player possa se…
Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions data-otservbr-global/npc/alesar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,22 @@ local function greetCallback(npc, creature, message)
local player = Player(creature)
local playerId = player:getId()

if not MsgContains(message, "djanni'hah") then
npcHandler:say("Shove off, little one! Humans are not welcome here, |PLAYERNAME|!", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
--Checks if the player has completed the quest
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Mission03) ~= 3 then
if not MsgContains(message, "djanni'hah") then
npcHandler:say("Shove off, little one! Humans are not welcome here, |PLAYERNAME|!", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) <= 0 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
end

npcHandler:say("What do you want from me, |PLAYERNAME|?", npc, creature)
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/npc/baa_leal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ local function greetCallback(npc, creature, message)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) <= 0 then
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/npc/bo_ques.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ local function greetCallback(npc, creature, message)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) <= 0 then
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/npc/fa_hradin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ local function greetCallback(npc, creature, message)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) <= 0 then
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/npc/gabel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ local function greetCallback(npc, creature, message)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) <= 0 then
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
Expand Down
27 changes: 15 additions & 12 deletions data-otservbr-global/npc/haroun.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,22 @@ local function greetCallback(npc, creature, message)
local player = Player(creature)
local playerId = player:getId()

if not MsgContains(message, "djanni'hah") then
npcHandler:say("Whoa! A human! This is no place for you, |PLAYERNAME|. Go and play somewhere else.", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
--Checks if the player has completed the quest
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Mission03) ~= 3 then
if not MsgContains(message, "djanni'hah") then
npcHandler:say("Whoa! A human! This is no place for you, |PLAYERNAME|. Go and play somewhere else.", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) <= 0 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
end

npcHandler:say("Be greeted, human |PLAYERNAME|. How can a humble djinn be of service?", npc, creature)
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/npc/malor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ local function greetCallback(npc, creature, message)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) <= 0 then
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
Expand Down
27 changes: 15 additions & 12 deletions data-otservbr-global/npc/nah_bob.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,22 @@ local function greetCallback(npc, creature, message)
local player = Player(creature)
local playerId = player:getId()

if not MsgContains(message, "djanni'hah") then
npcHandler:say("Whoa! A human! This is no place for you, |PLAYERNAME|. Go and play somewhere else.", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
--Checks if the player has completed the quest
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Mission03) ~= 3 then
if not MsgContains(message, "djanni'hah") then
npcHandler:say("Whoa! A human! This is no place for you, |PLAYERNAME|. Go and play somewhere else.", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) <= 0 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
end

npcHandler:say("<Sighs> Another {customer}! I've only just sat down! What is it, |PLAYERNAME|?", npc, creature)
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/npc/ubaid.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ local function greetCallback(npc, creature, message)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) <= 0 then
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
Expand Down
2 changes: 1 addition & 1 deletion data-otservbr-global/npc/umar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ local function greetCallback(npc, creature, message)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) <= 0 then
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
Expand Down
27 changes: 15 additions & 12 deletions data-otservbr-global/npc/yaman.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,22 @@ local function greetCallback(npc, creature, message)
local player = Player(creature)
local playerId = player:getId()

if not MsgContains(message, "djanni'hah") then
npcHandler:say("Shove off, little one! Humans are not welcome here, |PLAYERNAME|!", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
--Checks if the player has completed the quest
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.EfreetFaction.Mission03) ~= 3 then
if not MsgContains(message, "djanni'hah") then
npcHandler:say("Shove off, little one! Humans are not welcome here, |PLAYERNAME|!", npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end

if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) <= 0 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
if player:getStorageValue(Storage.Quest.U7_4.DjinnWar.MaridFaction.Start) == 1 then
npcHandler:say({
"Hahahaha! ...",
"|PLAYERNAME|, that almost sounded like the word of greeting. Humans - cute they are!",
}, npc, creature)
endConversationWithDelay(npcHandler, npc, creature)
return false
end
end

npcHandler:say("Be greeted, human |PLAYERNAME|. How can a humble djinn be of service?", npc, creature)
Expand Down