Merge pull request #149 from dyceron/bmssd

Update bmssd sg fields for MSR
randovania · Jul 10, 2024 · dc45bec · dc45bec
2 parents 41ca4b2 + 3940e85
commit dc45bec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/mercury_engine_data_structures/formats/bmssd.py b/src/mercury_engine_data_structures/formats/bmssd.py
@@ -118,21 +118,21 @@
         Int32ul,
         CString("utf-8"),
     ),
-    unk_structs_b=IfThenElse(
+    scene_groups=IfThenElse(
         game_check.current_game_at_most(Game.SAMUS_RETURNS),
         PrefixedArray(
             Int32ul,
             Struct(
-                str1=CString("utf-8"),
-                int2=Int32ul,
-                struct3=PrefixedArray(
+                sg_name=CString("utf-8"),
+                models_per_sg=Int32ul,
+                model_groups=PrefixedArray(
                     Int32ul,
                     Struct(
-                        int4=Int32ul,
-                        struct5=PrefixedArray(
+                        model_group=Int32ul,
+                        models=PrefixedArray(
                             Int32ul,
                             Struct(
-                                int6=Int32ul,
+                                model_id=Int32ul,
                             )
                         )
                     )

diff --git a/tests/formats/test_bmssd.py b/tests/formats/test_bmssd.py
@@ -8,3 +8,8 @@ def test_compare_dread(dread_path):
     parse_and_build_compare(
         BMSSD, Game.DREAD, dread_path.joinpath("packs/maps/s060_quarantine/s060_quarantine.bmssd")
     )
+
+def test_compare_msr(samus_returns_path):
+    parse_and_build_compare(
+        BMSSD, Game.SAMUS_RETURNS, samus_returns_path.joinpath("packs/maps/s050_area5/s050_area5.bmssd")
+    )