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.

Sign up for GitHub

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

Support for new MEDS #355

Merged
merged 2 commits into from
May 22, 2024
+6 −6
Merged

Support for new MEDS #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ba694f
Support for new MEDS
ThanatosGit May 21, 2024
f7cebef
Bump MEDS
ThanatosGit May 22, 2024
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ classifiers = [
]
requires-python = ">=3.10"
dependencies = [
"mercury-engine-data-structures>=0.27.0",
"mercury-engine-data-structures>=0.30.0",
"jsonschema>=4.0.0",
"ips.py>=0.1.2",
]
Expand Down
4 changes: 2 additions & 2 deletions src/open_samus_returns_rando/specific_patches/door_patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"unk2": 1,
"unk3": 0,
"args": Container({
601445949: Container({ # type: ignore
"CallbackName": Container({
"type": "s",
"value": "RemoveDoors",
}),
Expand Down Expand Up @@ -562,7 +562,7 @@ def add_custom_shields(editor: PatcherEditor, new_shield: NewShield) -> None:
# Remove the drops from breaking the shield
custom_shield.raw["components"].pop("DROP")
# Remove the particle animation that occurs after the shield breaks (color mismatch)
custom_shield.raw["action_sets"][0]["animations"][0]["events0"][1]["args"][729149823]["value"] = 0
custom_shield.raw["action_sets"][0]["animations"][0]["events0"][1]["args"]["LinkType"]["value"] = 0
elif new_shield.base_shield in {"doorshieldsupermissile", "doorshieldpowerbomb"}:
# Some shaders do not use dissolve fx, so force fx to be used
custom_shield.raw["components"]["LIFE"]["fields"]["bDisolveByMaterial"]["value"] = False
Expand Down
6 changes: 3 additions & 3 deletions src/open_samus_returns_rando/specific_patches/metroid_patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ def _patch_metroids(editor: PatcherEditor) -> None:
death_callbacks = [
item
for events in events0
for magic_number, item in events["args"].items()
# arguments with this number defines the function to call
if magic_number == 601445949
for parameter_name, item in events["args"].items()
# check if this event defines a CallbackName
if parameter_name == "CallbackName"
]
for death_callback in death_callbacks:
death_callback["value"] = "RemoveMetroid"
Expand Down