From 586d2875d12552171688acee5fac7616cf5c7265 Mon Sep 17 00:00:00 2001
From: dyceron <38679103+dyceron@users.noreply.github.com>
Date: Sun, 24 Sep 2023 12:45:46 -0400
Subject: [PATCH 1/2] Revert old change to set to post chase and call function
 isntead

---
 .../files/levels/s050_area5.lua               | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/open_samus_returns_rando/files/levels/s050_area5.lua b/open_samus_returns_rando/files/levels/s050_area5.lua
index 510d3d2..1bc5177 100644
--- a/open_samus_returns_rando/files/levels/s050_area5.lua
+++ b/open_samus_returns_rando/files/levels/s050_area5.lua
@@ -97,23 +97,7 @@ function s050_area5.SetupDebugGameBlackboard()
   Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_SPECIAL_ENERGY_PHASE_DISPLACEMENT", "f", 0)
 end
 function s050_area5.InitFromBlackboard()
-  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase", "AfterChase", true, false)
-  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase_001", "AfterChase", true, false)
-  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase_002", "AfterChase", true, false)
-  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase_003", "AfterChase", true, false)
-  Game.SetSubAreaCurrentSetup("collision_camera_BeforeChase1", "AfterChase", true, false)
-  Game.SetSubAreaCurrentSetup("collision_camera_BeforeChase2", "AfterChase", true, false)
-  Game.SetSubAreaCurrentSetup("collision_camera_BeforeChase3", "AfterChase", true, false)
-  for _FORV_4_, _FORV_5_ in pairs({
-    "SpawnGroup025",
-    "SpawnGroup039",
-    "SpawnGroup040"
-  }) do
-    print(_FORV_5_)
-    if Game.GetEntity(_FORV_5_) ~= nil then
-      Game.GetEntity(_FORV_5_).SPAWNGROUP:EnableSpawnGroup()
-    end
-  end
+  s050_area5.SetAfterChaseSubAreaSetup()
   s050_area5.SetLocationTanksAfterChase()
   if Game.GetEntity("LE_Event_0501") ~= nil and Scenario.ReadFromBlackboard("SpecialEvent0501Launched") then
     Game.GetEntity("LE_Event_0501"):Disable()
@@ -639,6 +623,23 @@ function s050_area5.OnManicMinerBotChaseCutsceneEnd()
   Game.SetPlayerInputEnabled(true, false)
 end
 function s050_area5.SetAfterChaseSubAreaSetup()
+  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase", "AfterChase", true, false)
+  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase_001", "AfterChase", true, false)
+  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase_002", "AfterChase", true, false)
+  Game.SetSubAreaCurrentSetup("collision_camera_AfterChase_003", "AfterChase", true, false)
+  Game.SetSubAreaCurrentSetup("collision_camera_BeforeChase1", "AfterChase", true, false)
+  Game.SetSubAreaCurrentSetup("collision_camera_BeforeChase2", "AfterChase", true, false)
+  Game.SetSubAreaCurrentSetup("collision_camera_BeforeChase3", "AfterChase", true, false)
+  for _FORV_4_, _FORV_5_ in pairs({
+    "SpawnGroup025",
+    "SpawnGroup039",
+    "SpawnGroup040"
+  }) do
+    print(_FORV_5_)
+    if Game.GetEntity(_FORV_5_) ~= nil then
+      Game.GetEntity(_FORV_5_).SPAWNGROUP:EnableSpawnGroup()
+    end
+  end
 end
 function s050_area5.SetLocationTanksAfterChase()
   if Scenario.ReadFromBlackboard("ChaseFinished", true) then

From a99af1eca0c685ab99bde82065479a67cffb23eb Mon Sep 17 00:00:00 2001
From: dyceron <38679103+dyceron@users.noreply.github.com>
Date: Mon, 25 Sep 2023 01:37:46 -0400
Subject: [PATCH 2/2] Odd "fix" for Chase Save Spawn

Will likely just exclude this save as a possible spawn
---
 open_samus_returns_rando/files/levels/s050_area5.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/open_samus_returns_rando/files/levels/s050_area5.lua b/open_samus_returns_rando/files/levels/s050_area5.lua
index 1bc5177..87ed587 100644
--- a/open_samus_returns_rando/files/levels/s050_area5.lua
+++ b/open_samus_returns_rando/files/levels/s050_area5.lua
@@ -621,6 +621,7 @@ function s050_area5.OnManicMinerBotChaseCutsceneStart()
 end
 function s050_area5.OnManicMinerBotChaseCutsceneEnd()
   Game.SetPlayerInputEnabled(true, false)
+  Game.LoadScenario("c10_samus", Init.sStartingScenario, "SPG_ManicMinerBotHidden", "samus", 1)
 end
 function s050_area5.SetAfterChaseSubAreaSetup()
   Game.SetSubAreaCurrentSetup("collision_camera_AfterChase", "AfterChase", true, false)