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

[pre-commit.ci] pre-commit autoupdate #123

Merged
merged 2 commits into from
Jan 16, 2025
Merged

[pre-commit.ci] pre-commit autoupdate #123

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
6c9dde6
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jan 13, 2025
c1d8bfd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 13, 2025
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 .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.8.0
rev: v0.9.1
hooks:
- id: ruff
args: [ --fix, --exit-non-zero-on-fix ]
Expand Down
2 changes: 1 addition & 1 deletion src/open_prime_rando/echoes/small_randomizations/echo_locks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def randomize_echo_locks(editor: PatcherEditor, rng: random.Random):

# edit scan to indicate the solution
solution_text = (
"Sonic detection gear needed to interface with this system. " "The combination of its sonic locks is:\n"
"Sonic detection gear needed to interface with this system. The combination of its sonic locks is:\n"
)
solution_text += ", ".join(["Low", "Medium", "High"][key] for key in solution)
gate_strg.set_string(1, solution_text)
Expand Down
4 changes: 2 additions & 2 deletions src/open_prime_rando/echoes/small_randomizations/minigyro_chamber.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def randomize_minigyro_chamber(editor: PatcherEditor, rng: random.Random):
rng.shuffle(solution)

counter = area.get_instance("Stage gate activator")
stage_gates = [area.get_instance(f"Stage gate {i+1}") for i in range(4)]
stage_gates = [area.get_instance(f"Stage gate {i + 1}") for i in range(4)]

for i, gate in enumerate(stage_gates):
counter.remove_connections_from(gate)
Expand All @@ -54,7 +54,7 @@ def randomize_minigyro_chamber(editor: PatcherEditor, rng: random.Random):
counter.add_connection(GYRO_STATES[j], message, gate)

# play jingle on the final gyro
stop_gyros = [area.get_instance(f"[IN/OUT] Stop gyroscope {i+1}") for i in range(4)]
stop_gyros = [area.get_instance(f"[IN/OUT] Stop gyroscope {i + 1}") for i in range(4)]
jingle = area.get_instance("StreamedAudio - Event Jingle")

stop_gyros[3].remove_connections_from(jingle)
Expand Down
4 changes: 1 addition & 3 deletions src/open_prime_rando/echoes/specific_area_patches/version_differences.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ def path_of_eyes(editor: PatcherEditor, version: EchoesVersion):
if version == EchoesVersion.NTSC_U:
return

LOG.warning(
"Path of Eyes version differences have not been patched! " "Area collision edits are not yet implemented."
)
LOG.warning("Path of Eyes version differences have not been patched! Area collision edits are not yet implemented.")


def venomous_pond(editor: PatcherEditor, version: EchoesVersion):
Expand Down
6 changes: 2 additions & 4 deletions tests/echoes/test_full_patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ def test_ntsc_paks(prime2_iso_provider, tmp_path, test_files_dir, is_legacy: boo
b"c\xd2\xc6\x8b\xb4\xc5\xc0\xd0P \xb1f\xf1\xdc\x90T",
"files/MiscData.pak": b"\x0bM\xedR\xb7+\xaf+#\x06\x87\x88\xe5\xec\xbbxg@i\xbc"
b"\xa3n\xb1\xabi\xfajb\x00\xf3\xd1\xaa",
"files/SamusGun.pak": b"\xdd\xa99\x0b\x14b\x97&\xee\xdf\nE\xd0GR`c\x85\xf7m;\xdbX^"
b"\xe4\x87;\\?\xc9\x08\x1f",
"files/SamusGun.pak": b"\xdd\xa99\x0b\x14b\x97&\xee\xdf\nE\xd0GR`c\x85\xf7m;\xdbX^\xe4\x87;\\?\xc9\x08\x1f",
"files/SamusGunLow.pak": b"o8\xb8\xab^\xc3y\xc7\xd8v\xf1?\xe7a\x9enIE\xb7\xa5"
b"q\x9f\xa2\xf6\xc2\xc6m&\x80G\x8f\x83",
"files/TestAnim.pak": b"\xc0n\xfa2\x87\x96o\xd9\xf8\nL\xc8\xd5vVJi\xe2\xa0\xdb"
Expand All @@ -67,8 +66,7 @@ def test_ntsc_paks(prime2_iso_provider, tmp_path, test_files_dir, is_legacy: boo
b"\xb5\x0fP\xd7\xa2\xf0\xb9\x81\xa7\xa1\x84\xbe",
"files/MiscData.pak": b"\x0bM\xedR\xb7+\xaf+#\x06\x87\x88\xe5\xec\xbbxg@i\xbc"
b"\xa3n\xb1\xabi\xfajb\x00\xf3\xd1\xaa",
"files/SamusGun.pak": b"\xdd\xa99\x0b\x14b\x97&\xee\xdf\nE\xd0GR`c\x85\xf7m;\xdbX^"
b"\xe4\x87;\\?\xc9\x08\x1f",
"files/SamusGun.pak": b"\xdd\xa99\x0b\x14b\x97&\xee\xdf\nE\xd0GR`c\x85\xf7m;\xdbX^\xe4\x87;\\?\xc9\x08\x1f",
"files/SamusGunLow.pak": b"o8\xb8\xab^\xc3y\xc7\xd8v\xf1?\xe7a\x9enIE\xb7\xa5"
b"q\x9f\xa2\xf6\xc2\xc6m&\x80G\x8f\x83",
"files/TestAnim.pak": b"\xc0n\xfa2\x87\x96o\xd9\xf8\nL\xc8\xd5vVJi\xe2\xa0\xdb"
Expand Down
Loading