diff options
| -rw-r--r-- | world/map/npc/002-2/stranger.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/functions/soul_menhir.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/items/warpTowels.txt | 27 |
3 files changed, 1 insertions, 28 deletions
diff --git a/world/map/npc/002-2/stranger.txt b/world/map/npc/002-2/stranger.txt index c1d4699e..0b47e716 100644 --- a/world/map/npc/002-2/stranger.txt +++ b/world/map/npc/002-2/stranger.txt @@ -420,7 +420,6 @@ L_DeletePowder: L_DyeTowel: delitem @towelReq$[@towelCheckCount], 1; - callfunc "MultiWarpTowel"; delitem "BottleOfWater", 1; getitem @warpTowelName$, 1; mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again."; diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt index 6c2c1c17..9d6f04ce 100644 --- a/world/map/npc/functions/soul_menhir.txt +++ b/world/map/npc/functions/soul_menhir.txt @@ -11,7 +11,6 @@ function|script|SoulMenhir L_Towel: if (TowelLastUsed > (gettimetick(2) - 1800)) goto L_DontPanic; - callfunc "MultiWarpTowel"; set TowelLastUsed, gettimetick(2); mes "[Soul Menhir]"; mes "(You touch the mysterious stone. Somehow it feels hard and soft at the same time.)"; diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index 122ac7c0..91c4fccc 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -1,7 +1,7 @@ // See #TravelConfig function|script|WarpTowel { - set @seconds, TowelLastUsed - (gettimetick(2) - 1800); + set @seconds, TowelLastUsed - (gettimetick(2) - 1200); if (@seconds > 0) goto L_DontPanic; if (isin("botcheck",25,27,51,47)) @@ -9,8 +9,6 @@ function|script|WarpTowel if (getmapflag(getmap(), MF_NOSAVE) || getmapflag(getmap(), MF_NOTELEPORT) || getmapflag(getmap(), MF_NOWARP) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) goto L_Forbid; - callfunc "MultiWarpTowel"; - if (@warpTowelName$ == "HitchhikersTowel") goto L_Save; if(@warpTowelName$ == "WhiteHitchhikersTowel") @@ -154,26 +152,3 @@ L_End: set @warpTowelName$, ""; return; } - -function|script|MultiWarpTowel -{ - setarray $@warpTowels$, "HitchhikersTowel", "WhiteHitchhikersTowel", "RedHitchhikersTowel", "GreenHitchhikersTowel", "BlueHitchhikersTowel", "YellowHitchhikersTowel", "PurpleHitchhikersTowel", "OrangeHitchhikersTowel", "PinkHitchhikersTowel", "TealHitchhikersTowel", "LimeHitchhikersTowel"; - set @towel_count, 0; - set @towel_loop, 0; - goto L_CountTowelLoop; - -L_CountTowelLoop: - set @towel_count, (@towel_count + countitem($@warpTowels$[@towel_loop])); - delitem $@warpTowels$[@towel_loop], countitem($@warpTowels$[@towel_loop]); - goto L_DelLoopAgain; - -L_DelLoopAgain: - if((@towel_loop + 1) == getarraysize($@warpTowels$)) - goto L_Return; - set @towel_loop, (@towel_loop + 1); - goto L_CountTowelLoop; - -L_Return: - cleararray $@warpTowels$, "", getarraysize($@warpTowels$); - return; -} |