From db5a81528f9159f8e90775caf6bf482a65e41cda Mon Sep 17 00:00:00 2001
From: The Dax <thedax@users.noreply.github.com>
Date: Sat, 21 Jun 2025 07:11:34 -0400
Subject: [PATCH] Consolidate exit-to-inn scripts into a generic one. -Also
 comment what most generic warps are for -Might move the loose/magic event IDs
 into their own file in the future...

---
 resources/scripts/Global.lua                   | 18 ++++++++++++------
 ...pInnLimsaLominsa.lua => WarpInnGeneric.lua} |  0
 resources/scripts/warp/WarpInnGridania.lua     | 18 ------------------
 resources/scripts/warp/WarpInnUldah.lua        | 16 ----------------
 4 files changed, 12 insertions(+), 40 deletions(-)
 rename resources/scripts/warp/{WarpInnLimsaLominsa.lua => WarpInnGeneric.lua} (100%)
 delete mode 100644 resources/scripts/warp/WarpInnGridania.lua
 delete mode 100644 resources/scripts/warp/WarpInnUldah.lua

diff --git a/resources/scripts/Global.lua b/resources/scripts/Global.lua
index 839fc6f..941372a 100644
--- a/resources/scripts/Global.lua
+++ b/resources/scripts/Global.lua
@@ -50,15 +50,21 @@ registerAction(6221, "items/Fantasia.lua")
 -- Events
 registerEvent(721028, "tosort/UnendingJourney.lua")
 registerEvent(721044, "tosort/CrystalBell.lua")
-registerEvent(131079, "warp/WarpInnLimsaLominsa.lua")
-registerEvent(131080, "warp/WarpInnGridania.lua")
-registerEvent(131081, "warp/WarpInnUldah.lua")
-registerEvent(131082, "common/GenericWarp.lua")
-registerEvent(131083, "common/GenericWarp.lua")
-registerEvent(131084, "common/GenericWarp.lua")
+registerEvent(131079, "warp/WarpInnGeneric.lua") -- Exit Limsa Upper Decks to Mizzenmast Inn room
+registerEvent(131080, "warp/WarpInnGeneric.lua") -- Exit New Gridania to Inn room
+registerEvent(131081, "warp/WarpInnGeneric.lua") -- Exit Ul'dah: Steps of Nald to The Hourglass Inn room
+registerEvent(131082, "common/GenericWarp.lua") -- Exit Mizzenmast Inn to Limsa Upper Decks
+registerEvent(131083, "common/GenericWarp.lua") -- Exit The Roost to New Gridania
+registerEvent(131084, "common/GenericWarp.lua") -- Exit The Hourglass to Ul'dah: Steps of Nald
 registerEvent(131092, "common/GenericWarp.lua")
 registerEvent(131093, "common/GenericWarp.lua")
 registerEvent(131094, "common/GenericWarp.lua")
+registerEvent(131204, "warp/WarpInnGeneric.lua") -- Exit Ishgard: Foundation to Cloud Nine Inn room
+registerEvent(131205, "common/GenericWarp.lua") -- Exit Cloud Nine to Ishgard: Foundation
+registerEvent(131246, "common/GenericWarp.lua") -- Exit Bokairo Inn to Kugane
+registerEvent(131312, "common/GenericWarp.lua") -- Exit The Pendants Personal Suite to Crystarium
+registerEvent(131402, "common/GenericWarp.lua") -- Exit Andron to Old Sharlayan
+registerEvent(131578, "common/GenericWarp.lua") -- Exit The For'ard Cabins to Tuliyollal
 registerEvent(720916, "custom/000/cmndefinnbed_00020.lua")
 registerEvent(1245185, "opening/OpeningLimsaLominsa.lua")
 registerEvent(1245186, "opening/OpeningGridania.lua")
diff --git a/resources/scripts/warp/WarpInnLimsaLominsa.lua b/resources/scripts/warp/WarpInnGeneric.lua
similarity index 100%
rename from resources/scripts/warp/WarpInnLimsaLominsa.lua
rename to resources/scripts/warp/WarpInnGeneric.lua
diff --git a/resources/scripts/warp/WarpInnGridania.lua b/resources/scripts/warp/WarpInnGridania.lua
deleted file mode 100644
index 80cea53..0000000
--- a/resources/scripts/warp/WarpInnGridania.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- TODO: maybe de-duplicare this for all inns?
-
-function onTalk(target, player)
-    -- has inn access
-    player:play_scene(target, EVENT_ID, 00001, 8192, 0)
-
-    -- doesn't have inn access
-    --player:play_scene(actorId, EVENT_ID, 00002, 8192, 0)
-end
-
-function onReturn(scene, results, player)
-    player:finish_event(EVENT_ID)
-
-    if results[1] == 1 then
-        -- get warp
-        player:warp(EVENT_ID)
-    end
-end
diff --git a/resources/scripts/warp/WarpInnUldah.lua b/resources/scripts/warp/WarpInnUldah.lua
deleted file mode 100644
index 0a196c1..0000000
--- a/resources/scripts/warp/WarpInnUldah.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-function onTalk(target, player)
-    -- has inn access
-    player:play_scene(target, EVENT_ID, 00001, 8192, 0)
-
-    -- doesn't have inn access
-    --player:play_scene(actorId, EVENT_ID, 00002, 8192, 0)
-end
-
-function onReturn(scene, results, player)
-    player:finish_event(EVENT_ID)
-
-    if results[1] == 1 then
-        -- get warp
-        player:warp(EVENT_ID)
-    end
-end