fix object id parsing for some actions

Author: happyleavesaoc

mgz/fast/actions.py

@@ -26,20 +26,20 @@ def parse_action_71094(action_type, player_id, raw):
         elif command_id in [13, 14, 17, 18]:
             payload['number'] = unpack('<4xh', data)
     if action_type is Action.DE_QUEUE:
-        selected, building_type, unit_id, amount, *object_ids = unpack('<h4xhhh', data)
+        selected, building_type, unit_id, amount, *object_ids = unpack('<h4xhhh4x', data)
         object_ids = list(unpack(f'<{selected}I', data, shorten=False))
         payload = dict(object_ids=object_ids, amount=amount, unit_id=unit_id)
     if action_type is Action.MOVE:
         x, y, selected = unpack('<4x2fh', data)
         object_ids = []
-        data.read(4)
+        data.read(6)
         if selected > 0:
             object_ids = list(unpack(f'<{selected}I', data, shorten=False))
         payload = dict(object_ids=object_ids, x=x, y=y)
     if action_type is Action.ORDER:
         target_id, x, y, selected = unpack('<I2fh', data)
         object_ids = []
-        data.read(4)
+        data.read(6)
         if selected > 0:
             object_ids = list(unpack(f'<{selected}I', data, shorten=False))
         payload = dict(object_ids=object_ids, target_id=target_id, x=x, y=y)
@@ -48,7 +48,7 @@ def parse_action_71094(action_type, player_id, raw):
         object_ids = list(unpack(f'{selected}I', data, shorten=False))
         payload = dict(building_id=building_id, object_ids=object_ids, x=x, y=y)
     if action_type is Action.GATHER_POINT:
-        selected, x, y, target_id, target_type = unpack('<h2xffii', data)
+        selected, x, y, target_id, target_type = unpack('<h2xffiix', data)
         object_ids = list(unpack(f'{selected}I', data, shorten=False))
         payload = dict(target_id=target_id, target_type=target_type, x=x, y=y, object_ids=object_ids)
     if action_type is Action.DE_MULTI_GATHERPOINT:

mgz/model/compat.py

@@ -231,7 +231,7 @@ def get_objects(self):
             objects.append((player.number, player.objects))
         for player_number, objs in objects:
             for obj in objs:
-                if obj.class_id not in [10, 30, 70, 80]:
+                if obj.class_id not in [10, 20, 30, 70, 80]:
                     continue
                 if obj.index == 1:
                     continue

setup.py

@@ -3,15 +3,15 @@
 
 setup(
     name='mgz',
-    version='1.8.39',
+    version='1.8.40',
     description='Parse Age of Empires 2 recorded games.',
     url='https://github.com/happyleavesaoc/aoc-mgz/',
     license='MIT',
     author='happyleaves',
     author_email='happyleaves.tfr@gmail.com',
     packages=find_packages(),
     install_requires=[
-        'aocref>=2.0.27',
+        'aocref>=2.0.28',
         'construct==2.8.16',
         'dataclasses==0.8; python_version < "3.7"',
         'tabulate>=0.9.0',