From 13771b8c8bdcdd8ca3b561195f73445531047f7e Mon Sep 17 00:00:00 2001 From: dyceron Date: Thu, 9 May 2024 19:04:45 -0400 Subject: [PATCH 1/2] Thanatos --- .../specific_patches/door_patches.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/open_samus_returns_rando/specific_patches/door_patches.py b/src/open_samus_returns_rando/specific_patches/door_patches.py index 4ad4aea3..e29cb469 100644 --- a/src/open_samus_returns_rando/specific_patches/door_patches.py +++ b/src/open_samus_returns_rando/specific_patches/door_patches.py @@ -39,7 +39,7 @@ "unk2": 1, "unk3": 0, "args": Container({ - "601445949": Container({ + 601445949: Container({ "type": "s", "value": "RemoveDoors", }), @@ -449,22 +449,17 @@ class NewShield(typing.NamedTuple): def add_custom_shields(editor: PatcherEditor, new_shield: NewShield) -> None: plasma_bmsad = "actors/props/doorcreature/charclasses/doorcreature.bmsad" - missile_bmsad = "actors/props/doorshieldmissile/charclasses/doorshieldmissile.bmsad" new_bmsad = f"actors/props/doorshield{new_shield.shield_name}/charclasses/doorshield{new_shield.shield_name}.bmsad" new_model = f"actors/props/doorshield{new_shield.shield_name}/models/doorshield{new_shield.shield_name}.bcmdl" # Create a copy of the bmsad - template_shield = editor.get_raw_asset(plasma_bmsad) + template_shield = editor.get_file(plasma_bmsad, Bmsad) editor.add_new_asset(new_bmsad, template_shield, []) # Modify the new bmsad custom_shield = editor.get_file(new_bmsad, Bmsad) custom_shield.name = f"doorshield{new_shield.shield_name}" custom_shield.raw["header"]["model_name"] = new_model - - # Update the collision to be able to open both sides - missile_shield = editor.get_file(missile_bmsad, Bmsad) - custom_shield.raw["components"]["COLLISION"] = missile_shield.raw["components"]["COLLISION"] custom_shield.components["MODELUPDATER"].functions[0].params["Param1"]["value"] = new_model # Update the life component From 3427c6cf78cd7f17c49ae2b05319e27523e6e4cb Mon Sep 17 00:00:00 2001 From: dyceron Date: Thu, 9 May 2024 19:10:39 -0400 Subject: [PATCH 2/2] mypy --- src/open_samus_returns_rando/specific_patches/door_patches.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/open_samus_returns_rando/specific_patches/door_patches.py b/src/open_samus_returns_rando/specific_patches/door_patches.py index e29cb469..99cbe512 100644 --- a/src/open_samus_returns_rando/specific_patches/door_patches.py +++ b/src/open_samus_returns_rando/specific_patches/door_patches.py @@ -39,7 +39,7 @@ "unk2": 1, "unk3": 0, "args": Container({ - 601445949: Container({ + 601445949: Container({ # type: ignore "type": "s", "value": "RemoveDoors", }),