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.

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

Revert Gawron Groove change #503

Merged
merged 1 commit into from
Jan 4, 2025
Merged
Changes from all commits
Commits
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
15 changes: 0 additions & 15 deletions src/open_samus_returns_rando/specific_patches/static_fixes.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,6 @@ def disable_vignettes(editor: PatcherEditor) -> None:
"s040_area4": [
{"block_group": 27, "names": ["s040_area4_111", "sg_vinegtte_003"]}
],
# Gawron Groove Gamma Tunnel Outer Power Beam Block
"s050_area5": [
{"block_group": 14, "names": ["vignette_casca_05"]},
],
# Diggernaut Bomb Blocks
"s070_area7": [
{"block_group": 52, "names": ["casca_vignette_03"]}
Expand All @@ -353,10 +349,6 @@ def disable_vignettes(editor: PatcherEditor) -> None:
],
}
scenario_objects_list: dict[str, list[dict[str, typing.Any]]] = {
# Gawron Groove Gamma Tunnel Outer Power Beam Block
"s050_area5": [
{"indices": [1881]}
],
# Middle Save Station Water Bomb Blocks
"s090_area9": [
{"indices": [1]}
Expand Down Expand Up @@ -395,12 +387,6 @@ def remove_a6_lower_dna_seal_gullugg(editor: PatcherEditor) -> None:
editor.remove_entity({"scenario": "s070_area7", "layer": 4, "actor": "GulluggStr_057"})


def remove_a4_cm_gawron_grove_tunnel_block(editor: PatcherEditor) -> None:
a4 = editor.get_file("maps/levels/c10_samus/s050_area5/s050_area5.bmsbk", Bmsbk)
# Remove the block from the object list
a4.raw["collision_cameras"][7]["entries"].pop(3)


def apply_static_fixes(editor: PatcherEditor) -> None:
patch_multi_room_gammas(editor)
patch_pickup_rotation(editor)
Expand All @@ -416,4 +402,3 @@ def apply_static_fixes(editor: PatcherEditor) -> None:
patch_a1_teleporter_crumbles(editor)
disable_vignettes(editor)
remove_a6_lower_dna_seal_gullugg(editor)
remove_a4_cm_gawron_grove_tunnel_block(editor)
Loading