summaryrefslogtreecommitdiff
path: root/npc/items
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-04-11 15:11:22 -0300
committerJesusaves <cpntb1@ymail.com>2021-04-11 15:11:22 -0300
commit356d9693d69c43f2a66f7e60aa10483803b50951 (patch)
treeb99644d9eee85c07bf2d9c3dd6d9697af97fe419 /npc/items
parent4432d9c535e827ce47e4e06e2afa1dcbc6d6daa6 (diff)
downloadserverdata-356d9693d69c43f2a66f7e60aa10483803b50951.tar.gz
serverdata-356d9693d69c43f2a66f7e60aa10483803b50951.tar.bz2
serverdata-356d9693d69c43f2a66f7e60aa10483803b50951.tar.xz
serverdata-356d9693d69c43f2a66f7e60aa10483803b50951.zip
Add several changes from 2018 which had been excluded by accident =/
Diffstat (limited to 'npc/items')
-rw-r--r--npc/items/warpTowels.txt16
1 files changed, 5 insertions, 11 deletions
diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt
index 0ed9a91c..35c7d55b 100644
--- a/npc/items/warpTowels.txt
+++ b/npc/items/warpTowels.txt
@@ -1,6 +1,6 @@
function script WarpTowel {
@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;
@@ -61,9 +61,9 @@ L_Blue:
L_Yellow:
// Tulimshar Mines
- @NextLocationMap$ = "002-2";
- @NextLocationX = 27;
- @NextLocationY = 28;
+ @NextLocationMap$ = "002-1";
+ @NextLocationX = 113;
+ @NextLocationY = 117;
goto L_WarpPlayer;
L_Purple:
@@ -99,13 +99,7 @@ L_Lime:
@NextLocationMap$ = "006-1";
@NextLocationX = 28;
@NextLocationY = 97;
- if(QUEST_MIRIAM_start != 0) goto L_Cheat;
- goto L_WarpPlayer;
-
-L_Cheat:
- QUEST_MIRIAM_cheat = 1;
- QUEST_MIRIAM_run = gettimetick(2) - QUEST_MIRIAM_start;
- QUEST_MIRIAM_start = 0;
+ callfunc "MiriamCheat";
goto L_WarpPlayer;
L_Save: