From e27b5c74d9bd8f9ed1041a09deb1f9b354f99fe5 Mon Sep 17 00:00:00 2001 From: dyceron Date: Tue, 9 Jul 2024 20:36:02 -0400 Subject: [PATCH 1/3] Disable low poly Samus if reloading from checkpoint after starting boss --- src/open_samus_returns_rando/files/levels/s070_area7.lua | 1 + src/open_samus_returns_rando/files/levels/s100_area10.lua | 1 + src/open_samus_returns_rando/files/levels/s110_surfaceb.lua | 1 + 3 files changed, 3 insertions(+) diff --git a/src/open_samus_returns_rando/files/levels/s070_area7.lua b/src/open_samus_returns_rando/files/levels/s070_area7.lua index d276783..64e215f 100644 --- a/src/open_samus_returns_rando/files/levels/s070_area7.lua +++ b/src/open_samus_returns_rando/files/levels/s070_area7.lua @@ -93,6 +93,7 @@ s070_area7.tDNAScanLandmarks = { function s070_area7.InitFromBlackboard() Game.SetSubAreaCurrentSetup("collision_camera_037", "Omega_Enabled", true) Scenario.WriteToBlackboard("OmegaDiscovered", "b", true) + s070_area7.SetLowModelsVisibility(false) if Blackboard.GetProp("s070_area7", "entity_LE_HazarousPool_001_enabled") == nil then Game.GetEntity("LE_HazarousPool_001").HAZAROUSPOOL:Activate(true) Game.GetEntity("LE_HazarousPool_002").HAZAROUSPOOL:Activate(false) diff --git a/src/open_samus_returns_rando/files/levels/s100_area10.lua b/src/open_samus_returns_rando/files/levels/s100_area10.lua index 44ce78c..367e1fe 100644 --- a/src/open_samus_returns_rando/files/levels/s100_area10.lua +++ b/src/open_samus_returns_rando/files/levels/s100_area10.lua @@ -77,6 +77,7 @@ function s100_area10.InitFromBlackboard() Game.DisableEntity("LE_Baby_Hatchling") Game.DisableTrigger("TG_MetroidRadar") Game.GetEntity("LE_RandoDNA").USABLE:Activate(false) + s100_area10.SetLowModelsVisibility(false) if Game.GetEntity("LE_ValveQueen") ~= nil then if Blackboard.GetProp("DEFEATED_ENEMIES", "Metroid") ~= nil and s100_area10.iNumMetroids == Blackboard.GetProp("DEFEATED_ENEMIES", "Metroid") then Game.GetEntity("LE_ValveQueen").MODELUPDATER:SetMeshVisible("Valve", false) diff --git a/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua b/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua index 4f0fc72..5f866ac 100644 --- a/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua +++ b/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua @@ -60,6 +60,7 @@ function s110_surfaceb.ElevatorSetTarget(_ARG_0_) GUI.ElevatorSetTarget("s000_surface_elevator", false) end function s110_surfaceb.InitFromBlackboard() + s110_surfaceb.SetLowModelsVisibility(false) end function s110_surfaceb.OnReloaded() end From e8ce3a75b59f2a987870c966044280bcd5637518 Mon Sep 17 00:00:00 2001 From: dyceron Date: Wed, 10 Jul 2024 01:20:29 -0400 Subject: [PATCH 2/3] Disable low poly when exiting the boss scenarios For reloading save or warp to start in another scenario --- src/open_samus_returns_rando/files/levels/s070_area7.lua | 1 + src/open_samus_returns_rando/files/levels/s100_area10.lua | 1 + src/open_samus_returns_rando/files/levels/s110_surfaceb.lua | 1 + 3 files changed, 3 insertions(+) diff --git a/src/open_samus_returns_rando/files/levels/s070_area7.lua b/src/open_samus_returns_rando/files/levels/s070_area7.lua index 64e215f..c84c77b 100644 --- a/src/open_samus_returns_rando/files/levels/s070_area7.lua +++ b/src/open_samus_returns_rando/files/levels/s070_area7.lua @@ -108,6 +108,7 @@ end function s070_area7.OnReloaded() end function s070_area7.OnExit() + s070_area7.SetLowModelsVisibility(false) end function s070_area7.OnEnter_ActivationDNA_001() -- Game.OnDNAMechApproached("LE_ChozoUnlockAreaDNA_001", 1) diff --git a/src/open_samus_returns_rando/files/levels/s100_area10.lua b/src/open_samus_returns_rando/files/levels/s100_area10.lua index 367e1fe..7be6c9a 100644 --- a/src/open_samus_returns_rando/files/levels/s100_area10.lua +++ b/src/open_samus_returns_rando/files/levels/s100_area10.lua @@ -101,6 +101,7 @@ end function s100_area10.OnReloaded() end function s100_area10.OnExit() + s070_area7.SetLowModelsVisibility(false) end function s100_area10.OnEnter_ActivationTeleport_10_01() Game.OnTeleportApproached("LE_Teleporter_10_01") diff --git a/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua b/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua index 5f866ac..fddba26 100644 --- a/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua +++ b/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua @@ -86,6 +86,7 @@ function s110_surfaceb.InitializeRidleyStorms() end end function s110_surfaceb.OnExit() + s070_area7.SetLowModelsVisibility(false) end function s110_surfaceb.RecoverEnergy() if Game.GetPlayer() ~= nil then From c161fad1bed98f1cc323254bfe99e44abcdce098 Mon Sep 17 00:00:00 2001 From: dyceron Date: Wed, 10 Jul 2024 01:21:47 -0400 Subject: [PATCH 3/3] Fix names --- src/open_samus_returns_rando/files/levels/s100_area10.lua | 2 +- src/open_samus_returns_rando/files/levels/s110_surfaceb.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/open_samus_returns_rando/files/levels/s100_area10.lua b/src/open_samus_returns_rando/files/levels/s100_area10.lua index 7be6c9a..7d61ad4 100644 --- a/src/open_samus_returns_rando/files/levels/s100_area10.lua +++ b/src/open_samus_returns_rando/files/levels/s100_area10.lua @@ -101,7 +101,7 @@ end function s100_area10.OnReloaded() end function s100_area10.OnExit() - s070_area7.SetLowModelsVisibility(false) + s100_area10.SetLowModelsVisibility(false) end function s100_area10.OnEnter_ActivationTeleport_10_01() Game.OnTeleportApproached("LE_Teleporter_10_01") diff --git a/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua b/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua index fddba26..585d13a 100644 --- a/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua +++ b/src/open_samus_returns_rando/files/levels/s110_surfaceb.lua @@ -86,7 +86,7 @@ function s110_surfaceb.InitializeRidleyStorms() end end function s110_surfaceb.OnExit() - s070_area7.SetLowModelsVisibility(false) + s110_surfaceb.SetLowModelsVisibility(false) end function s110_surfaceb.RecoverEnergy() if Game.GetPlayer() ~= nil then