Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow access to Diggernaut in reverse if final boss #470

Merged
merged 3 commits into from
Sep 11, 2024
Merged

Allow access to Diggernaut in reverse if final boss #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4db6640
Remove breakable Grapple Block if Diggernaut is FB
dyceron Sep 10, 2024
41605ff
Add DNA check for backwards access
dyceron Sep 10, 2024
e32f127
Add checkpoint
dyceron Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/open_samus_returns_rando/files/levels/s070_area7.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,17 @@ function s070_area7.OnExitHazardous_001()
PoisonZone.OnExit()
Game.SetSubAreaCurrentSetup("collision_camera_Hazard_End_A", "Default", false)
end
function s070_area7.OnEnter_Diggernaut_Access()
if Init.sFinalBoss == "Diggernaut" then
if not Blackboard.GetProp("GAME", "OBJECTIVE_COMPLETE") then
local startpoint = "Diggernaut"
GUI.LaunchMessage("Not enough Metroid DNA!\nCollect more DNA to fight Diggernaut!", "RandomizerPowerup.Dummy", "")
Game.AddSF(0, "Scenario.FinalBossReload", "s", startpoint)
else
Game.GetPlayer().vPos = V3D(-18500, -7600, 0)
end
end
end
function s070_area7.OnZeta_001_Intro_Generated(_ARG_0_, _ARG_1_)
s070_area7.OnZeta_001_Generated(_ARG_0_, _ARG_1_)
end
Expand Down Expand Up @@ -816,7 +827,7 @@ function s070_area7.OnSubAreaChange(_ARG_0_, _ARG_1_, _ARG_2_, _ARG_3_, _ARG_4_)
if not Scenario.ReadFromBlackboard("ManicMinerBotStealOrbPlayed", false) then
s070_area7.LaunchManicMinerBotStealOrb()
end
elseif _ARG_0_ == "collision_camera_034" and _ARG_2_ == "collision_camera_043" then
elseif _ARG_2_ == "collision_camera_043" then
if Init.sFinalBoss == "Diggernaut" and not Blackboard.GetProp("GAME", "OBJECTIVE_COMPLETE") then
Game.AddSF(0, "Scenario.ShowFinalBossMessage", "")
elseif not Scenario.ReadFromBlackboard("ManicMinerBotIntroCutscenePlayed", false) then
Expand Down Expand Up @@ -929,6 +940,9 @@ end
function s070_area7.OnEnter_SetCheckpoint_001_ManicMiner()
Game.SetBossCheckPointNames("ST_SG_ManicMiner_Checkpoint", "ST_SG_ManicMiner_Checkpoint", "SG_ManicMinerBot", "", "")
end
function s070_area7.OnEnter_SetCheckpoint_002_ManicMiner()
Game.SetBossCheckPointNames("ST_SG_Diggernaut_Checkpoint", "ST_SG_Diggernaut_Checkpoint", "SG_ManicMinerBot", "", "")
end
function s070_area7.OnManicMinerBotGenerated(_ARG_0_, _ARG_1_)
if _ARG_1_ ~= nil then
_ARG_1_.AI.bPlaceholder = false
Expand Down
12 changes: 12 additions & 0 deletions src/open_samus_returns_rando/misc_patches/final_boss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ class NewTrigger(typing.NamedTuple):


new_triggers = [
NewTrigger(
"s070_area7", "TG_Diggernaut_Access", [-20900.0, -7700.0, 0.0], [50, 700, 300], ["collision_camera_045"]
),
NewTrigger(
"s070_area7",
"TG_SetCheckpoint_002_ManicMiner",
[-21450.0, -7600.0, 0.0],
[50, 700, 300],
["collision_camera_045"],
),
NewTrigger("s100_area10", "TG_Queen_Access", [1000.0, 12050.0, 0.0], [500, 300, 300], ["collision_camera_019"]),
NewTrigger("s110_surfaceb", "TG_Ridley_Access", [-22800.0, 4400.0, 0.0], [150, 800, 800], ["collision_camera_017"]),
]
Expand Down Expand Up @@ -79,6 +89,8 @@ def patch_final_boss(editor: PatcherEditor, configuration: dict) -> None:
if not game_patches["remove_elevator_grapple_blocks"]:
scenario = editor.get_scenario("s070_area7")
scenario.raw.actors[9]["LE_GrappleMov_001"]["position"][0] = -15250.0
# Remove the breakable Grapple block to allow access to Diggernaut backwards
editor.remove_entity({"scenario": "s070_area7", "layer": 9, "actor": "LE_GrappleDest_012"})
elif final_boss == "Queen":
# Remove the Queen wall regardless if the config is set
if not game_patches["reverse_area8"]:
Expand Down
3 changes: 3 additions & 0 deletions src/open_samus_returns_rando/misc_patches/spawn_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ class NewSpawnPoint(typing.NamedTuple):
NewSpawnPoint(
"s050_area5", "ST_Diggernaut_Chase_Respawn", [-2100.0, -4800.0, 0.0], 90, ["collision_camera_AfterChase_001"]
),
NewSpawnPoint(
"s070_area7", "ST_SG_Diggernaut_Checkpoint", [-21450.0, -7600.0, 0.0], 90, ["collision_camera_045"]
),
NewSpawnPoint(
"s110_surfaceb", "ST_SurfaceB_Connector", [-23179.0, 4500.0, 0.0], -90, ["collision_camera_017"]
),
Expand Down