merge

Author: happyleavesaoc

mgz/header/de.py

@@ -65,7 +65,7 @@
     "shared_exploration"/Flag,
     "team_positions"/Flag,
     If(lambda ctx: find_save_version(ctx) >= 13.34, Bytes(8)),
-    If(lambda ctx: find_save_version(ctx) >= 25.06, Bytes(1)),
+    If(lambda ctx: find_save_version(ctx) >= 25.06, Bytes(1)),   # maybe handicap
     separator,
     "players"/Array(8, Struct(
         "dlc_id"/Int32ul,
@@ -88,7 +88,7 @@
         "hd_dm_elo"/Int32ul,
         "animated_destruction_enabled"/Flag,
         "custom_ai"/Flag,
-        If(lambda ctx: find_save_version(ctx) >= 25.06, Bytes(8)),
+        If(lambda ctx: find_save_version(ctx) >= 25.06, "unk"/Bytes(8)),  # maybe handicap related?
     )),
     "fog_of_war"/Flag,
     "cheat_notifications"/Flag,
@@ -100,7 +100,7 @@
     "strings"/Array(23,
         Struct(
             "string"/de_string,
-            "x"/RepeatUntil(lambda x, lst, ctx: lst[-1] not in [3, 21, 23, 42, 44, 45, 46, 47], Int32ul)
+            RepeatUntil(lambda x, lst, ctx: lst[-1] not in [3, 21, 23, 42, 44, 45, 46, 47], Int32ul)
         )
     ),
     "strategic_numbers"/Array(59, Int32sl),

mgz/header/scenario.py

@@ -140,11 +140,11 @@
     Padding(4),
     IfThenElse(lambda ctx: ctx._._.version == Version.DE,
         Struct(
-            If(lambda ctx: find_save_version(ctx) < 13.34, Find(b'\x9a\x99\x99\x99\x99\x99\x01\x40', None)),
-            If(lambda ctx: 25.06 > find_save_version(ctx) >= 13.34, Find(b'\x33\x33\x33\x33\x33\x33\x03\x40', None)),
-            If(lambda ctx: find_save_version(ctx) >= 25.06, Find(b'\x00\x00\x00\x00\x00\x00\x04\x40', None)) #Bytes(3627))
+            If(lambda ctx: find_save_version(ctx) < 13.34, Find(b'\x9a\x99\x99\x99\x99\x99\x01\x40', None)),   # double: 2.2
+            If(lambda ctx: 25.06 > find_save_version(ctx) >= 13.34, Find(b'\x33\x33\x33\x33\x33\x33\x03\x40', None)),  # double: 2.4
+            If(lambda ctx: find_save_version(ctx) >= 25.06, Find(b'\x00\x00\x00\x00\x00\x00\x04\x40', None))  # double: 2.5
         ),
-        "end_of_game_settings"/Find(b'\x9a\x99\x99\x99\x99\x99\xf9\\x3f', None)
+        "end_of_game_settings"/Find(b'\x9a\x99\x99\x99\x99\x99\xf9\\x3f', None)   # double: 1.6
     )
 )
 

mgz/model/compat.py

@@ -1,4 +1,4 @@
-"""Summary compatibiilty."""
+"""Summary compatibility."""
 from collections import defaultdict
 from mgz.model import parse_match
 from mgz.common.diplomacy import get_diplomacy_type