summaryrefslogtreecommitdiff
path: root/world/map/npc/009-4/torches.txt
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/009-4/torches.txt')
-rw-r--r--world/map/npc/009-4/torches.txt36
1 files changed, 24 insertions, 12 deletions
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 86dd95fe..03acc6b0 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -1,6 +1,7 @@
//# see detailed description at orum.txt
//# see detailed description at orum.txt
-function|script|GetTorchColor|{
+function|script|GetTorchColor|,
+{
if (@Torch < 0 || @Torch > 2) goto L_Error;
set @Mask, 15;
@@ -13,7 +14,8 @@ L_Error:
close;
}
-function|script|SetTorchColor|{
+function|script|SetTorchColor|,
+{
if (@Torch < 0 || @Torch > 2) goto L_Error;
if (@TorchColor < 1 || @TorchColor > 12) goto L_Error2;
@@ -30,7 +32,8 @@ L_Error2:
close;
}
-function|script|GetTorchIntensity|{
+function|script|GetTorchIntensity|,
+{
if (@Torch < 0 || @Torch > 2) goto L_Error;
set @Mask, 15;
@@ -43,7 +46,8 @@ L_Error:
close;
}
-function|script|SetTorchIntensity|{
+function|script|SetTorchIntensity|,
+{
if (@Torch < 0 || @Torch > 2) goto L_Error;
if (@TorchIntensity < 0 || @TorchIntensity > 2) goto L_Error2;
@@ -60,7 +64,8 @@ L_Error2:
close;
}
-function|script|DoneWithTorches|{
+function|script|DoneWithTorches|,
+{
if (OrumQuest < 11 && OrumQuest >= 8)
return;
@@ -80,26 +85,30 @@ L_Different:
}
// To make sure in range of torches
-function|script|InRangeTorch1|{
+function|script|InRangeTorch1|,
+{
if (isin("009-4.gat",67,20,69,25))
return;
mes "You're too far away to do anything with that torch.";
close;
}
-function|script|InRangeTorch2|{
+function|script|InRangeTorch2|,
+{
if (isin("009-4.gat",65,41,69,46))
return;
mes "You're too far away to do anything with that torch.";
close;
}
-function|script|InRangeTorch3|{
+function|script|InRangeTorch3|,
+{
if (isin("009-4.gat",33,84,37,88))
return;
mes "You're too far away to do anything with that torch.";
close;
}
-function|script|TorchLoop|{
+function|script|TorchLoop|,
+{
// Variables used here:
// @Torch - pass before calling
// @TorchColor - initialized here, updated throughout
@@ -259,7 +268,8 @@ L_Failed:
}
// First Torch
-009-4.gat,68,21,0|script|Torch|400,{
+009-4.gat,68,21,0|script|Torch|400,
+{
callfunc "InRangeTorch1";
callfunc "DoneWithTorches";
@@ -269,7 +279,8 @@ L_Failed:
}
// Second Torch
-009-4.gat,67,42,0|script|Torch|400,{
+009-4.gat,67,42,0|script|Torch|400,
+{
callfunc "InRangeTorch2";
callfunc "DoneWithTorches";
@@ -279,7 +290,8 @@ L_Failed:
}
// Third Torch
-009-4.gat,33,86,0|script|Torch|400,{
+009-4.gat,33,86,0|script|Torch|400,
+{
callfunc "InRangeTorch3";
callfunc "DoneWithTorches";