diff options
Diffstat (limited to 'world/map/npc/items')
-rw-r--r-- | world/map/npc/items/rubber_bat.txt | 11 | ||||
-rw-r--r-- | world/map/npc/items/warpTowels.txt | 27 |
2 files changed, 12 insertions, 26 deletions
diff --git a/world/map/npc/items/rubber_bat.txt b/world/map/npc/items/rubber_bat.txt new file mode 100644 index 00000000..edf12416 --- /dev/null +++ b/world/map/npc/items/rubber_bat.txt @@ -0,0 +1,11 @@ +function|script|rubberBat +{ + if (gettimetick(2) - @lastbat < 2) goto L_Return; + misceffect 403; + set @lastbat, gettimetick(2); + goto L_Return; + +L_Return: + getitem "RubberBat", 1; + return; +} 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; -} |