minor fixes

randovania · Oct 30, 2024 · f49a206 · f49a206
1 parent d77c1c0
commit f49a206
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/mercury_engine_data_structures/formats/bmsstoc.py b/src/mercury_engine_data_structures/formats/bmsstoc.py
@@ -12,11 +12,11 @@
     Int32ul,
     Int64ul,
     PaddedString,
-    PrefixedArray,
     Rebuild,
     Struct,
 )
 
+from mercury_engine_data_structures.common_types import make_vector
 from mercury_engine_data_structures.formats.base_resource import BaseResource
 from mercury_engine_data_structures.formats.property_enum import PropertyEnum
 from mercury_engine_data_structures.game_check import Game
@@ -41,8 +41,7 @@ class FileTypeEnum(enum.Enum):
     "wav_name" / PropertyEnum,
     "file_id" / FileId,
     "warc_index" / Int32ul,  # index of the WARC listed in BFSAR (starts offset from 0)
-    "idx" / Rebuild(Int32ul, lambda ctx: ctx._index),  # 0 to max wave archives
-    Check(construct.this._index == construct.this.idx),
+    "idx" / Rebuild(Int32ul, construct.this._index),  # 0 to max wave archives
     Const(0, Int32ul),
     Const(0, Int32ul),
     Const(0, Int32ul),
@@ -74,9 +73,9 @@ class FileTypeEnum(enum.Enum):
 )
 
 BMSSTOC = Struct(
-    "wave_archives" / PrefixedArray(Int32ul, WaveArchiveData),
-    "sound_streams" / PrefixedArray(Int32ul, SoundStreams),
-    "groups" / PrefixedArray(Int32ul, GroupData),
+    "wave_archives" / make_vector(WaveArchiveData),
+    "sound_streams" / make_vector(SoundStreams),
+    "groups" / make_vector(GroupData),
     construct.Terminated,
 )