From 8e0be774db2f1f59402e308b98b0bbcafab8aba2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 21:04:10 +0000 Subject: [PATCH 1/3] [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.1.8 → v0.1.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.8...v0.1.9) --- .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 ab1962ce..0a4ca70b 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.1.8 + rev: v0.1.9 hooks: - id: ruff args: [ --fix, --exit-non-zero-on-fix ] \ No newline at end of file From 07ce963fb5cd64725b94edcd6f03e1aa493f3f6d Mon Sep 17 00:00:00 2001 From: dyceron <38679103+dyceron@users.noreply.github.com> Date: Tue, 2 Jan 2024 14:49:28 -0500 Subject: [PATCH 2/3] Update some fields in sr bmsad header --- src/mercury_engine_data_structures/formats/bmsad.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mercury_engine_data_structures/formats/bmsad.py b/src/mercury_engine_data_structures/formats/bmsad.py index 74b368f7..ed432ee1 100644 --- a/src/mercury_engine_data_structures/formats/bmsad.py +++ b/src/mercury_engine_data_structures/formats/bmsad.py @@ -305,13 +305,13 @@ def _not_implemented(code): SRHeader = Struct( model_name=StrId, - unk_1=Int8ul, + collision_check=Flag, unk_2a=Float, unk_2b=Float, unk_2c=Float, - unk_2d=Float, + model_scale=Float, unk_2e=Float, - unk_2f=CVector3D, + hitbox_dimensions=CVector3D, unk_2g=Float, unk_3=Int8ul, unk_4=Int32ul, From 19b910cd34d8737aa9053fa9da385c54aecb91a8 Mon Sep 17 00:00:00 2001 From: dyceron <38679103+dyceron@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:19:52 -0500 Subject: [PATCH 3/3] Rename field --- src/mercury_engine_data_structures/formats/bmsad.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mercury_engine_data_structures/formats/bmsad.py b/src/mercury_engine_data_structures/formats/bmsad.py index ed432ee1..aa827d0c 100644 --- a/src/mercury_engine_data_structures/formats/bmsad.py +++ b/src/mercury_engine_data_structures/formats/bmsad.py @@ -305,7 +305,7 @@ def _not_implemented(code): SRHeader = Struct( model_name=StrId, - collision_check=Flag, + ignore_samus=Flag, unk_2a=Float, unk_2b=Float, unk_2c=Float,