diff --git a/db/game_data.db b/db/game_data.db
index e6b8f63d..6425a3ab 100644
Binary files a/db/game_data.db and b/db/game_data.db differ
diff --git a/db/insert_scripts/insert_text_quest_utf8.sql b/db/insert_scripts/insert_text_quest_utf8.sql
index f49c539f..3ee96a7b 100644
--- a/db/insert_scripts/insert_text_quest_utf8.sql
+++ b/db/insert_scripts/insert_text_quest_utf8.sql
@@ -123,8 +123,11 @@ INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) va
INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('ininas_abduction','quest','Inina''s Abduction','Inina''s Entführung','D''Entführig vode Inina','?');
INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('ininas_abduction', 'quest_desc','Inina was abducted after the paladin guarding her was knocked out by three shady guys. Lloyd wants me to find and interrogate her abductors.', 'Inina wurde entführt nachdem der Paladin, der sie bewachen sollte, von drei dubiosen Typen bewusstlos geschlagen wurde. Lloyd möchte, dass ich ihre Entführer finde und verhöre.', 'D''Inina isch entführt worde nochdem de Paladin wo si bewacht het, vo drei komische Type k.o. gschlage worde isch. De Lloyd wett, dass ich ihri Entführer find und befroge.', '?');
-INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('lloyds_plan','quest','What Is Lloyd''s Plan?','Was ist Lloyd''s Plan?','Was isch em Lloyd sin Plan?','?');
-INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('lloyds_plan', 'quest_desc','The leader of my guild has sent me to spy on the activities of Commander Lloyd. I should follow his orders and find out what he''s up to.', 'Der Anführer meiner Gilde möchte, dass ich den Kommandanten Lloyd ausspioniere. Ich sollte für ihn arbeiten und herausfinden, was er vor hat.', 'Der Anführer meiner Gilde möchte, dass ich de Kommandant Lloyd uusspionier. Ich söt für ihn schaffe und usefinde, was er vor het.', '?');
+INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('lloyds_plan_thief','quest','What Is Lloyd''s Plan?','Was ist Lloyd''s Plan?','Was isch em Lloyd sin Plan?','?');
+INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('lloyds_plan_thief', 'quest_desc','Vincent has sent me to spy on the activities of Commander Lloyd. I should follow his orders and find out what he''s up to.', 'Vincent möchte, dass ich den Kommandanten Lloyd ausspioniere. Ich sollte für ihn arbeiten und herausfinden, was er vor hat.', 'De Vincent wett, dass ich de Kommandant Lloyd uusspionier. Ich söt für ihn schaffe und usefinde, was er vor het.', '?');
+
+INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('lloyds_plan_necro','quest','What Is Lloyd''s Plan?','Was ist Lloyd''s Plan?','Was isch em Lloyd sin Plan?','?');
+INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('lloyds_plan_necro', 'quest_desc','Luiz has sent me to spy on the activities of Commander Lloyd. I should follow his orders and find out what he''s up to.', 'Luiz möchte, dass ich den Kommandanten Lloyd ausspioniere. Ich sollte für ihn arbeiten und herausfinden, was er vor hat.', 'De Luiz wett, dass ich de Kommandant Lloyd uusspionier. Ich söt für ihn schaffe und usefinde, was er vor het.', '?');
INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('cathedral_necro','quest','The Unruly Grimoire','Das Unbändige Buch','Es Widergspängstige Buech','?');
INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('cathedral_necro', 'quest_desc','The clerics want to purify a dangerous grimoire about necromancy in their cathedral. I should bring it back to the library of the necromancers.', 'Die Kleriker wollen ein gefährliches Buch über Nekromantie in ihrer Kathedrale läutern. Ich sollte es zurück in die Bibliothek der Nekromanten bringe.', 'D''Kleriker wend es gföhrlichs Buech über Nekromantie i ihrere Kathedrale lüütere. Ich söls zrugg id Bibliothek vode Nekromante bringe.', '?');
diff --git a/res/convenience/dialogue/npc_lloyd4.dia b/res/convenience/dialogue/npc_lloyd4.dia
index cd608abe..870babbd 100644
--- a/res/convenience/dialogue/npc_lloyd4.dia
+++ b/res/convenience/dialogue/npc_lloyd4.dia
@@ -236,7 +236,8 @@ npc.id:npc_lloyd4
# [13] NPC Node
tag:13
# triggers:
- trigger:DL:addQuestProgress("lloyds_plan", "information_gathered")
+ trigger:DL:addQuestProgress("lloyds_plan_necro", "information_gathered")
+ trigger:DL:addQuestProgress("lloyds_plan_thief", "information_gathered")
trigger:DL:changeQuestState("ininas_abduction", "completed")
# translation:
translation.tag:DL_Lloyd_FoundLetter4
diff --git a/res/convenience/dialogue/npc_luiz.dia b/res/convenience/dialogue/npc_luiz.dia
index 14a77f50..ec57bb1d 100644
--- a/res/convenience/dialogue/npc_luiz.dia
+++ b/res/convenience/dialogue/npc_luiz.dia
@@ -397,7 +397,7 @@ npc.id:npc_luiz
[
# Link node, tag is next tag
tag:24
- condition:DL:isQuestState("lloyds_plan", "void")
+ condition:DL:isQuestState("lloyds_plan_necro", "void")
# translation:
translation.tag:DL_Choice_HowCanIHelp
translation.en:How can I help you?
@@ -407,7 +407,7 @@ npc.id:npc_luiz
[
# Link node, tag is next tag
tag:26
- condition:not DL:isQuestState("lloyds_plan", "void") and DL:isQuestState("cathedral_necro", "void")
+ condition:not DL:isQuestState("lloyds_plan_necro", "void") and DL:isQuestState("cathedral_necro", "void")
# translation:
translation.tag:DL_Choice_WhatElseHelp
translation.en:What else can I do for you?
@@ -427,7 +427,7 @@ npc.id:npc_luiz
[
# Link node, tag is next tag
tag:23
- condition:DL:isQuestState("lloyds_plan", "started") and DL:isQuestComplete("lloyds_plan")
+ condition:DL:isQuestState("lloyds_plan_necro", "started") and DL:isQuestComplete("lloyds_plan_necro")
# translation:
translation.tag:DL_Choice_CompleteLloydsPlan
translation.en:I've talked to Lloyd...
@@ -552,7 +552,7 @@ npc.id:npc_luiz
# [25] NPC Node
tag:25
# triggers:
- trigger:DL:changeQuestState("lloyds_plan", "started")
+ trigger:DL:changeQuestState("lloyds_plan_necro", "started")
# translation:
translation.tag:DL_Luiz_LloydsPlan2
translation.en:We need someone who can talk to him and maybe even work for him. If you find out what he's up to, come back and report.
@@ -670,7 +670,7 @@ npc.id:npc_luiz
# [32] NPC Node
tag:32
# triggers:
- trigger:DL:changeQuestState("lloyds_plan", "completed")
+ trigger:DL:changeQuestState("lloyds_plan_necro", "completed")
trigger:DL:addReputationProgress("necromancer", 5)
# translation:
translation.tag:DL_Luiz_CompleteLloydsPlan
diff --git a/res/convenience/dialogue/npc_vincent3.dia b/res/convenience/dialogue/npc_vincent3.dia
index 2e05bf52..29ec6ecc 100644
--- a/res/convenience/dialogue/npc_vincent3.dia
+++ b/res/convenience/dialogue/npc_vincent3.dia
@@ -368,7 +368,7 @@ npc.id:npc_vincent3
[
# Link node, tag is next tag
tag:12
- condition:DL:isQuestState("lloyds_plan", "void")
+ condition:DL:isQuestState("lloyds_plan_thief", "void")
# translation:
translation.tag:DL_Choice_HowCanIHelp
translation.en:How can I support you?
@@ -378,7 +378,7 @@ npc.id:npc_vincent3
[
# Link node, tag is next tag
tag:22
- condition:not DL:isQuestState("lloyds_plan", "void") and DL:isQuestState("cathedral_thief", "void")
+ condition:not DL:isQuestState("lloyds_plan_thief", "void") and DL:isQuestState("cathedral_thief", "void")
# translation:
translation.tag:DL_Choice_HowElseHelp
translation.en:What else can I do to demonstrate my skills?
@@ -398,7 +398,7 @@ npc.id:npc_vincent3
[
# Link node, tag is next tag
tag:20
- condition:DL:isQuestState("lloyds_plan", "started") and DL:isQuestComplete("lloyds_plan")
+ condition:DL:isQuestState("lloyds_plan_thief", "started") and DL:isQuestComplete("lloyds_plan_thief")
# translation:
translation.tag:DL_Choice_CompleteLloydsPlan
translation.en:I've talked to Lloyd...
@@ -522,7 +522,7 @@ npc.id:npc_vincent3
# [26] NPC Node
tag:26
# triggers:
- trigger:DL:changeQuestState("lloyds_plan", "started")
+ trigger:DL:changeQuestState("lloyds_plan_thief", "started")
# translation:
translation.tag:DL_Vincent_LloydsPlan2
translation.en:We need someone who can talk to him and maybe even work for him. If you find out what he's up to, come back and report.
@@ -640,7 +640,7 @@ npc.id:npc_vincent3
# [29] NPC Node
tag:29
# triggers:
- trigger:DL:changeQuestState("lloyds_plan", "completed")
+ trigger:DL:changeQuestState("lloyds_plan_thief", "completed")
trigger:DL:addReputationProgress("thief", 5)
# translation:
translation.tag:DL_Vincent_CompleteLloydsPlan
diff --git a/res/level/test_nr_1/chest.lua b/res/level/test_nr_1/chest.lua
new file mode 100644
index 00000000..e9346fc7
--- /dev/null
+++ b/res/level/test_nr_1/chest.lua
@@ -0,0 +1,9 @@
+-- chest in level ppuzzle04
+
+onLoot = function(W)
+ W:addConditionProgress("trigger", "tower_4_done")
+ W:addQuestProgress("tower_4", "tower_climbed")
+ W:unlockAchievement("ACH_ETOZ_4")
+ W:startMap("res/map/island/island.tmx", 1215, 660)
+end
+
diff --git a/res/level/test_nr_1/layer_3.png b/res/level/test_nr_1/layer_3.png
new file mode 100644
index 00000000..c6d75cfc
Binary files /dev/null and b/res/level/test_nr_1/layer_3.png differ
diff --git a/res/level/test_nr_1/layer_5.png b/res/level/test_nr_1/layer_5.png
new file mode 100644
index 00000000..48c32b5a
Binary files /dev/null and b/res/level/test_nr_1/layer_5.png differ
diff --git a/res/level/test_nr_1/test_nr_1.tmx b/res/level/test_nr_1/test_nr_1.tmx
new file mode 100644
index 00000000..a7acdc48
--- /dev/null
+++ b/res/level/test_nr_1/test_nr_1.tmx
@@ -0,0 +1,1000 @@
+
+
diff --git a/res/level/test_nr_1/tileset_level_test_nr_1.png b/res/level/test_nr_1/tileset_level_test_nr_1.png
new file mode 100644
index 00000000..9199d0a6
Binary files /dev/null and b/res/level/test_nr_1/tileset_level_test_nr_1.png differ
diff --git a/res/npc/npc_lloyd4/dl_npc_lloyd4.lua b/res/npc/npc_lloyd4/dl_npc_lloyd4.lua
index cff1d217..b4c07b85 100644
--- a/res/npc/npc_lloyd4/dl_npc_lloyd4.lua
+++ b/res/npc/npc_lloyd4/dl_npc_lloyd4.lua
@@ -79,7 +79,8 @@ loadDialogue = function(DL)
DL:createNPCNode(13, 14, "DL_Lloyd_FoundLetter4") -- I've heard from other cases. We must do something!
- DL:addQuestProgress("lloyds_plan", "information_gathered")
+ DL:addQuestProgress("lloyds_plan_thief", "information_gathered")
+ DL:addQuestProgress("lloyds_plan_necro", "information_gathered")
DL:changeQuestState("ininas_abduction", "completed")
DL:addNode()
diff --git a/res/npc/npc_luiz/dl_npc_luiz.lua b/res/npc/npc_luiz/dl_npc_luiz.lua
index e1234a45..f14f9acb 100644
--- a/res/npc/npc_luiz/dl_npc_luiz.lua
+++ b/res/npc/npc_luiz/dl_npc_luiz.lua
@@ -158,16 +158,16 @@ loadDialogue = function(DL)
if (DL:isConditionFulfilled("npc_luiz", "first_spell") and not DL:isSpellLearned("15")) then
DL:addChoice(22, "DL_Choice_TeachMore") -- Can you teach me more spells?
end
- if (DL:isQuestState("lloyds_plan", "void")) then
+ if (DL:isQuestState("lloyds_plan_necro", "void")) then
DL:addChoice(24, "DL_Choice_HowCanIHelp") -- How can I help you?
end
- if (not DL:isQuestState("lloyds_plan", "void") and DL:isQuestState("cathedral_necro", "void")) then
+ if (not DL:isQuestState("lloyds_plan_necro", "void") and DL:isQuestState("cathedral_necro", "void")) then
DL:addChoice(26, "DL_Choice_WhatElseHelp") -- What else can I do for you?
end
if (DL:isQuestState("cathedral_necro", "started") and DL:isQuestComplete("cathedral_necro")) then
DL:addChoice(30, "DL_Choice_FinishedCathedral") -- I got the necrotic grimoire.
end
- if (DL:isQuestState("lloyds_plan", "started") and DL:isQuestComplete("lloyds_plan")) then
+ if (DL:isQuestState("lloyds_plan_necro", "started") and DL:isQuestComplete("lloyds_plan_necro")) then
DL:addChoice(23, "DL_Choice_CompleteLloydsPlan") -- I've talked to Lloyd...
end
if (DL:isSpellLearned("15") and not DL:isConditionFulfilled("npc_luiz", "no_more_spells")) then
@@ -207,19 +207,19 @@ loadDialogue = function(DL)
end
- if (DL:isQuestState("lloyds_plan", "void")) then
+ if (DL:isQuestState("lloyds_plan_necro", "void")) then
DL:createNPCNode(24, 25, "DL_Luiz_LloydsPlan") -- You know the leader of the clerics, Lloyd, don't you? He was acting strangely lately, it seems like he's planning something.
DL:addNode()
DL:createNPCNode(25, -2, "DL_Luiz_LloydsPlan2") -- We need someone who can talk to him and maybe even work for him. If you find out what he's up to, come back and report.
- DL:changeQuestState("lloyds_plan", "started")
+ DL:changeQuestState("lloyds_plan_necro", "started")
DL:addNode()
end
- if (not DL:isQuestState("lloyds_plan", "void") and DL:isQuestState("cathedral_necro", "void")) then
+ if (not DL:isQuestState("lloyds_plan_necro", "void") and DL:isQuestState("cathedral_necro", "void")) then
DL:createNPCNode(26, 27, "DL_Luiz_CathedralNecro") -- Although the clerics do not know our hideout, they managed to get their hands on one of our grimoires about necromancy.
DL:addNode()
@@ -254,14 +254,14 @@ loadDialogue = function(DL)
end
- if (DL:isQuestState("lloyds_plan", "started") and DL:isQuestComplete("lloyds_plan")) then
+ if (DL:isQuestState("lloyds_plan_necro", "started") and DL:isQuestComplete("lloyds_plan_necro")) then
DL:createCendricNode(23, 32, "DL_Cendric_CompleteLloydsPlan") -- ... Some "V." is abducting mages. Lloyd is trying to find out who that is.
DL:addNode()
DL:createNPCNode(32, 33, "DL_Luiz_CompleteLloydsPlan") -- That's interesting, thank you for the report.
- DL:changeQuestState("lloyds_plan", "completed")
+ DL:changeQuestState("lloyds_plan_necro", "completed")
DL:addReputationProgress("necromancer", 5)
DL:addNode()
diff --git a/res/npc/npc_vincent3/dl_npc_vincent3.lua b/res/npc/npc_vincent3/dl_npc_vincent3.lua
index ec08efb8..88a24132 100644
--- a/res/npc/npc_vincent3/dl_npc_vincent3.lua
+++ b/res/npc/npc_vincent3/dl_npc_vincent3.lua
@@ -154,16 +154,16 @@ loadDialogue = function(DL)
if (DL:isSpellLearned("10") and not DL:isConditionFulfilled("npc_vincent3", "no_more_spells")) then
DL:addChoice(32, "DL_Choice_TeachMore") --
end
- if (DL:isQuestState("lloyds_plan", "void")) then
+ if (DL:isQuestState("lloyds_plan_thief", "void")) then
DL:addChoice(12, "DL_Choice_HowCanIHelp") -- How can I support you?
end
- if (not DL:isQuestState("lloyds_plan", "void") and DL:isQuestState("cathedral_thief", "void")) then
+ if (not DL:isQuestState("lloyds_plan_thief", "void") and DL:isQuestState("cathedral_thief", "void")) then
DL:addChoice(22, "DL_Choice_HowElseHelp") -- What else can I do to demonstrate my skills?
end
if (DL:isQuestState("cathedral_thief", "started") and DL:isQuestComplete("cathedral_thief")) then
DL:addChoice(27, "DL_Choice_CathedralFinished") -- I got the candleholders.
end
- if (DL:isQuestState("lloyds_plan", "started") and DL:isQuestComplete("lloyds_plan")) then
+ if (DL:isQuestState("lloyds_plan_thief", "started") and DL:isQuestComplete("lloyds_plan_thief")) then
DL:addChoice(20, "DL_Choice_CompleteLloydsPlan") -- I've talked to Lloyd...
end
if (DL:isQuestState("cathedral_thief", "completed") and DL:isQuestState("yasha_thief", "void")) then
@@ -206,19 +206,19 @@ loadDialogue = function(DL)
end
- if (DL:isQuestState("lloyds_plan", "void")) then
+ if (DL:isQuestState("lloyds_plan_thief", "void")) then
DL:createNPCNode(12, 26, "DL_Vincent_LloydsPlan") -- You know the leader of the clerics, Lloyd, don't you? He was acting strangely lately, it seems like he's planning something.
DL:addNode()
DL:createNPCNode(26, -2, "DL_Vincent_LloydsPlan2") -- We need someone who can talk to him and maybe even work for him. If you find out what he's up to, come back and report.
- DL:changeQuestState("lloyds_plan", "started")
+ DL:changeQuestState("lloyds_plan_thief", "started")
DL:addNode()
end
- if (not DL:isQuestState("lloyds_plan", "void") and DL:isQuestState("cathedral_thief", "void")) then
+ if (not DL:isQuestState("lloyds_plan_thief", "void") and DL:isQuestState("cathedral_thief", "void")) then
DL:createNPCNode(22, 23, "DL_Vincent_CathedralThief") -- The clerics have made a big mistake when they tried to exorcise a dangerous grimoire about necromancy.
DL:addNode()
@@ -253,14 +253,14 @@ loadDialogue = function(DL)
end
- if (DL:isQuestState("lloyds_plan", "started") and DL:isQuestComplete("lloyds_plan")) then
+ if (DL:isQuestState("lloyds_plan_thief", "started") and DL:isQuestComplete("lloyds_plan_thief")) then
DL:createCendricNode(20, 29, "DL_Cendric_CompleteLloydsPlan") -- ... Some "V." is abducting mages. Lloyd is trying to find out who that is.
DL:addNode()
DL:createNPCNode(29, 30, "DL_Vincent_CompleteLloydsPlan") -- Some "V.", eh. (Grins) Well, it's not me, I can assure you that. Thank you for the report.
- DL:changeQuestState("lloyds_plan", "completed")
+ DL:changeQuestState("lloyds_plan_thief", "completed")
DL:addReputationProgress("thief", 5)
DL:addNode()
diff --git a/res/quest/broken_staff.lua b/res/quest/broken_staff.lua
index 4000960b..65300198 100644
--- a/res/quest/broken_staff.lua
+++ b/res/quest/broken_staff.lua
@@ -24,7 +24,7 @@ markers = {
{
map = "res/map/gandria/gandria.tmx",
position = {200, 2550},
- npc = "npc_harek"
+ npc = "npc_harek",
step = -1
}
}
diff --git a/res/quest/cathedral_thief.lua b/res/quest/cathedral_thief.lua
index d30fb078..09a75134 100644
--- a/res/quest/cathedral_thief.lua
+++ b/res/quest/cathedral_thief.lua
@@ -11,7 +11,7 @@ markers = {
},
{
map = "res/map/gandriasewers/gandriasewers.tmx",
- npc = "npc_vincent3"
+ npc = "npc_vincent3",
position = {125, 175},
step = -1
}
diff --git a/res/quest/elder_chest.lua b/res/quest/elder_chest.lua
index 43652aee..dd4fba1b 100644
--- a/res/quest/elder_chest.lua
+++ b/res/quest/elder_chest.lua
@@ -12,7 +12,7 @@ markers = {
{
map = "res/map/gandria/gandria.tmx",
position = {275, 2650},
- npc = "npc_vincent2"
+ npc = "npc_vincent2",
step = -1
}
}
diff --git a/res/quest/invis_recipe.lua b/res/quest/invis_recipe.lua
index f6ee147a..56513af6 100644
--- a/res/quest/invis_recipe.lua
+++ b/res/quest/invis_recipe.lua
@@ -12,7 +12,7 @@ markers = {
{
map = "res/map/gandria/gandria.tmx",
position = {275, 2650},
- npc = "npc_vincent2"
+ npc = "npc_vincent2",
step = -1
}
}
diff --git a/res/quest/join_a_guild.lua b/res/quest/join_a_guild.lua
index 60aafc49..deff750f 100644
--- a/res/quest/join_a_guild.lua
+++ b/res/quest/join_a_guild.lua
@@ -15,11 +15,11 @@ markers = {
},
{
map = "res/map/gandriasewers/gandriasewers.tmx",
- npc = "npc_vincent3"
+ npc = "npc_vincent3",
position = {125, 175},
step = 0
},
- {
+ {
map = "res/map/gandria/gandria.tmx",
position = {675, 1175},
step = 1
@@ -31,7 +31,7 @@ markers = {
},
{
map = "res/map/gandriasewers/gandriasewers.tmx",
- npc = "npc_vincent3"
+ npc = "npc_vincent3",
position = {125, 175},
step = 1
},
@@ -47,7 +47,7 @@ markers = {
},
{
map = "res/map/gandriasewers/gandriasewers.tmx",
- npc = "npc_vincent3"
+ npc = "npc_vincent3",
position = {125, 175},
step = 2
},
@@ -63,7 +63,7 @@ markers = {
},
{
map = "res/map/gandriasewers/gandriasewers.tmx",
- npc = "npc_vincent3"
+ npc = "npc_vincent3",
position = {125, 175},
step = 3
},
diff --git a/res/quest/jonathan_knowledge.lua b/res/quest/jonathan_knowledge.lua
index cecef86a..d77e5dcb 100644
--- a/res/quest/jonathan_knowledge.lua
+++ b/res/quest/jonathan_knowledge.lua
@@ -7,7 +7,7 @@ collectibles =
markers = {
{
map = "res/map/highland/highland.tmx",
- position = {1900, 650},
+ position = {1900, 600},
step = 0
},
{
diff --git a/res/quest/leeroy_chicken.lua b/res/quest/leeroy_chicken.lua
index 39e1fe8d..5ce552b0 100644
--- a/res/quest/leeroy_chicken.lua
+++ b/res/quest/leeroy_chicken.lua
@@ -5,3 +5,16 @@ collectibles =
{"qe_leeroychicken", 1},
}
+markers = {
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {1425, 2525},
+ step = 0
+ },
+ {
+ map = "res/map/marshland/marshland.tmx",
+ position = {1375, 475},
+ npc = "npc_leeroy",
+ step = -1
+ }
+}
diff --git a/res/quest/lloyds_plan.lua b/res/quest/lloyds_plan.lua
deleted file mode 100644
index 0054503c..00000000
--- a/res/quest/lloyds_plan.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-main_quest = true
-
-conditions = {
- "information_gathered",
-}
-
-
diff --git a/res/quest/lloyds_plan_necro.lua b/res/quest/lloyds_plan_necro.lua
new file mode 100644
index 00000000..a2c8b072
--- /dev/null
+++ b/res/quest/lloyds_plan_necro.lua
@@ -0,0 +1,18 @@
+main_quest = true
+
+conditions = {
+ "information_gathered",
+}
+
+markers = {
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {675, 1175},
+ step = 0
+ },
+ {
+ map = "res/map/marshland/marshland.tmx",
+ position = {1425, 1625},
+ step = -1
+ }
+}
diff --git a/res/quest/lloyds_plan_thief.lua b/res/quest/lloyds_plan_thief.lua
new file mode 100644
index 00000000..5ae20d23
--- /dev/null
+++ b/res/quest/lloyds_plan_thief.lua
@@ -0,0 +1,20 @@
+main_quest = true
+
+conditions = {
+ "information_gathered",
+}
+
+markers = {
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {675, 1175},
+ step = 0
+ },
+ {
+ map = "res/map/gandriasewers/gandriasewers.tmx",
+ npc = "npc_vincent3",
+ position = {125, 175},
+ step = -1
+ }
+}
+
diff --git a/res/quest/meat_delivery.lua b/res/quest/meat_delivery.lua
index d88885e4..880583e9 100644
--- a/res/quest/meat_delivery.lua
+++ b/res/quest/meat_delivery.lua
@@ -3,3 +3,16 @@ collectibles =
{"fo_rawmeat", 5}
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2950, 275},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2325, 1675},
+ npc = "npc_ingrid",
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/missing_bob.lua b/res/quest/missing_bob.lua
index b1e99867..333d768a 100644
--- a/res/quest/missing_bob.lua
+++ b/res/quest/missing_bob.lua
@@ -1,2 +1,21 @@
main_quest = false
--- empty quest
\ No newline at end of file
+
+target_step = 1
+
+markers = {
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {1850, 1250},
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {525, 625},
+ step = 1
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {525, 625},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/missing_inina.lua b/res/quest/missing_inina.lua
index b1e99867..7035c863 100644
--- a/res/quest/missing_inina.lua
+++ b/res/quest/missing_inina.lua
@@ -1,2 +1,21 @@
main_quest = false
--- empty quest
\ No newline at end of file
+
+target_step = 1
+
+markers = {
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {1900, 550},
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {525, 625},
+ step = 1
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {525, 625},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/missing_koray.lua b/res/quest/missing_koray.lua
index b1e99867..232cd68d 100644
--- a/res/quest/missing_koray.lua
+++ b/res/quest/missing_koray.lua
@@ -1,2 +1,19 @@
main_quest = false
--- empty quest
\ No newline at end of file
+
+markers = {
+ {
+ map = "res/map/marshland/marshland.tmx",
+ position = {400, 1450},
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {525, 625},
+ step = 1
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {525, 625},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/missing_paladin.lua b/res/quest/missing_paladin.lua
index a87e1ecc..8cd52464 100644
--- a/res/quest/missing_paladin.lua
+++ b/res/quest/missing_paladin.lua
@@ -5,5 +5,18 @@ collectibles =
{"eq_lightpendant", 1}
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {1600, 2300},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2250, 2650},
+ npc = "npc_inina",
+ step = -1
+ }
+}
diff --git a/res/quest/monster_problem.lua b/res/quest/monster_problem.lua
index eff01cd4..a17205cd 100644
--- a/res/quest/monster_problem.lua
+++ b/res/quest/monster_problem.lua
@@ -3,4 +3,17 @@ conditions =
"monster_banished"
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2850, 2400},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2250, 2650},
+ npc = "npc_inina",
+ step = -1
+ }
+}
diff --git a/res/quest/questionable_method.lua b/res/quest/questionable_method.lua
index 7dbe2458..3e8f0da4 100644
--- a/res/quest/questionable_method.lua
+++ b/res/quest/questionable_method.lua
@@ -5,3 +5,15 @@ collectibles =
{"qe_bone", 3}
}
+markers = {
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {3575, 2750},
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {975, 2875},
+ step = -1
+ }
+}
diff --git a/res/quest/receiver.lua b/res/quest/receiver.lua
index b7ec9266..a66763aa 100644
--- a/res/quest/receiver.lua
+++ b/res/quest/receiver.lua
@@ -1,4 +1,11 @@
main_quest = false
-
+markers = {
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {1350, 2075},
+ npc = "npc_douglas",
+ step = -1
+ }
+}
diff --git a/res/quest/roast_meat_for_ingrid.lua b/res/quest/roast_meat_for_ingrid.lua
index ec788f0a..19d2a2f3 100644
--- a/res/quest/roast_meat_for_ingrid.lua
+++ b/res/quest/roast_meat_for_ingrid.lua
@@ -3,3 +3,16 @@ collectibles =
{"fo_roastedmeat", 5}
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2375, 1675},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2325, 1675},
+ npc = "npc_ingrid",
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/save_leeroy.lua b/res/quest/save_leeroy.lua
index 4cd851d7..1edc334f 100644
--- a/res/quest/save_leeroy.lua
+++ b/res/quest/save_leeroy.lua
@@ -4,4 +4,18 @@ conditions =
"save_leeroy"
}
+markers = {
+ {
+ map = "res/map/marshland/marshland.tmx",
+ position = {1375, 475},
+ step = 0
+ },
+ {
+ map = "res/map/marshland/marshland.tmx",
+ position = {1375, 825},
+ npc = "npc_leeroy2",
+ step = -1
+ }
+}
+
diff --git a/res/quest/silkweed_potion.lua b/res/quest/silkweed_potion.lua
index 1f790d31..576ce4db 100644
--- a/res/quest/silkweed_potion.lua
+++ b/res/quest/silkweed_potion.lua
@@ -6,3 +6,21 @@ collectibles =
{"mi_corrupt_stone_ice", 1}
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2150, 2025},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {3150, 1300},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2025, 1825},
+ step = -1
+ }
+}
+
diff --git a/res/quest/spoiled_fire.lua b/res/quest/spoiled_fire.lua
index 41d03da9..af983424 100644
--- a/res/quest/spoiled_fire.lua
+++ b/res/quest/spoiled_fire.lua
@@ -3,3 +3,10 @@ collectibles =
{"qe_spoiledfeudalfire", 1}
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2025, 1825},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/stevens_helmet.lua b/res/quest/stevens_helmet.lua
index df1f087e..d23d5bc0 100644
--- a/res/quest/stevens_helmet.lua
+++ b/res/quest/stevens_helmet.lua
@@ -3,3 +3,15 @@ collectibles =
{"eq_stevenhelmet", 1}
}
+markers = {
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {3575, 2775},
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {675, 1175},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/teleport_own.lua b/res/quest/teleport_own.lua
index c24d34f0..b2ceb6c7 100644
--- a/res/quest/teleport_own.lua
+++ b/res/quest/teleport_own.lua
@@ -9,3 +9,15 @@ conditions = {
"portstone_activated",
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {3150, 1350},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {3150, 1350},
+ step = -1
+ }
+}
diff --git a/res/quest/teleport_robert.lua b/res/quest/teleport_robert.lua
index c14e0e51..6609942b 100644
--- a/res/quest/teleport_robert.lua
+++ b/res/quest/teleport_robert.lua
@@ -5,5 +5,17 @@ collectibles =
{"qe_portstone_bob", 1}
}
-
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {3225, 1725},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {3225, 1525},
+ npc = "npc_robert2",
+ step = -1
+ }
+}
diff --git a/res/quest/the_mark.lua b/res/quest/the_mark.lua
index 0054503c..5ce0f8fd 100644
--- a/res/quest/the_mark.lua
+++ b/res/quest/the_mark.lua
@@ -4,4 +4,37 @@ conditions = {
"information_gathered",
}
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2025, 1825},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2250, 2650},
+ npc = "npc_inina",
+ step = 1
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {975, 2875},
+ step = 2
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {975, 2875},
+ step = 3
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {975, 2875},
+ step = 4
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {525, 375},
+ step = -1
+ }
+}
diff --git a/res/quest/theas_dream.lua b/res/quest/theas_dream.lua
index df1cf1a4..081c397b 100644
--- a/res/quest/theas_dream.lua
+++ b/res/quest/theas_dream.lua
@@ -1,3 +1,41 @@
main_quest = false
+target_step = 2
+
+markers = {
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {200, 2550},
+ npc = "npc_harek",
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {500, 2500},
+ npc = "npc_zeff3",
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {975, 2825},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {875, 1575},
+ step = 1
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {975, 2875},
+ step = 2
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {975, 2875},
+ step = -1
+ }
+}
+
+
diff --git a/res/quest/yasha_cleric.lua b/res/quest/yasha_cleric.lua
index 87df5c36..ab78bffe 100644
--- a/res/quest/yasha_cleric.lua
+++ b/res/quest/yasha_cleric.lua
@@ -2,3 +2,16 @@ conditions =
{
"leap_of_faith",
}
+
+markers = {
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {225, 1900},
+ step = 0
+ },
+ {
+ map = "res/map/gandria/gandria.tmx",
+ position = {675, 1175},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/yasha_necro.lua b/res/quest/yasha_necro.lua
index d6eb8e9e..39c871b1 100644
--- a/res/quest/yasha_necro.lua
+++ b/res/quest/yasha_necro.lua
@@ -3,3 +3,15 @@ collectibles =
{"qe_yashamask", 1},
}
+markers = {
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {225, 1900},
+ step = 0
+ },
+ {
+ map = "res/map/marshland/marshland.tmx",
+ position = {1425, 1625},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/yasha_sanctuary.lua b/res/quest/yasha_sanctuary.lua
index f8a9a727..da9749bc 100644
--- a/res/quest/yasha_sanctuary.lua
+++ b/res/quest/yasha_sanctuary.lua
@@ -1 +1,14 @@
main_quest = false
+
+markers = {
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {1850, 1350},
+ step = 0
+ },
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {225, 1850},
+ step = 0
+ }
+}
diff --git a/res/quest/yasha_sword.lua b/res/quest/yasha_sword.lua
index e7879fc6..a4412ea6 100644
--- a/res/quest/yasha_sword.lua
+++ b/res/quest/yasha_sword.lua
@@ -5,3 +5,16 @@ collectibles =
{"gold", 50},
}
+markers = {
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {500, 1700},
+ step = 0
+ },
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {375, 1325},
+ npc = "npc_jason",
+ step = 0
+ }
+}
\ No newline at end of file
diff --git a/res/quest/yasha_thief.lua b/res/quest/yasha_thief.lua
index 6fdec1ea..b18a18d3 100644
--- a/res/quest/yasha_thief.lua
+++ b/res/quest/yasha_thief.lua
@@ -3,3 +3,16 @@ collectibles =
{"qe_thunderheart", 1},
}
+markers = {
+ {
+ map = "res/map/highland/highland.tmx",
+ position = {225, 1900},
+ step = 0
+ },
+ {
+ map = "res/map/gandriasewers/gandriasewers.tmx",
+ npc = "npc_vincent3",
+ position = {125, 175},
+ step = -1
+ }
+}
\ No newline at end of file
diff --git a/res/quest/zeff_returns.lua b/res/quest/zeff_returns.lua
index 969026ef..82f5a275 100644
--- a/res/quest/zeff_returns.lua
+++ b/res/quest/zeff_returns.lua
@@ -3,4 +3,17 @@ conditions =
"guards_convinced"
}
-
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {1325, 3000},
+ npc = "npc_cityguard1",
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {1125, 1025},
+ npc = "npc_zeff",
+ step = -1
+ },
+}
diff --git a/res/quest/zeffs_curse.lua b/res/quest/zeffs_curse.lua
index bd19ddcc..7b80db3e 100644
--- a/res/quest/zeffs_curse.lua
+++ b/res/quest/zeffs_curse.lua
@@ -3,4 +3,16 @@ targets =
{"MysteriousBeast", 1}
}
-
+markers = {
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {2850, 2350},
+ step = 0
+ },
+ {
+ map = "res/map/meadows/meadows.tmx",
+ position = {1125, 1025},
+ npc = "npc_zeff",
+ step = -1
+ },
+}
diff --git a/saves/.vscode/settings.json b/saves/.vscode/settings.json
new file mode 100644
index 00000000..7a73a41b
--- /dev/null
+++ b/saves/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/src/GUI/MapOverlay.cpp b/src/GUI/MapOverlay.cpp
index 193a7b97..f9a5b9e5 100644
--- a/src/GUI/MapOverlay.cpp
+++ b/src/GUI/MapOverlay.cpp
@@ -400,10 +400,9 @@ void MapOverlay::reloadQuestMarkers() {
}
else if (markerData.mapId == m_screen->getWorld()->getID() && !markerData.npcId.empty()) {
// this marker is on the current map and references an npc on this map.
- for (auto go : *m_screen->getObjects(_MapMovableGameObject))
- {
+ for (auto go : *m_screen->getObjects(_MapMovableGameObject)) {
auto const npc = dynamic_cast(go);
- if (npc->getNPCData().id == markerData.npcId)
+ if (npc && npc->getNPCData().id == markerData.npcId)
{
markerPos = npc->getPosition();
break;