summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWombat <hpwombat@yahoo.com>2011-02-09 05:52:19 -0500
committerWombat <hpwombat@yahoo.com>2011-02-09 05:52:19 -0500
commit3c27ddf9e2f3a3b2467165f7d1409f0d9f97d4fe (patch)
treeaba71d04216fac6720e3d2d1e3ff909a25c81feb
parente0e9f448b7f36ec5a48b188c0298b97ef0767051 (diff)
parentdae7a52eb31080a28b427668e9c2d4b4f793b705 (diff)
downloadserverdata-3c27ddf9e2f3a3b2467165f7d1409f0d9f97d4fe.tar.gz
serverdata-3c27ddf9e2f3a3b2467165f7d1409f0d9f97d4fe.tar.bz2
serverdata-3c27ddf9e2f3a3b2467165f7d1409f0d9f97d4fe.tar.xz
serverdata-3c27ddf9e2f3a3b2467165f7d1409f0d9f97d4fe.zip
Merge remote branch 'mainline/master'
-rw-r--r--npc/009-4/torches.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/npc/009-4/torches.txt b/npc/009-4/torches.txt
index c7897da1..1b17dac6 100644
--- a/npc/009-4/torches.txt
+++ b/npc/009-4/torches.txt
@@ -133,6 +133,7 @@ L_Use_Red:
if (@TorchColor > 6 && @TorchColor < 12) set @Color, @TorchColor + 1;
if (@TorchColor < 6 && @TorchColor > 1) set @Color, @TorchColor - 1;
if (@TorchColor == 12) set @Color, 1;
+ if (@TorchColor == 0) set @Color, 1;
callfunc("SetTorchColor");
delitem "RedPowder", 1;
goto L_Show_Color;
@@ -141,6 +142,7 @@ L_Use_Yellow:
if (countitem("YellowPowder") < 1) goto L_No_Powder;
if (@TorchColor < 10 && @TorchColor > 5) set @Color, @TorchColor - 1;
if (@TorchColor >= 1 && @TorchColor < 5) set @Color, @TorchColor + 1;
+ if (@TorchColor == 0) set @Color, 5;
callfunc("SetTorchColor");
delitem "YellowPowder", 1;
goto L_Show_Color;
@@ -150,6 +152,7 @@ L_Use_Blue:
if (@TorchColor > 4 && @TorchColor < 9) set @Color, @TorchColor + 1;
if (@TorchColor <= 12 && @TorchColor > 9) set @Color, @TorchColor - 1;
if (@TorchColor == 1) set @Color, 12;
+ if (@TorchColor == 0) set @Color, 9;
callfunc("SetTorchColor");
delitem "BluePowder", 1;
goto L_Show_Color;