From 71631b8c72eef79f721ab3b4a5c03425a0e0aabb Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 27 Jul 2019 20:10:02 -0300
Subject: Warp items will now cancel ship travel. They're allowed again
 onboard.

---
 db/re/item_db.conf     |  1 +
 db/re/map_zone_db.conf | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'db')

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 6e80f1e35..5fb5f2194 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2670,6 +2670,7 @@ item_db: (
 	Script: <"
 		// We would want warp to be delayed a bit but meh
 		sleep2(rand(1000,2500));
+        @timer_navio_running=0;
 		warp "Save", 0, 0;
 	">
 },
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 37071377a..191b3610a 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -228,17 +228,6 @@ zones: (
 	disabled_items: {
 		ExplosiveArrow: true
 		Grenade: true
-		// Warp items because ship will override them
-		TimeFlask: true
-		CandorWarpCrystal: true
-		TulimWarpCrystal: true
-		HalinWarpCrystal: true
-		HurnsWarpCrystal: true
-		LoFWarpCrystal: true
-		NivalWarpCrystal: true
-		FrostiaWarpCrystal: true
-		LilitWarpCrystal: true
-		ReturnPotion: true
 	}
 	
 	mapflags: (
-- 
cgit v1.2.3-60-g2f50