From 0164fc70b60adf91683b5a74938dccf8c2cc1be3 Mon Sep 17 00:00:00 2001 From: dyceron <38679103+dyceron@users.noreply.github.com> Date: Thu, 7 Sep 2023 21:15:32 -0400 Subject: [PATCH] Cleanup custom_init.lua --- .../files/templates/custom_init.lua | 38 ++++--------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/open_samus_returns_rando/files/templates/custom_init.lua b/open_samus_returns_rando/files/templates/custom_init.lua index 74bd589..19a83cb 100644 --- a/open_samus_returns_rando/files/templates/custom_init.lua +++ b/open_samus_returns_rando/files/templates/custom_init.lua @@ -11,39 +11,17 @@ end local buff = {} -function Init.InitGameBlackboard() - Blackboard.ResetWithExceptionList({ - "GAME_PROGRESS" - }) - for _FORV_3_, _FORV_4_ in pairs(Init.tNewGameInventory) do - Blackboard.SetProp("PLAYER_INVENTORY", _FORV_3_, "f", _FORV_4_) +Init.sStartingScenario = TEMPLATE("starting_scenario") +Init.sStartingActor = TEMPLATE("starting_actor") + +function Init.InitNewGame(arg1, arg2, arg3, arg4, arg5) + Game.LogWarn(0, string.format("Will start Game - %s / %s / %s / %s", tostring(arg1), tostring(arg2), tostring(arg3), tostring(arg4))) + Game.LoadScenario("c10_samus", Init.sStartingScenario, Init.sStartingActor, "samus", 1) + if Init.bRevealMap then + Game.AddGUISF(0.0, Game.ScanVisitDiscoverEverything, "", "") end - Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_METROID_COUNT", "f", 0) - Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_CURRENT_LIFE", "f", Init.tNewGameInventory.ITEM_MAX_LIFE) - Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_WEAPON_MISSILE_CURRENT", "f", Init.tNewGameInventory.ITEM_WEAPON_MISSILE_MAX) - Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_WEAPON_SUPER_MISSILE_CURRENT", "f", Init.tNewGameInventory.ITEM_WEAPON_SUPER_MISSILE_MAX) - Blackboard.SetProp("PLAYER_INVENTORY", "ITEM_WEAPON_POWER_BOMB_CURRENT", "f", Init.tNewGameInventory.ITEM_WEAPON_POWER_BOMB_MAX) - Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_LIFE_SIZE", "f", Init.tReserveTanksInitialConfiguration.ITEM_RESERVE_TANK_LIFE_SIZE) - Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_SPECIAL_ENERGY_SIZE", "f", Init.tReserveTanksInitialConfiguration.ITEM_RESERVE_TANK_SPECIAL_ENERGY_SIZE) - Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_MISSILE_SIZE", "f", Init.tReserveTanksInitialConfiguration.ITEM_RESERVE_TANK_MISSILE_SIZE) - Blackboard.SetProp("GAME", "ITEM_RESERVE_TANK_SUPER_MISSILE_SIZE", "f", Init.tReserveTanksInitialConfiguration.ITEM_RESERVE_TANK_SUPER_MISSILE_SIZE) - Blackboard.SetProp("GAME", "Version", "i", SaveGame.Version) - Blackboard.SetProp("GAME", "HUD", "b", true) - Blackboard.SetProp("GAME", "Player", "s", "samus") - Blackboard.SetProp(Game.GetPlayerBlackboardSectionName(), "LevelID", "s", "c10_samus") - Blackboard.SetProp(Game.GetPlayerBlackboardSectionName(), "ScenarioID", "s", TEMPLATE("starting_scenario")) - Blackboard.SetProp(Game.GetPlayerBlackboardSectionName(), "StartPoint", "s", TEMPLATE("starting_actor")) - Game.UnlockAmiiboMenu() end -function Init.InitNewGame(arg1, arg2, arg3, arg4, arg4) - Game.LogWarn(0, string.format("Will start Game - %s / %s / %s / %s", tostring(arg1), tostring(arg2), tostring(arg3), tostring(arg4))) - Game.LoadScenario("c10_samus", TEMPLATE("starting_scenario"), TEMPLATE("starting_actor"), "samus", 1) - if Init.bRevealMap then - Game.AddGUISF(0.0, Game.ScanVisitDiscoverEverything, "", "") - end - end - Game.SetForceSkipCutscenes(true) Game.LogWarn(0, "Finished modded system/init.lc")