Fix remaining inn warps, prevent the player from getting stuck

This means the three ARR inns are now "functional" (as in, you can enter
and exit them.) I also added some code to give you control of your
character in case you hit an unimplemented event.

resources/scripts/Global.lua

@@ -13,9 +13,12 @@ registerAction(9, "actions/FastBlade.lua")
 registerAction(6221, "items/Fantasia.lua")
 
 -- Events
-registerEvent(131078, "warp/WarpInnGridania.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(131092, "common/GenericWarp.lua")
 registerEvent(131093, "common/GenericWarp.lua")
 registerEvent(131094, "common/GenericWarp.lua")
@@ -23,3 +26,5 @@ registerEvent(720916, "custom/000/cmndefinnbed_00020.lua")
 registerEvent(1245185, "opening/OpeningLimsaLominsa.lua")
 registerEvent(1245186, "opening/OpeningGridania.lua")
 registerEvent(1245187, "opening/OpeningUldah.lua")
+
+-- TODO: Generic warps might be decided through ArrayEventHandler?

resources/scripts/warp/WarpInnGridania.lua

@@ -1,7 +1,18 @@
-function onTalk(actorId, player)
+-- TODO: maybe de-duplicare this for all inns?
+
+function onTalk(target, player)
     -- has inn access
-    -- player:play_scene(131079, 00001, 1, 0)
+    player:play_scene(target, EVENT_ID, 00001, 8192, 0)
 
     -- doesn't have inn access
-    player:play_scene(actorId, EVENT_ID, 00002, 8192, 0)
+    --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

resources/scripts/warp/WarpInnUldah.lua

@@ -0,0 +1,16 @@
+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

src/bin/kawari-world.rs

@@ -727,6 +727,8 @@ async fn client_loop(
                                             .await;
                                         }
 
+                                        let mut should_cancel = false;
+                                        {
                                         let lua = lua.lock().unwrap();
                                         let state = lua.app_data_ref::<ExtraLuaState>().unwrap();
 
@@ -741,6 +743,14 @@ async fn client_loop(
                                                     .talk(*actor_id, &mut lua_player);
                                             } else {
                                                 tracing::warn!("Event {event_id} isn't scripted yet! Ignoring...");
+
+                                                should_cancel = true;
+                                            }
+                                        }
+
+                                        if should_cancel {
+                                                // give control back to the player so they aren't stuck
+                                                connection.event_finish(*event_id).await;
                                             }
                                     }
                                     ClientZoneIpcData::EventHandlerReturn { handler_id, scene, error_code, num_results, results } => {

src/world/connection.rs

@@ -601,14 +601,20 @@ impl ZoneConnection {
                     self.warp(*warp_id).await;
                 }
                 Task::BeginLogOut => self.begin_log_out().await,
-                Task::FinishEvent { handler_id } => {
+                Task::FinishEvent { handler_id } => self.event_finish(*handler_id).await,
+            }
+        }
+        player.queued_tasks.clear();
+    }
+
+    pub async fn event_finish(&mut self, handler_id: u32) {
         // sent event finish
         {
             let ipc = ServerZoneIpcSegment {
                 op_code: ServerZoneIpcType::EventFinish,
                 timestamp: timestamp_secs(),
                 data: ServerZoneIpcData::EventFinish {
-                                handler_id: *handler_id,
+                    handler_id,
                     event: 1,
                     result: 1,
                     arg: 0,
@@ -643,10 +649,6 @@ impl ZoneConnection {
             .await;
         }
     }
-            }
-        }
-        player.queued_tasks.clear();
-    }
 
     pub async fn begin_log_out(&mut self) {
         // write the player back to the database