From 6f4b54eada8811d2bbcc27794f68c249c50fb7af Mon Sep 17 00:00:00 2001 From: gumi Date: Sun, 18 Mar 2018 17:22:01 -0400 Subject: fix the yellow towel (used to point to the stat reset house) --- client-data | 2 +- world/map/npc/items/warpTowels.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client-data b/client-data index 9968b270..46ff8c9f 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit 9968b270e8a48242ad8dcae696b520408d7b8bba +Subproject commit 46ff8c9f2b9a463e1b1147519cb6dc08e512d354 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: -- cgit v1.2.3-60-g2f50