From 6c9dde63e289be83f73cea3431a66555cdba9ec3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 23:31:28 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.8.0 → v0.9.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.0...v0.9.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0bd6605..c02073e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 ] From c1d8bfd40d8b6c761029e4f0afa5630a6cad7cda Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 23:31:35 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../echoes/small_randomizations/echo_locks.py | 2 +- .../echoes/small_randomizations/minigyro_chamber.py | 4 ++-- .../echoes/specific_area_patches/version_differences.py | 4 +--- tests/echoes/test_full_patch.py | 6 ++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/open_prime_rando/echoes/small_randomizations/echo_locks.py b/src/open_prime_rando/echoes/small_randomizations/echo_locks.py index 90692bb..3a43821 100644 --- a/src/open_prime_rando/echoes/small_randomizations/echo_locks.py +++ b/src/open_prime_rando/echoes/small_randomizations/echo_locks.py @@ -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) diff --git a/src/open_prime_rando/echoes/small_randomizations/minigyro_chamber.py b/src/open_prime_rando/echoes/small_randomizations/minigyro_chamber.py index 533835e..57a776d 100644 --- a/src/open_prime_rando/echoes/small_randomizations/minigyro_chamber.py +++ b/src/open_prime_rando/echoes/small_randomizations/minigyro_chamber.py @@ -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) @@ -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) diff --git a/src/open_prime_rando/echoes/specific_area_patches/version_differences.py b/src/open_prime_rando/echoes/specific_area_patches/version_differences.py index 636e29d..25141c7 100644 --- a/src/open_prime_rando/echoes/specific_area_patches/version_differences.py +++ b/src/open_prime_rando/echoes/specific_area_patches/version_differences.py @@ -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): diff --git a/tests/echoes/test_full_patch.py b/tests/echoes/test_full_patch.py index 0c5330d..0652e4e 100644 --- a/tests/echoes/test_full_patch.py +++ b/tests/echoes/test_full_patch.py @@ -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" @@ -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"