summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2011-01-30 11:29:48 +0100
committerStefan Beller <stefanbeller@googlemail.com>2011-01-30 11:29:48 +0100
commita3024a4ca87ea4ec974076de8fabc66ce9cac0bd (patch)
tree334a8c402a09adc87cf6b4c7a5c2c41919e3d72c
parenteb291d1c427ad057c2288d010ccd099cfd2b777d (diff)
downloadserverdata-a3024a4ca87ea4ec974076de8fabc66ce9cac0bd.tar.gz
serverdata-a3024a4ca87ea4ec974076de8fabc66ce9cac0bd.tar.bz2
serverdata-a3024a4ca87ea4ec974076de8fabc66ce9cac0bd.tar.xz
serverdata-a3024a4ca87ea4ec974076de8fabc66ce9cac0bd.zip
replace variable Naem_Quest_Done by bit in FLAGS var
-rw-r--r--npc/002-3_Desert_mines/naem.txt4
-rw-r--r--npc/functions/clear_vars.txt3
2 files changed, 5 insertions, 2 deletions
diff --git a/npc/002-3_Desert_mines/naem.txt b/npc/002-3_Desert_mines/naem.txt
index ecd7195b..5f0f9bd6 100644
--- a/npc/002-3_Desert_mines/naem.txt
+++ b/npc/002-3_Desert_mines/naem.txt
@@ -2,7 +2,7 @@
002-3.gat,85,97,6 script Naem 109,{
- if (Naem_Quest_Done == 1) goto L_Naem_Complete;
+ if (FLAGS & FLAG_GOT_NAEM_GLOVES) goto L_Naem_Complete;
if (FLAGS & FLAG_OPENED_UNDERGROUND) goto L_Naem_Gloves;
if (TMW_Quest == 34) goto L_Naem_Code;
if (TMW_Quest == 33) goto L_Naem_Lt;
@@ -113,7 +113,7 @@ L_Naem_Code:
L_Naem_Gloves:
getinventorylist;
if (@inventorylist_count == 100) goto L_Nathan_TooMany;
- set Naem_Quest_Done, 1;
+ set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES;
getitem "MinerGloves", 1;
mes "[Naem]";
mes "\"Hey, good job on getting that together! Take these gloves, they might prove useful in the underground palace.\"";
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt
index 4b3b2f14..62eada3d 100644
--- a/npc/functions/clear_vars.txt
+++ b/npc/functions/clear_vars.txt
@@ -99,6 +99,9 @@ function script ClearVariables {
if (Open_Underground_Palace_Barrier) set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND;
set Open_Underground_Palace_Barrier, 0;
+ if (Naem_Quest_Done) set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES;
+ set Naem_Quest_Done, 0;
+
if (#BankAccount < 0) goto FixBank;
return;