summaryrefslogtreecommitdiff
path: root/world/map/npc/002-4
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/002-4')
-rw-r--r--world/map/npc/002-4/mine_triggerone.txt28
-rw-r--r--world/map/npc/002-4/mine_triggerthree.txt28
-rw-r--r--world/map/npc/002-4/mine_triggertwo.txt30
-rw-r--r--world/map/npc/002-4/naem.txt50
-rw-r--r--world/map/npc/002-4/underground_palace_barrier.txt7
5 files changed, 39 insertions, 104 deletions
diff --git a/world/map/npc/002-4/mine_triggerone.txt b/world/map/npc/002-4/mine_triggerone.txt
index ef8a75cb..2ea0f8ce 100644
--- a/world/map/npc/002-4/mine_triggerone.txt
+++ b/world/map/npc/002-4/mine_triggerone.txt
@@ -1,13 +1,8 @@
-//Sandstorm mine trigger 1 Trigger 002-4 35,43 (127)
-// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
-
002-4,30,47,0|script|Button#mine-1|400,0,0
{
- set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
- if (@state == 24) goto L_Trigger_Wrong_1;
- if (@state == 23) goto L_Trigger_Wrong_1;
- if (@state == 22) goto L_Trigger_1;
+ if (QL_MINEALL == 24) goto L_Trigger_Wrong_1;
+ if (QL_MINEALL == 23) goto L_Trigger_Wrong_1;
+ if (QL_MINEALL == 22) goto L_Trigger_1;
mes "There is a large button on the ground. A key hole appears on the button.";
goto L_Close;
@@ -20,14 +15,12 @@ L_Trigger_Wrong_1:
"Do nothing.", L_Nothing_1;
L_Right_Wrong_1:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key right.";
goto L_Close;
L_Left_Wrong_1:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key left.";
goto L_Close;
@@ -39,14 +32,12 @@ L_Trigger_1:
"Do nothing.", L_Nothing_1;
L_Right_1:
- set @state, 23;
- callsub S_Update_Var;
+ set QL_MINEALL, 23;
mes "You turn the key right. A clicking sound echoes throughout the mine.";
goto L_Close;
L_Left_1:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key left.";
goto L_Close;
@@ -55,10 +46,5 @@ L_Nothing_1:
goto L_Close;
L_Close:
- set @state, 0;
close;
-
-S_Update_Var:
- set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
- return;
}
diff --git a/world/map/npc/002-4/mine_triggerthree.txt b/world/map/npc/002-4/mine_triggerthree.txt
index 707329da..f79f739a 100644
--- a/world/map/npc/002-4/mine_triggerthree.txt
+++ b/world/map/npc/002-4/mine_triggerthree.txt
@@ -1,13 +1,8 @@
-//Sandstorm mine trigger 3 Trigger 002-4 98,42 (127)
-// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar
-
002-4,91,99,0|script|Button#mine-3|400,0,0
{
- set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
- if (@state == 24) goto L_Trigger_Wrong_3;
- if (@state == 23) goto L_Trigger_3;
- if (@state == 22) goto L_Trigger_Wrong_3;
+ if (QL_MINEALL == 24) goto L_Trigger_Wrong_3;
+ if (QL_MINEALL == 23) goto L_Trigger_3;
+ if (QL_MINEALL == 22) goto L_Trigger_Wrong_3;
mes "There is a large button on the ground. A key hole appears on the button.";
goto L_Close;
@@ -20,14 +15,12 @@ L_Trigger_Wrong_3:
"Do nothing.", L_Nothing_3;
L_Right_Wrong_3:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key right.";
goto L_Close;
L_Left_Wrong_3:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key left.";
goto L_Close;
@@ -39,14 +32,12 @@ L_Trigger_3:
"Do nothing.", L_Nothing_3;
L_Right_3:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key right.";
goto L_Close;
L_Left_3:
- set @state, 24;
- callsub S_Update_Var;
+ set QL_MINEALL, 24;
mes "You turn the key left. A clicking sound echoes throughout the mine.";
goto L_Close;
@@ -55,10 +46,5 @@ L_Nothing_3:
goto L_Close;
L_Close:
- set @state, 0;
close;
-
-S_Update_Var:
- set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
- return;
}
diff --git a/world/map/npc/002-4/mine_triggertwo.txt b/world/map/npc/002-4/mine_triggertwo.txt
index 5ec5b659..bfdf9d17 100644
--- a/world/map/npc/002-4/mine_triggertwo.txt
+++ b/world/map/npc/002-4/mine_triggertwo.txt
@@ -1,15 +1,8 @@
-//Sandstorm mine trigger
-// Variables used:
-// - nibble 4 and 5 of QUEST_SouthTulimshar
-// - in FLAGS, FLAG_OPENED_UNDERGROUND
-
002-4,100,37,0|script|Button#mine-2|400,0,0
{
- set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
- if (@state == 24) goto L_Trigger_2;
- if (@state == 23) goto L_Trigger_Wrong_2;
- if (@state == 22) goto L_Trigger_Wrong_2;
+ if (QL_MINEALL == 24) goto L_Trigger_2;
+ if (QL_MINEALL == 23) goto L_Trigger_Wrong_2;
+ if (QL_MINEALL == 22) goto L_Trigger_Wrong_2;
mes "There is a large button on the ground. A key hole appears on the button.";
goto L_Close;
@@ -22,14 +15,12 @@ L_Trigger_Wrong_2:
"Do nothing.", L_Nothing_2;
L_Right_Wrong_2:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key right.";
goto L_Close;
L_Left_Wrong_2:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key left.";
goto L_Close;
@@ -41,14 +32,12 @@ L_Trigger_2:
"Do nothing.", L_Nothing_2;
L_Right_2:
- set @state, 22;
- callsub S_Update_Var;
+ set QL_MINEALL, 22;
mes "You turn the key right.";
goto L_Close;
L_Left_2:
- set @state, 25;
- callsub S_Update_Var;
+ set QL_MINEALL, 25;
set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND;
mes "You turn the key left. A clicking sound echoes throughout the mine, followed by a loud thump.";
goto L_Close;
@@ -58,10 +47,5 @@ L_Nothing_2:
goto L_Close;
L_Close:
- set @state, 0;
close;
-
-S_Update_Var:
- set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
- return;
}
diff --git a/world/map/npc/002-4/naem.txt b/world/map/npc/002-4/naem.txt
index 34e43b49..a918f4c8 100644
--- a/world/map/npc/002-4/naem.txt
+++ b/world/map/npc/002-4/naem.txt
@@ -1,34 +1,27 @@
-// Variables used:
-// - nibble 4 and 5 of QUEST_SouthTulimshar
-// - in FLAGS, bits FLAG_GOT_NAEM_GLOVES and FLAG_OPENED_UNDERGROUND
-
002-4,91,96,6|script|Naem|109
{
- set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
if (FLAGS & FLAG_GOT_NAEM_GLOVES) goto L_Naem_Complete;
if (FLAGS & FLAG_OPENED_UNDERGROUND) goto L_Naem_Gloves;
- 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))
+ if (QL_MINEALL == 22) goto L_Naem_Code;
+ if (QL_MINEALL == 21) goto L_Naem_Lt;
+ if (QL_MINEALL == 20) goto L_Naem_Memory;
+ if ((QL_MINEALL > 17) && (QL_MINEALL < 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;
- if (@state == 14) goto L_Naem_Help_2;
- if (@state == 13) goto L_Naem_Waits_1;
- if (@state == 12) goto L_Naem_Help_1;
- if (@state == 10) goto L_Naem_Cool;
- if (@state == 9) goto L_Naem_Okay;
+ if (QL_MINEALL == 17) goto L_Naem_Waits_3;
+ if (QL_MINEALL == 16) goto L_Naem_Help_3;
+ if (QL_MINEALL == 15) goto L_Naem_Waits_2;
+ if (QL_MINEALL == 14) goto L_Naem_Help_2;
+ if (QL_MINEALL == 13) goto L_Naem_Waits_1;
+ if (QL_MINEALL == 12) goto L_Naem_Help_1;
+ if (QL_MINEALL == 10) goto L_Naem_Cool;
+ if (QL_MINEALL == 9) goto L_Naem_Okay;
mes "[Naem]";
mes "\"I'm just mining away here. Lots of work to do.\"";
goto L_Close;
L_Naem_Okay:
- set @state, 10;
- callsub S_Update_Var;
+ set QL_MINEALL, 10;
mes "[Naem]";
mes "\"Oh, hello there. Nickos wanted you to check on me? Yeah, you can tell him I'm okay.\"";
goto L_Close;
@@ -39,8 +32,7 @@ L_Naem_Cool:
goto L_Close;
L_Naem_Help_1:
- set @state, 13;
- callsub S_Update_Var;
+ set QL_MINEALL, 13;
mes "[Naem]";
mes "\"Oh, you are here to help move my bags? Cool, I've got a few ready to go. Go ahead and take this one!\"";
next;
@@ -56,8 +48,7 @@ L_Naem_Waits_1:
goto L_Close;
L_Naem_Help_2:
- set @state, 15;
- callsub S_Update_Var;
+ set QL_MINEALL, 15;
mes "Naem gives you a bag of ore.";
next;
mes "[Naem]";
@@ -70,8 +61,7 @@ L_Naem_Waits_2:
goto L_Close;
L_Naem_Help_3:
- set @state, 17;
- callsub S_Update_Var;
+ set QL_MINEALL, 17;
mes "[Naem]";
mes "Hands a bag of ore to you.";
next;
@@ -103,8 +93,7 @@ L_Naem_Duh:
goto L_Close;
L_Naem_Palace_No:
- set @state, 21;
- callsub S_Update_Var;
+ set QL_MINEALL, 21;
mes "[Naem]";
mes "\"Oh no! I lost the key! Don't worry though, talk to Lieutenant Dausen about getting the spare key.\"";
goto L_Close;
@@ -140,10 +129,5 @@ L_Naem_TooMany:
goto L_Close;
L_Close:
- set @state, 0;
close;
-
-S_Update_Var:
- set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT));
- return;
}
diff --git a/world/map/npc/002-4/underground_palace_barrier.txt b/world/map/npc/002-4/underground_palace_barrier.txt
index 6c9d096a..a3e747ca 100644
--- a/world/map/npc/002-4/underground_palace_barrier.txt
+++ b/world/map/npc/002-4/underground_palace_barrier.txt
@@ -1,10 +1,6 @@
-//underground palace barrier
-
002-4,68,98,0|script|#UGP_Barrier|45,0,0
{
- set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT);
-
- if (@state >= 25) goto L_Barrier_Open;
+ if (QL_MINEALL >= 25) goto L_Barrier_Open;
message strcharinfo(0), "Some force seems to block your entrance.";
goto L_End;
@@ -14,6 +10,5 @@ L_Barrier_Open:
goto L_End;
L_End:
- set @state, 0;
end;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-03 06:37:59 +0000