summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-02-03 17:44:55 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-02-12 23:05:14 +0100
commitc88ef1cbf878acd5439c3aef1cdac2f68436e0b5 (patch)
tree7cc56f80b3a45793a1d514618fdb4513b30975c1 /world/map
parentf1cd12437ccd23bb5a713616629d24e348adce3c (diff)
downloadserverdata-c88ef1cbf878acd5439c3aef1cdac2f68436e0b5.tar.gz
serverdata-c88ef1cbf878acd5439c3aef1cdac2f68436e0b5.tar.bz2
serverdata-c88ef1cbf878acd5439c3aef1cdac2f68436e0b5.tar.xz
serverdata-c88ef1cbf878acd5439c3aef1cdac2f68436e0b5.zip
Variable restructuring: move information about opening the chest in Hurnscald mines into FLAGS variable.
Diffstat (limited to 'world/map')
-rw-r--r--world/map/db/const.txt1
-rw-r--r--world/map/npc/013-3/sword_chest.txt9
-rw-r--r--world/map/npc/functions/clear_vars.txt4
3 files changed, 10 insertions, 4 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 6e5f4803..dbb821ba 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -504,6 +504,7 @@ FLAG_ROSSI_COMPLETED 128 // Completed the Rossi Quest
FLAG_TUTORIAL_DONE 256 // player completed tutorial (or entered the tutorial area from outside after it was added)
FLAG_SNOWMAN 512 // player gave candy to the snowman
FLAG_SANTAS_HELPER 1024 // player gave presents to Santa's helper
+FLAG_HURNSMINE_CHEST 2048 // player opened the chest with the short sword in Hurnscald mines
DOCK_tulimshar 1
DOCK_hurnscald 2
diff --git a/world/map/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt
index bb89e3f3..8c89b52d 100644
--- a/world/map/npc/013-3/sword_chest.txt
+++ b/world/map/npc/013-3/sword_chest.txt
@@ -1,14 +1,15 @@
//
013-3.gat,177,22,0|script|Chest|111,{
- if( ChestQuest & 2) goto L_Finished;
+ callfunc "ClearVariables";
+ if (FLAGS & FLAG_HURNSMINE_CHEST) goto L_Finished;
mes "[Chest]";
mes "Would you try to open it?";
next;
menu
- "Yes", L_Yes,
- "No", -;
+ "Yes.", L_Yes,
+ "No.", -;
close;
L_Yes:
@@ -22,7 +23,7 @@ L_Yes:
getitem "ShortSword", 1;
mes "[Chest]";
mes "You opened it and found a short sword!";
- set ChestQuest, ChestQuest | 2;
+ set FLAGS, FLAGS | FLAG_HURNSMINE_CHEST;
close;
L_Not_Enough:
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index d0ca5313..2dbf0d2d 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -133,6 +133,10 @@ function|script|ClearVariables|{
set FLAGS, FLAGS | FLAG_SANTAS_HELPER;
set ChristmasQuest2, 0;
+ if (ChestQuest)
+ set FLAGS, FLAGS | FLAG_HURNSMINE_CHEST;
+ set ChestQuest, 0;
+
if (#BankAccount < 0)
goto FixBank;