summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/re/item_db.conf1
-rw-r--r--db/re/map_zone_db.conf11
2 files changed, 1 insertions, 11 deletions
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: (