string block version support

happyleavesaoc · Oct 2, 2022 · 9b8e716 · 9b8e716
1 parent b344420
commit 9b8e716
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/mgz/cli.py b/mgz/cli.py
@@ -75,7 +75,7 @@ async def extract_rec(playback, path, select=None):
 def print_info(path):
     """Print basic info."""
     with open(path, 'rb') as handle:
-        summary = Summary(handle, fallback=True)
+        summary = Summary(handle)
         dataset = summary.get_dataset()
         print('-------------')
         print(tabulate([

diff --git a/mgz/fast/header.py b/mgz/fast/header.py
@@ -278,7 +278,7 @@ def string_block(data):
     strings = []
     while True:
         crc = unpack("<I", data)
-        if crc == 47:
+        if 255 > crc > 0:
             break
         strings.append(de_string(data).decode('utf-8').split(':'))
     return strings

diff --git a/mgz/header/de.py b/mgz/header/de.py
@@ -44,9 +44,9 @@
 )
 
 string_block = Struct(
-    "strings"/RepeatUntil(lambda x, lst, ctx: lst[-1].crc == 47, Struct(
+    "strings"/RepeatUntil(lambda x, lst, ctx: 255 > lst[-1].crc > 0, Struct(
         "crc"/Int32ul,
-        "string"/If(lambda ctx: ctx.crc != 47, de_string)
+        "string"/If(lambda ctx: ctx.crc == 0 or ctx.crc > 255, de_string)
     ))
 )
 
@@ -112,7 +112,7 @@
     "lobby_visibility"/Int32ul,
     "hidden_civs"/Flag,
     "matchmaking"/Flag,
-    "spec_delay"/Int32ul,
+    "spec_delay"/If(lambda ctx: find_save_version(ctx) >= 13.13, Int32ul),
     "scenario_civ"/If(lambda ctx: find_save_version(ctx) >= 13.13, Byte),
     "rms_strings"/string_block,
     Bytes(8),