From 9dba30d3603b6c088bd7622378756c5914b2d36a Mon Sep 17 00:00:00 2001
From: dawnDus <96957561+dawndus@users.noreply.github.com>
Date: Thu, 17 Mar 2022 18:26:48 -0400
Subject: [PATCH] Allow TSC to keep running when no proper end is reached

---
 src/scripting/tsc/compiler.rs    |  5 +++++
 src/scripting/tsc/text_script.rs | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/scripting/tsc/compiler.rs b/src/scripting/tsc/compiler.rs
index 567a02a..c598eb3 100644
--- a/src/scripting/tsc/compiler.rs
+++ b/src/scripting/tsc/compiler.rs
@@ -123,6 +123,11 @@ impl TextScript {
             }
         }
 
+        // Some nicalis challenges are very broken
+        if !strict {
+            put_varint(TSCOpCode::_END as i32, &mut bytecode);
+        }
+
         Ok(bytecode)
     }
 
diff --git a/src/scripting/tsc/text_script.rs b/src/scripting/tsc/text_script.rs
index f966a6d..f1630da 100644
--- a/src/scripting/tsc/text_script.rs
+++ b/src/scripting/tsc/text_script.rs
@@ -267,7 +267,7 @@ impl TextScriptVM {
 
     pub fn run(state: &mut SharedGameState, game_scene: &mut GameScene, ctx: &mut Context) -> GameResult {
         let scripts_ref = state.textscript_vm.scripts.clone();
-        let scripts = scripts_ref.borrow_mut();
+        let scripts = scripts_ref.borrow();
         let mut cached_event: Option<(u16, &Vec<u8>)> = None;
 
         loop {
@@ -638,8 +638,16 @@ impl TextScriptVM {
                 }
             }
             TSCOpCode::_END => {
-                state.textscript_vm.flags.set_cutscene_skip(false);
-                exec_state = TextScriptExecutionState::Ended;
+                // Vanilla keeps execution going into the next event if no proper end condition is met
+                let scripts_ref = state.textscript_vm.scripts.clone();
+                let scripts = scripts_ref.borrow();
+                let script_list = scripts.scene_script.get_event_ids();
+                if let Some(next_event) = script_list.iter().find(|&&next_event| next_event > event) {
+                    exec_state = TextScriptExecutionState::Running(*next_event, 0 as u32);
+                } else {
+                    state.textscript_vm.flags.set_cutscene_skip(false);
+                    exec_state = TextScriptExecutionState::Ended;
+                }
             }
             TSCOpCode::END => {
                 state.textscript_vm.flags.set_cutscene_skip(false);