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

Disable the intro spawn trigger for the newborn alpha if already dead #319

Merged
merged 2 commits into from
Apr 14, 2024
Merged

Disable the intro spawn trigger for the newborn alpha if already dead #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19befe8
Disable the intro spawn trigger for the alpha if already dead
dyceron Apr 13, 2024
6950b75
DisableTrigger
dyceron Apr 14, 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
4 changes: 2 additions & 2 deletions src/open_samus_returns_rando/files/levels/s000_surface.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function s000_surface.InitFromBlackboard()
Game.SaturateSpawnGroup("SpawnGroup008")
end
if Scenario.ReadFromBlackboard("AlphaIntroPlayed", false) then
Game.DisableEntity("TG_Intro_Alpha")
Game.DisableTrigger("TG_Intro_Alpha")
end
-- if not Blackboard.GetProp("DEFEATED_ENEMIES", "Queen") or not (Blackboard.GetProp("DEFEATED_ENEMIES", "Queen") > 0) then
Game.DisableEntity("LE_Queen_Door")
Expand Down Expand Up @@ -249,6 +249,7 @@ end
function s000_surface.OnEnter_Alpha_001_Dead()
if 0 < Scenario.ReadFromBlackboard("entity_SG_Alpha_001_deaths", 0) then
Game.SetSubAreaCurrentSetup("collision_camera_010", "PostAlpha_001", true)
Game.DisableEntity("TG_Intro_Alpha")
end
end
function s000_surface.OnGenericCrawler_Generated(_ARG_0_, _ARG_1_)
Expand Down Expand Up @@ -523,7 +524,6 @@ function s000_surface.LaunchMeleeTutoCutscene()
end
function s000_surface.OnDnaAbsorbAnimation()
Game.SetInGameMusicState("DEATH")
Game.DisableEntity("TG_Intro_Alpha")
Scenario.WriteToBlackboard("alpha_killed", "b", true)
end
function s000_surface.OnMeleeTutoButtonPressed()
Expand Down
2 changes: 1 addition & 1 deletion src/open_samus_returns_rando/files/templates/metroid_template.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function Metroid.RemoveMetroid(_ARG_0_)
end
Game.SetInGameMusicState("RELAX")
if scenario == "s000_surface" then
Game.DisableEntity("TG_Intro_Alpha")
Game.DisableTrigger("TG_Intro_Alpha")
Scenario.WriteToBlackboard("alpha_killed", "b", true)
end
Game.SaveGame("checkpoint", "AfterNewAbilityAcquired", "", true)
Expand Down