Skip to content

Commit

Permalink
added quest markers, closes #172
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ironbell
Ironbell committed Jan 27, 2018
1 parent eef54bf commit 3086dca
Show file tree
Hide file tree
Showing 49 changed files with 1,477 additions and 57 deletions.
Binary file modified db/game_data.db
View file
Binary file not shown.
7 changes: 5 additions & 2 deletions db/insert_scripts/insert_text_quest_utf8.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.', '?');
Expand Down
3 changes: 2 additions & 1 deletion res/convenience/dialogue/npc_lloyd4.dia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions res/convenience/dialogue/npc_luiz.dia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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?
Expand All @@ -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...
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions res/convenience/dialogue/npc_vincent3.dia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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?
Expand All @@ -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...
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions res/level/test_nr_1/chest.lua
View file
Original file line number Diff line number Diff line change
@@ -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

Binary file added res/level/test_nr_1/layer_3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/level/test_nr_1/layer_5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3086dca

Please sign in to comment.