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

Only enable Missile Reserve Tank if Missile Launcher is in inventory #280

Merged
merged 3 commits into from
Feb 21, 2024
Merged

Only enable Missile Reserve Tank if Missile Launcher is in inventory #280

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
c26c058
Only enable Missile Reserve Tank if Missile Launcher is in inventory
dyceron Feb 21, 2024
05d195d
Cleanup conditional
dyceron Feb 21, 2024
0c856bd
Fix conditional
dyceron Feb 21, 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
3 changes: 3 additions & 0 deletions src/open_samus_returns_rando/files/pickups/randomizermissilelauncher.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ function RandomizerMissileLauncher.OnPickedUp(progression)
RandomizerPowerup.OnPickedUp(progression)
RandomizerPowerup.SetItemAmount("ITEM_MISSILE_TANKS", 0)
RandomizerPowerup.IncreaseMissileCheckValue()
if RandomizerPowerup.GetItemAmount("ITEM_RESERVE_TANK_MISSILE") > 0 then
RandomizerPowerup.EnableMissileReserveTank()
end
end
7 changes: 3 additions & 4 deletions src/open_samus_returns_rando/files/pickups/randomizerreservetankm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ end

function RandomizerReserveTankM.OnPickedUp(progression)
RandomizerPowerup.OnPickedUp(progression)
Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_MISSILE_ACTIVE", "b", true)
Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_MISSILE_FULL", "b", true)
Game.AddSF(0.0, "Game.HUDIdleScreenGo", "")
Game.AddSF(0.5, "Game.HUDIdleScreenLeave", "")
if RandomizerPowerup.GetItemAmount("ITEM_WEAPON_MISSILE_LAUNCHER") > 0 then
RandomizerPowerup.EnableMissileReserveTank()
end
end
8 changes: 5 additions & 3 deletions src/open_samus_returns_rando/files/templates/custom_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ function Init.InitGameBlackboard()
Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_ADN", "f", current_amount + 1)
end
if string.sub(_FORV_3_, 1, 17) == "ITEM_RESERVE_TANK" then
Blackboard.SetProp("GAME", _FORV_3_ .. "_ACTIVE", "b", true)
Blackboard.SetProp("GAME", _FORV_3_ .. "_FULL", "b", true)
if _FORV_3_ ~= "ITEM_RESERVE_TANK_MISSILE" or Blackboard.GetProp("PLAYER_INVENTORY", "ITEM_WEAPON_MISSILE_LAUNCHER") then
Blackboard.SetProp("GAME", _FORV_3_ .. "_ACTIVE", "b", true)
Blackboard.SetProp("GAME", _FORV_3_ .. "_FULL", "b", true)
end
end
end
Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_METROID_COUNT", "f", 0)
Expand Down Expand Up @@ -93,4 +95,4 @@ Game.SetForceSkipCutscenes(true)
-- "s100_area10",
-- "s110_surfaceb",
-- }
-- NextScenario = 1
-- NextScenario = 1
7 changes: 7 additions & 0 deletions src/open_samus_returns_rando/files/templates/randomizerpowerup.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,10 @@ function RandomizerPowerup.IncreaseMissileCheckValue()
RandomizerPowerup.SetItemAmount("ITEM_MISSILE_CHECK", RandomizerPowerup.GetItemAmount("ITEM_WEAPON_MISSILE_MAX"))
end
end

function RandomizerPowerup.EnableMissileReserveTank()
Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_MISSILE_ACTIVE", "b", true)
Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_MISSILE_FULL", "b", true)
Game.AddSF(0.0, "Game.HUDIdleScreenGo", "")
Game.AddSF(0.5, "Game.HUDIdleScreenLeave", "")
end