summaryrefslogtreecommitdiff
path: root/npc/items
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-07-27 20:10:02 -0300
committerJesusaves <cpntb1@ymail.com>2019-07-27 20:10:02 -0300
commit71631b8c72eef79f721ab3b4a5c03425a0e0aabb (patch)
tree8478e6b06b8a89d461757ab48dbfc5c07734831f /npc/items
parentfcf770875385091136c1ef50dde6e0caebfc8b18 (diff)
downloadserverdata-71631b8c72eef79f721ab3b4a5c03425a0e0aabb.tar.gz
serverdata-71631b8c72eef79f721ab3b4a5c03425a0e0aabb.tar.bz2
serverdata-71631b8c72eef79f721ab3b4a5c03425a0e0aabb.tar.xz
serverdata-71631b8c72eef79f721ab3b4a5c03425a0e0aabb.zip
Warp items will now cancel ship travel. They're allowed again onboard.
Diffstat (limited to 'npc/items')
-rw-r--r--npc/items/lofteleporter.txt4
-rw-r--r--npc/items/teleporter.txt3
2 files changed, 6 insertions, 1 deletions
diff --git a/npc/items/lofteleporter.txt b/npc/items/lofteleporter.txt
index 44cf93c59..2540c90dc 100644
--- a/npc/items/lofteleporter.txt
+++ b/npc/items/lofteleporter.txt
@@ -71,21 +71,25 @@ OnUse:
warp "017-1", 120, 89;
TELEPORTER_TIME=loftel_time(40, .@x);
LOCATION$="LoF";
+ @timer_navio_running=0;
break;
case 3:
warp "024-1", 155, 82;
TELEPORTER_TIME=loftel_time(120, .@x);
LOCATION$="Frostia";
+ @timer_navio_running=0;
break;
case 4:
warp "009-1", 113, 91;
TELEPORTER_TIME=loftel_time(120, .@x);
LOCATION$="Halin";
+ @timer_navio_running=0;
break;
case 5:
warp "Save", 0, 0;
TELEPORTER_TIME=loftel_time(20, .@x);
//LOCATION$="Save";
+ @timer_navio_running=0;
break;
}
closedialog;
diff --git a/npc/items/teleporter.txt b/npc/items/teleporter.txt
index dad9b97a7..40bf61821 100644
--- a/npc/items/teleporter.txt
+++ b/npc/items/teleporter.txt
@@ -41,8 +41,9 @@ OnUse:
else
getitem BrokenWarpCrystal, 1;
- // Apply Cooldown, same variable as LoF Teleporter
+ // Apply Cooldown, same variable as LoF Teleporter, cancel ship travels
TELEPORTER_TIME=gettimetick(2)+300;
+ @timer_navio_running=0;
// Save new location and warp you there
EnterTown(@dest$);