summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-02-11 23:33:22 -0800
committerJessica Tölke <jtoelke@mail.upb.de>2013-02-12 23:05:14 +0100
commitdeb46ed33228125937a3dcf630bf7d415e1b08c6 (patch)
tree4bdf5e64e6c08bf5c6e495a75a1ad0bc55a1f9d8
parentb8a7ee5eeee65369ba5e4e4a88815f8f6e67d9f2 (diff)
downloadserverdata-deb46ed33228125937a3dcf630bf7d415e1b08c6.tar.gz
serverdata-deb46ed33228125937a3dcf630bf7d415e1b08c6.tar.bz2
serverdata-deb46ed33228125937a3dcf630bf7d415e1b08c6.tar.xz
serverdata-deb46ed33228125937a3dcf630bf7d415e1b08c6.zip
o11c's review of the outer mine
-rw-r--r--world/map/npc/002-3/mine_triggertwo.txt4
-rw-r--r--world/map/npc/002-3/naem.txt7
2 files changed, 8 insertions, 3 deletions
diff --git a/world/map/npc/002-3/mine_triggertwo.txt b/world/map/npc/002-3/mine_triggertwo.txt
index c4898d4c..0cc43552 100644
--- a/world/map/npc/002-3/mine_triggertwo.txt
+++ b/world/map/npc/002-3/mine_triggertwo.txt
@@ -1,5 +1,7 @@
//Sandstorm mine trigger
-// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
+// Variables used:
+// - nibble 4 and 5 of QUEST_SouthTulimshar
+// - in FLAGS, FLAG_OPENED_UNDERGROUND
002-3.gat,100,37,0|script|Button|127,0,0,{
diff --git a/world/map/npc/002-3/naem.txt b/world/map/npc/002-3/naem.txt
index a38953ee..bfcde613 100644
--- a/world/map/npc/002-3/naem.txt
+++ b/world/map/npc/002-3/naem.txt
@@ -1,4 +1,6 @@
-// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
+// Variables used:
+// - nibble 4 and 5 of QUEST_SouthTulimshar
+// - in FLAGS, bits FLAG_GOT_NAEM_GLOVES and FLAG_OPENED_UNDERGROUND
002-3.gat,85,97,6|script|Naem|109,{
@@ -12,7 +14,8 @@
if (@state == 22) goto L_Naem_Code;
if (@state == 21) goto L_Naem_Lt;
if (@state == 20) goto L_Naem_Memory;
- if (@state > 17) && (@state < 19)goto L_Naem_Great;
+ if ((@state > 17) && (@state < 19))
+ goto L_Naem_Great;
if (@state == 17) goto L_Naem_Waits_3;
if (@state == 16) goto L_Naem_Help_3;
if (@state == 15) goto L_Naem_Waits_2;