diff options
Diffstat (limited to 'npc/items/warpTowels.txt')
| -rw-r--r-- | npc/items/warpTowels.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt index 35c7d55b..d90e5639 100644 --- a/npc/items/warpTowels.txt +++ b/npc/items/warpTowels.txt @@ -1,10 +1,14 @@ function script WarpTowel { @seconds = TowelLastUsed - (gettimetick(2) - 1200); - if (@seconds > 0 && GM < 1) + if (@seconds > 0 && !is_trusted()) goto L_DontPanic; - if (isin("botcheck",25,27,51,47)) + .@zone = getmapinfo(MAPINFO_ZONE); + if (.@zone == "Jail") goto L_Prison; - if (getmapflag(getmapname(), mf_nosave) || getmapflag(getmapname(), mf_noteleport) || getmapflag(getmapname(), mf_nowarp) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) + // Zone will never be MMO, though + if (.@zone == "MMO" || .@zone == "Event") + goto L_Forbid; + if (getmapflag(getmapname(), mf_noteleport) || getmapflag(getmapname(), mf_nowarp) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) goto L_Forbid; if (@warpTowelName$ == "HitchhikersTowel") @@ -115,7 +119,7 @@ L_WarpPlayer: goto L_BreakChance; L_BreakChance: - if (rand(15)) + if (rand2(12)) goto L_Keep; getitem "HitchhikersTowel", 1; goto L_End; @@ -125,7 +129,7 @@ L_Forbid: goto L_Keep; L_Prison: - message strcharinfo(0), "Towel : You must be warped by a GM to leave the botcheck area."; + message strcharinfo(0), "Towel : You must be warped by a GM to leave this area."; goto L_Keep; L_DontPanic: |