summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/013-3/sword_chest.txt9
-rw-r--r--world/map/npc/functions/clear_vars.txt4
2 files changed, 9 insertions, 4 deletions
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;