summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2018-03-18 17:22:01 -0400
committergumi <git@gumi.ca>2018-03-18 17:22:01 -0400
commit6f4b54eada8811d2bbcc27794f68c249c50fb7af (patch)
tree1f9fb7d46631a5c5ab011b75153b56e41e1644a0
parentbe236e881c86c724403d3b54afbf8db31ac2aee0 (diff)
downloadserverdata-6f4b54eada8811d2bbcc27794f68c249c50fb7af.tar.gz
serverdata-6f4b54eada8811d2bbcc27794f68c249c50fb7af.tar.bz2
serverdata-6f4b54eada8811d2bbcc27794f68c249c50fb7af.tar.xz
serverdata-6f4b54eada8811d2bbcc27794f68c249c50fb7af.zip
fix the yellow towel (used to point to the stat reset house)
m---------client-data0
-rw-r--r--world/map/npc/items/warpTowels.txt8
2 files changed, 4 insertions, 4 deletions
diff --git a/client-data b/client-data
-Subproject 9968b270e8a48242ad8dcae696b520408d7b8bb
+Subproject 46ff8c9f2b9a463e1b1147519cb6dc08e512d35
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index 91c4fccc..461ac333 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -2,7 +2,7 @@
function|script|WarpTowel
{
set @seconds, TowelLastUsed - (gettimetick(2) - 1200);
- if (@seconds > 0)
+ if (@seconds > 0 && GM < 1)
goto L_DontPanic;
if (isin("botcheck",25,27,51,47))
goto L_Prison;
@@ -63,9 +63,9 @@ L_Blue:
L_Yellow:
// Tulimshar Mines
- set @NextLocationMap$, "002-2";
- set @NextLocationX, 27;
- set @NextLocationY, 28;
+ set @NextLocationMap$, "002-1";
+ set @NextLocationX, 113;
+ set @NextLocationY, 117;
goto L_WarpPlayer;
L_Purple: