summaryrefslogtreecommitdiff
path: root/npc/items
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-09-15 17:44:03 -0300
committerJesusaves <cpntb1@ymail.com>2018-09-15 17:44:03 -0300
commit65afaafc7b0d1db1cc136d64c9829b057563df6a (patch)
tree482e5b04b16ea0ca9e3d0bc7a73fe1d735605a0c /npc/items
parent637bcb34ebcbdff3d25751fe2b8d1d7728f0b211 (diff)
downloadserverdata-65afaafc7b0d1db1cc136d64c9829b057563df6a.tar.gz
serverdata-65afaafc7b0d1db1cc136d64c9829b057563df6a.tar.bz2
serverdata-65afaafc7b0d1db1cc136d64c9829b057563df6a.tar.xz
serverdata-65afaafc7b0d1db1cc136d64c9829b057563df6a.zip
Teleporter will never take less than 30s to recharge
Diffstat (limited to 'npc/items')
-rw-r--r--npc/items/teleporter.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/items/teleporter.txt b/npc/items/teleporter.txt
index f88540ad2..90deb80c1 100644
--- a/npc/items/teleporter.txt
+++ b/npc/items/teleporter.txt
@@ -48,7 +48,7 @@ L_Save:
} else {
doevent "shake::OnGM";
warp "Save", 0, 0;
- TELEPORTER_TIME=gettimetick(2)+(60*30)-(.@x*60);
+ TELEPORTER_TIME=gettimetick(2)+min((60*30)-(.@x*60), 30);
}
closedialog;
end;
@@ -59,7 +59,7 @@ L_LoF:
} else {
doevent "shake::OnGM";
warp "017-1", 120, 89;
- TELEPORTER_TIME=gettimetick(2)+(60*50)-(.@x*60);
+ TELEPORTER_TIME=gettimetick(2)+min((60*50)-(.@x*60), 30);
}
closedialog;
end;