From f079f59617c07461f55a706cc94b654f23c9a41f Mon Sep 17 00:00:00 2001 From: Thanatos Date: Thu, 23 Nov 2023 15:55:06 +0100 Subject: [PATCH] Add an empty array as default for hints and cleanup code --- open_samus_returns_rando/files/schema.json | 3 +- .../files/templates/chozoseal_template.lua | 2 +- .../specific_patches/chozo_seal_patches.py | 38 +------------------ 3 files changed, 4 insertions(+), 39 deletions(-) diff --git a/open_samus_returns_rando/files/schema.json b/open_samus_returns_rando/files/schema.json index 43519cb0..5cac5036 100644 --- a/open_samus_returns_rando/files/schema.json +++ b/open_samus_returns_rando/files/schema.json @@ -255,7 +255,8 @@ "accesspoint_actor", "text" ] - } + }, + "default": [] } }, "required": [ diff --git a/open_samus_returns_rando/files/templates/chozoseal_template.lua b/open_samus_returns_rando/files/templates/chozoseal_template.lua index 64bbc136..fd6c083a 100644 --- a/open_samus_returns_rando/files/templates/chozoseal_template.lua +++ b/open_samus_returns_rando/files/templates/chozoseal_template.lua @@ -1,5 +1,5 @@ Game.ImportLibraryWithName("actors/props/usable/scripts/usable.lua", "Usable") -ChozoSeal = {} +ChozoSeal = ChozoSeal or {} setmetatable(ChozoSeal, {__index = Usable}) ChozoSeal.CurrentHintStrings = nil diff --git a/open_samus_returns_rando/specific_patches/chozo_seal_patches.py b/open_samus_returns_rando/specific_patches/chozo_seal_patches.py index 32724f00..3aad7b15 100644 --- a/open_samus_returns_rando/specific_patches/chozo_seal_patches.py +++ b/open_samus_returns_rando/specific_patches/chozo_seal_patches.py @@ -43,49 +43,13 @@ def patch_dna_check(editor: PatcherEditor): # blinks with all DNA...which is maybe not really a good thing / sign? systemmechdna.raw["components"]["USABLE"] = save_station_bmsad.raw["components"]["USABLE"] - # TODO: Filter the areas which really have a chozoseal instead of using all - all_pkgs = editor.get_all_level_pkgs() editor.add_new_asset( "actors/props/chozoseal/scripts/chozoseal.lc", b'', - all_pkgs + [] ) editor.replace_asset(file_name, systemmechdna) -# TODO: Remove if not required -# def test(editor: PatcherEditor): -# # PLATFORMS = { -# # "s000_surface": ["LE_Platform_ChozoUnlockAreaDNA"], -# # "s010_area1": ["LE_Platform_ChozoUnlockAreaDNA"] -# # } -# SEAL = { -# "s000_surface": ["LE_ChozoUnlockAreaDNA"] -# } -# TRIGGER = { -# "s010_area1": ["TG_Activation_DNA"] -# } -# # for area_name, chozo_seals in PLATFORMS.items(): -# # scenario = editor.get_scenario(area_name) -# # for chozo_seal in chozo_seals: -# # actor = scenario.raw.actors[10][chozo_seal] -# # actor["components"][0]["arguments"][0]["value"] = False -# # actor["components"][0]["arguments"][4]["value"] = "LE_EnergyCharge" -# # actor["components"][0]["arguments"][5]["value"] = "usestationinit" -# # actor["components"][0]["arguments"][5]["value"] = "useinit" -# # actor["components"][0]["arguments"][6]["value"] = "usestationend" -# for area_name, chozo_seals in SEAL.items(): -# scenario = editor.get_scenario(area_name) -# for chozo_seal in chozo_seals: -# actor = scenario.raw.actors[16][chozo_seal] -# actor["components"][0]["arguments"][0]["value"] = 0 -# actor["components"][0]["arguments"][1]["value"] = "" -# for area_name, chozo_seals in TRIGGER.items(): -# scenario = editor.get_scenario(area_name) -# for chozo_seal in chozo_seals: -# actor = scenario.raw.actors[0][chozo_seal] -# actor["components"][0]["arguments"][8]["value"] = False - def patch_chozo_seals(editor: PatcherEditor): patch_dna_check(editor) - # test(editor)