Merge pull request #72 from AoEInsights/master

support 25.06

Author: happyleavesaoc

mgz/header/de.py

@@ -64,6 +64,7 @@
     "turbo_enabled"/Flag,
     "shared_exploration"/Flag,
     "team_positions"/Flag,
+    If(lambda ctx: find_save_version(ctx) >= 25.06, "unk"/Flag),  # maybe handicap
     If(lambda ctx: find_save_version(ctx) >= 13.34, Bytes(8)),
     separator,
     "players"/Array(8, Struct(
@@ -86,7 +87,8 @@
         "hd_rm_elo"/Int32ul,
         "hd_dm_elo"/Int32ul,
         "animated_destruction_enabled"/Flag,
-        "custom_ai"/Flag
+        "custom_ai"/Flag,
+        If(lambda ctx: find_save_version(ctx) >= 25.06, "unk"/Bytes(8)),  # maybe handicap related?
     )),
     "fog_of_war"/Flag,
     "cheat_notifications"/Flag,
@@ -98,7 +100,7 @@
     "strings"/Array(23,
         Struct(
             "string"/de_string,
-            RepeatUntil(lambda x, lst, ctx: lst[-1] not in [3, 21, 23, 42, 44, 45, 46], Int32ul)
+            RepeatUntil(lambda x, lst, ctx: lst[-1] not in [3, 21, 23, 42, 44, 45, 46, 47], Int32ul)
         )
     ),
     "strategic_numbers"/Array(59, Int32sl),
@@ -117,6 +119,7 @@
     If(lambda ctx: ctx._.save_version >= 13.17, Bytes(9)),
     If(lambda ctx: ctx._.save_version >= 20.06, Bytes(1)),
     If(lambda ctx: ctx._.save_version >= 20.16, Bytes(8)),
+    If(lambda ctx: ctx._.save_version >= 25.06, Bytes(21)),
     de_string,
     Bytes(5),
     If(lambda ctx: ctx._.save_version >= 13.13, Byte),

mgz/header/scenario.py

@@ -127,7 +127,8 @@
             If(lambda ctx: find_save_version(ctx) >= 13.34, Padding(132)),
             If(lambda ctx: find_save_version(ctx) >= 20.06, Padding(1)),
             If(lambda ctx: find_save_version(ctx) >= 20.16, Padding(4)),
-            If(lambda ctx: find_save_version(ctx) >= 25.02, Padding(4*16))
+            If(lambda ctx: find_save_version(ctx) >= 25.02, Padding(4*16)),
+            If(lambda ctx: find_save_version(ctx) >= 25.06, Padding(4)),
         )
     ),
     Array(9, "player_info"/Struct(
@@ -139,10 +140,13 @@
     Padding(4),
     IfThenElse(lambda ctx: ctx._._.version == Version.DE,
         IfThenElse(lambda ctx: find_save_version(ctx) >= 13.34,
-            "end_of_game_settings"/Find(b'\x33\x33\x33\x33\x33\x33\x03\x40', None),
-            "end_of_game_settings"/Find(b'\x9a\x99\x99\x99\x99\x99\x01\x40', None)
+            IfThenElse(lambda ctx: find_save_version(ctx) >= 25.06,
+                "end_of_game_settings"/Find(b'\x00\x00\x00\x00\x00\x00\x04\x40', None),  # double: 2.5
+                "end_of_game_settings"/Find(b'\x33\x33\x33\x33\x33\x33\x03\x40', None)   # double: 2.4
+            ),
+            "end_of_game_settings"/Find(b'\x9a\x99\x99\x99\x99\x99\x01\x40', None)   # double: 2.2
         ),
-        "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/util.py

@@ -269,7 +269,9 @@ def _parse(self, stream, context, path):
             marker_aok = read_bytes.find(b"\x9a\x99\x99\x3f")
             marker_up = read_bytes.find(b"\xf6\x28\x9c\x3f")
             marker_hd = read_bytes.find(b"\xae\x47\xa1\x3f")
-            if save_version >= 25.02:
+            if save_version >= 25.06:
+                marker_de = read_bytes.find(b"\x9a\x99\xb9\x3f")
+            elif save_version >= 25.02:
                 marker_de = read_bytes.find(b"\xec\x51\xb8\x3f")
             elif save_version >= 25.01:
                 marker_de = read_bytes.find(b"\x3d\x0a\xb7\x3f")