further support for 3.0.

now two replays pass the parsing test.

Author: dsjoerg

sc2reader/events/game.py

@@ -101,7 +101,7 @@ def __init__(self, frame, pid, data):
         self.use_ai_beacons = data['use_ai_beacons']
 
         #: Are workers sent to auto-mine on game start
-        self.starting_rally = data['starting_rally']
+        self.starting_rally = data['starting_rally'] if 'starting_rally' in data else None
 
         #:
         self.debug_pause_enabled = data['debug_pause_enabled']
@@ -427,7 +427,10 @@ def create_control_group_event(frame, pid, data):
     elif update_type == 3:
         # TODO: What could this be?!?
         return HotkeyEvent(frame, pid, data)
-
+    elif update_type == 4:
+        # No idea what this is but we're seeing it now in 3.0
+        return HotkeyEvent(frame, pid, data)
+        
 
 @loggable
 class HotkeyEvent(PlayerActionEvent):

sc2reader/readers.py

@@ -47,7 +47,7 @@ def __call__(self, data, replay):
                     random_races=data.read_bool(),
                     battle_net=data.read_bool(),
                     amm=data.read_bool(),
-                    ranked=data.read_bool() if replay.base_build >= 34784 else None,
+                    ranked=data.read_bool() if replay.base_build >= 34784 and replay.base_build < 38215 else None,
                     competitive=data.read_bool(),
                     practice=data.read_bool() if replay.base_build >= 34784 else None,
                     cooperative=data.read_bool() if replay.base_build >= 34784 else None,
@@ -1726,6 +1726,31 @@ def control_group_update_event(self, data):
 
 class GameEventsReader_38215(GameEventsReader_36442):
 
+    def __init__(self):
+        super(GameEventsReader_38215, self).__init__()
+
+        self.EVENT_DISPATCH.update({
+            76: (None, self.trigger_command_error_event),
+            92: (None, self.trigger_mousewheel_event),   # 172 in protocol38125.py
+        })
+
+    def trigger_command_error_event(self, data):
+        return dict(
+            error=data.read_uint32() - 2147483648,
+            ability=dict(
+                ability_link=data.read_uint16(),
+                ability_command_index=data.read_bits(5),
+                ability_command_data=data.read_uint8() if data.read_bool() else None,
+            ) if data.read_bool() else None,
+        )
+
+    def trigger_mousewheel_event(self, data):
+        # 172 in protocol38125.py
+        return dict(
+            wheelspin=data.read_uint16()-32768,   # 171 in protocol38125.py
+            flags=data.read_uint8() - 128,        # 112 in protocol38125.py
+        )
+
     def command_event(self, data):
         # this function is exactly the same as command_event() from GameEventsReader_36442
         # with the only change being that flags now has 25 bits instead of 23.
@@ -1766,7 +1791,27 @@ def command_event(self, data):
             other_unit_tag=data.read_uint32() if data.read_bool() else None,
             unit_group=data.read_uint32() if data.read_bool() else None,
         )
-    
+
+    def user_options_event(self, data):
+        # only change: removes starting_rally
+        return dict(
+            game_fully_downloaded=data.read_bool(),
+            development_cheats_enabled=data.read_bool(),
+            test_cheats_enabled=data.read_bool(),
+            multiplayer_cheats_enabled=data.read_bool(),
+            sync_checksumming_enabled=data.read_bool(),
+            is_map_to_map_transition=data.read_bool(),
+            debug_pause_enabled=data.read_bool(),
+            use_galaxy_asserts=data.read_bool(),
+            platform_mac=data.read_bool(),
+            camera_follow=data.read_bool(),
+            base_build_num=data.read_uint32(),
+            build_num=data.read_uint32(),
+            version_flags=data.read_uint32(),
+            hotkey_profile=data.read_aligned_string(data.read_bits(9)),
+            use_ai_beacons=None,
+        )
+
 
 class TrackerEventsReader(object):
 

test_replays/3.0.0.38215/second.SC2Replay

@@ -429,6 +429,7 @@ def test_lotv_map(self):
 
     def test_30(self):
       replay = sc2reader.load_replay("test_replays/3.0.0.38215/first.SC2Replay")
+      replay = sc2reader.load_replay("test_replays/3.0.0.38215/second.SC2Replay")
 
 
 class TestGameEngine(unittest.TestCase):