From acf234363e699fc2b6894c44e4f8de0537a6777d Mon Sep 17 00:00:00 2001 From: dyceron Date: Sun, 28 Jan 2024 12:48:06 -0500 Subject: [PATCH 1/2] Make top a4 east super door double sided --- src/open_samus_returns_rando/specific_patches/door_patches.py | 4 +++- src/open_samus_returns_rando/specific_patches/map_icons.py | 1 + 2 files changed, 4 insertions(+), 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 c4a3c6d..98d16cb 100644 --- a/src/open_samus_returns_rando/specific_patches/door_patches.py +++ b/src/open_samus_returns_rando/specific_patches/door_patches.py @@ -175,7 +175,9 @@ def _patch_one_way_doors(editor: PatcherEditor): "s030_area3": ["Door005", "Door006"], # Chozo Seal Spazer Door "s040_area4": ["Door001"], - # Plasma Room Plasma and Missile doors, Gravity Room Missile Door + # Super Missile Room Super Door + "s050_area5": ["Door005"], + # Plasma Room Plasma and Missile Doors, Gravity Room Missile Door "s067_area6c": ["Door005", "Door006", "Door009"] } diff --git a/src/open_samus_returns_rando/specific_patches/map_icons.py b/src/open_samus_returns_rando/specific_patches/map_icons.py index ef5e6d9..dbd3062 100644 --- a/src/open_samus_returns_rando/specific_patches/map_icons.py +++ b/src/open_samus_returns_rando/specific_patches/map_icons.py @@ -12,6 +12,7 @@ def patch_tiles(editor: PatcherEditor): "s028_area2c": ["Door001", "Door007"], "s030_area3": ["Door002", "Door005", "Door006", "Door008"], "s040_area4": ["Door001", "Door006", "Door014"], + "s050_area5": ["Door005"], "s060_area6": ["Door001"], "s067_area6c": ["Door005", "Door006", "Door009"], "s090_area9": ["Door012"], From 3bd8edee8c5878b8d7e56115f12736b080bb56f1 Mon Sep 17 00:00:00 2001 From: dyceron Date: Sun, 28 Jan 2024 12:49:00 -0500 Subject: [PATCH 2/2] Fix map tiles being incorrectly changed to power with shield active --- .../specific_patches/door_patches.py | 3 +-- .../specific_patches/map_icons.py | 9 +++++---- 2 files changed, 6 insertions(+), 6 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 98d16cb..fc15bde 100644 --- a/src/open_samus_returns_rando/specific_patches/door_patches.py +++ b/src/open_samus_returns_rando/specific_patches/door_patches.py @@ -125,7 +125,7 @@ def _patch_beam_covers(editor: PatcherEditor): actor = scenario.raw.actors[9][cover_name] new_actor_name = f"{cover_name}_o" new_actor = editor.copy_actor( - scenario_name, (actor["position"][0], actor["position"][1], actor["position"][2]), + scenario_name, (actor["position"][0], actor["position"][1], actor["position"][2]), actor, new_actor_name, 9 ) new_actor["rotation"][0] = 0 @@ -147,7 +147,6 @@ def _patch_beam_covers(editor: PatcherEditor): scenario.insert_into_entity_group(group, new_actor_name) - def _patch_charge_doors(editor: PatcherEditor): CHARGE_DOORS = { "s000_surface": ["Door004", "Door011"], diff --git a/src/open_samus_returns_rando/specific_patches/map_icons.py b/src/open_samus_returns_rando/specific_patches/map_icons.py index dbd3062..4f9f2d1 100644 --- a/src/open_samus_returns_rando/specific_patches/map_icons.py +++ b/src/open_samus_returns_rando/specific_patches/map_icons.py @@ -43,7 +43,8 @@ def patch_tiles(editor: PatcherEditor): for door in doors: if door in door_tile["actor_name"]: door_tile["clear_condition"] = "" - if "left" in door_tile["icon"]: - door_tile["icon"] = "doorpowerleft" - else: - door_tile["icon"] = "doorpowerright" + if "closed" in door_tile["icon"]: + if "left" in door_tile["icon"]: + door_tile["icon"] = "doorpowerleft" + else: + door_tile["icon"] = "doorpowerright"