Add 2.0.10.26490 support.

Author: GraylinKim

sc2reader/events/game.py

@@ -66,6 +66,9 @@ def __init__(self, frame, pid, data):
         #: Are workers sent to auto-mine on game start
         self.starting_rally = data['starting_rally']
 
+        #:
+        self.debug_pause_enabled = data['debug_pause_enabled']
+
         #:
         self.base_build_num = data['base_build_num']
 

sc2reader/events/tracker.py

@@ -40,7 +40,7 @@ class PlayerStatsEvent(TrackerEvent):
     """
     name = 'PlayerStatsEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(PlayerStatsEvent, self).__init__(frames)
 
         #: Id of the player the stats are for
@@ -187,14 +187,32 @@ def __init__(self, frames, data):
         #: The total vespene value of all active forces
         self.vespene_used_active_forces = clamp(self.stats[32])
 
+        #: Minerals of army value lost to friendly fire
+        self.ff_minerals_lost_army = clamp(self.stats[33]) if build >= 26490 else None
+
+        #: Minerals of economy value lost to friendly fire
+        self.ff_minerals_lost_economy = clamp(self.stats[34]) if build >= 26490 else None
+
+        #: Minerals of technology value lost to friendly fire
+        self.ff_minerals_lost_technology = clamp(self.stats[35]) if build >= 26490 else None
+
+        #: Vespene of army value lost to friendly fire
+        self.ff_vespene_lost_army = clamp(self.stats[36]) if build >= 26490 else None
+
+        #: Vespene of economy value lost to friendly fire
+        self.ff_vespene_lost_economy = clamp(self.stats[37]) if build >= 26490 else None
+
+        #: Vespene of technology value lost to friendly fire
+        self.ff_vespene_lost_technology = clamp(self.stats[38]) if build >= 26490 else None
+
     def __str__(self):
         return self._str_prefix()+"{0: >15} - Stats Update".format(self.player)
 
 
 class UnitBornEvent(TrackerEvent):
     name = 'UnitBornEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UnitBornEvent, self).__init__(frames)
 
         #: The index portion of the unit id
@@ -240,7 +258,7 @@ def __str__(self):
 class UnitDiedEvent(TrackerEvent):
     name = 'UnitDiedEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UnitDiedEvent, self).__init__(frames)
 
         #: The index portion of the unit id
@@ -277,7 +295,7 @@ def __str__(self):
 class UnitOwnerChangeEvent(TrackerEvent):
     name = 'UnitOwnerChangeEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UnitOwnerChangeEvent, self).__init__(frames)
 
         #: The index portion of the unit id
@@ -311,7 +329,7 @@ def __str__(self):
 class UnitTypeChangeEvent(TrackerEvent):
     name = 'UnitTypeChangeEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UnitTypeChangeEvent, self).__init__(frames)
 
         #: The index portion of the unit id
@@ -336,7 +354,7 @@ def __str__(self):
 class UpgradeCompleteEvent(TrackerEvent):
     name = 'UpgradeCompleteEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UpgradeCompleteEvent, self).__init__(frames)
 
         #: The player that completed the upgrade
@@ -358,7 +376,7 @@ def __str__(self):
 class UnitInitEvent(TrackerEvent):
     name = 'UnitInitEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UnitInitEvent, self).__init__(frames)
 
         #: The index portion of the unit id
@@ -404,7 +422,7 @@ def __str__(self):
 class UnitDoneEvent(TrackerEvent):
     name = 'UnitDoneEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UnitDoneEvent, self).__init__(frames)
 
         #: The index portion of the unit id
@@ -426,7 +444,7 @@ def __str__(self):
 class UnitPositionsEvent(TrackerEvent):
     name = 'UnitPositionsEvent'
 
-    def __init__(self, frames, data):
+    def __init__(self, frames, data, build):
         super(UnitPositionsEvent, self).__init__(frames)
 
         #: The starting unit index point.

sc2reader/readers.py

@@ -699,6 +699,14 @@ def __call__(self, data, replay):
         )
 
 
+class InitDataReader_26490(InitDataReader_24764):
+
+    def __call__(self, data, replay):
+        data = super(InitDataReader_26490, self).__call__(data, replay)
+        data['game_description']['max_controls'] -= 1
+        return data
+
+
 class AttributesEventsReader_Base(Reader):
     header_length = 4
     offset = False
@@ -743,7 +751,7 @@ def __call__(self, data, replay):
                     region=p[1][0],
                     program_id=p[1][1],
                     subregion=p[1][2],
-                    # name=p[1][3].decode('utf8'),
+                    # name=p[1][3].decode('utf8'),  # This is documented but never available
                     uid=p[1][4],
                 ),
                 race=p[2].decode('utf8'),
@@ -775,6 +783,7 @@ def __call__(self, data, replay):
             default_difficulty=details[13],
             mod_paths=details[14] if (replay.build >= 22612 and replay.versions[1] == 1) else None,
             campaign_index=details[15] if replay.versions[1] == 2 else None,
+            restartAsTransitionMap=details[16] if replay.build > 26490 else None,
         )
 
 
@@ -1031,6 +1040,7 @@ def user_options_event(self, data):
             sync_checksumming_enabled=data.read_bool(),
             is_map_to_map_transition=data.read_bool(),
             use_ai_beacons=None,
+            debug_pause_enabled=None,
             base_build_num=None,
             starting_rally=None,
         )
@@ -1694,6 +1704,7 @@ def user_options_event(self, data):
             sync_checksumming_enabled=data.read_bool(),
             is_map_to_map_transition=data.read_bool(),
             use_ai_beacons=data.read_bool(),
+            debug_pause_enabled=None,
             base_build_num=None,
             starting_rally=None,
         )
@@ -1860,6 +1871,7 @@ def user_options_event(self, data):
             is_map_to_map_transition=data.read_bool(),
             starting_rally=data.read_bool(),
             use_ai_beacons=data.read_bool(),
+            debug_pause_enabled=None,
             base_build_num=None,
         )
 
@@ -1874,6 +1886,7 @@ def user_options_event(self, data):
             sync_checksumming_enabled=data.read_bool(),
             is_map_to_map_transition=data.read_bool(),
             starting_rally=data.read_bool(),
+            debug_pause_enabled=None,
             base_build_num=data.read_uint32(),
             use_ai_beacons=None,
         )
@@ -1997,6 +2010,52 @@ def game_user_join_event(self, data):
         )
 
 
+class GameEventsReader_26490(GameEventsReader_24247):
+
+    def user_options_event(self, data):
+        return dict(
+            game_fully_downloaded=data.read_bool(),
+            development_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(),
+            starting_rally=data.read_bool(),
+            debug_pause_enabled=None,
+            base_build_num=data.read_uint32(),
+            use_ai_beacons=None,
+        )
+
+    def trigger_mouse_clicked_event(self, data):
+        return dict(
+            button=data.read_uint32(),
+            down=data.read_bool(),
+            position_ui=dict(
+                x=data.read_uint32(),
+                y=data.read_uint32(),
+            ),
+            position_world=dict(
+                x=data.read_uint32()-2147483648,
+                y=data.read_uint32()-2147483648,
+                z=data.read_uint32()-2147483648,
+            ),
+            flags=data.read_uint8()-128,
+        )
+
+    def trigger_mouse_moved_event(self, data):
+        return dict(
+            position_ui=dict(
+                x=data.read_bits(11),
+                y=data.read_bits(11),
+            ),
+            position_world=dict(
+                x=data.read_bits(20),
+                y=data.read_bits(20),
+                z=data.read_uint32()-2147483648,
+            ),
+            flags=data.read_uint8()-128,
+        )
+
+
 class TrackerEventsReader_Base(Reader):
 
     def __init__(self):
@@ -2021,7 +2080,7 @@ def __call__(self, data, replay):
             frames += decoder.read_struct()
             etype = decoder.read_struct()
             event_data = decoder.read_struct()
-            event = self.EVENT_DISPATCH[etype](frames, event_data)
+            event = self.EVENT_DISPATCH[etype](frames, event_data, replay.build)
             events.append(event)
 
         return events

sc2reader/resources.py

@@ -524,7 +524,8 @@ def register_default_readers(self):
         self.register_reader('replay.initData', readers.InitDataReader_19132(), lambda r: 19132 <= r.base_build < 22612)
         self.register_reader('replay.initData', readers.InitDataReader_22612(), lambda r: 22612 <= r.base_build < 23925)
         self.register_reader('replay.initData', readers.InitDataReader_23925(), lambda r: 23925 <= r.base_build < 24764)
-        self.register_reader('replay.initData', readers.InitDataReader_24764(), lambda r: 24764 <= r.base_build)
+        self.register_reader('replay.initData', readers.InitDataReader_24764(), lambda r: 24764 <= r.base_build < 26490)
+        self.register_reader('replay.initData', readers.InitDataReader_26490(), lambda r: 26490 <= r.base_build)
         self.register_reader('replay.message.events', readers.MessageEventsReader_Base(), lambda r: r.build < 24247 or r.versions[1] == 1)
         self.register_reader('replay.message.events', readers.MessageEventsReader_Beta_24247(), lambda r: r.build >= 24247 and r.versions[1] == 2)
         self.register_reader('replay.attributes.events', readers.AttributesEventsReader_Base(), lambda r: r.build < 17326)
@@ -536,7 +537,8 @@ def register_default_readers(self):
         self.register_reader('replay.game.events', readers.GameEventsReader_19595(), lambda r: 19595 <= r.base_build < 22612)
         self.register_reader('replay.game.events', readers.GameEventsReader_22612(), lambda r: 22612 <= r.base_build < 23260)
         self.register_reader('replay.game.events', readers.GameEventsReader_23260(), lambda r: 23260 <= r.base_build < 24247)
-        self.register_reader('replay.game.events', readers.GameEventsReader_24247(), lambda r: 24247 <= r.base_build)
+        self.register_reader('replay.game.events', readers.GameEventsReader_24247(), lambda r: 24247 <= r.base_build < 26490)
+        self.register_reader('replay.game.events', readers.GameEventsReader_26490(), lambda r: 26490 <= r.base_build)
         self.register_reader('replay.game.events', readers.GameEventsReader_HotSBeta(), lambda r: r.versions[1] == 2 and r.build < 24247)
         self.register_reader('replay.tracker.events', readers.TrackerEventsReader_Base(), lambda r: True)
 

sc2reader/scripts/__init__.py

@@ -2,4 +2,4 @@
 from __future__ import absolute_import, print_function, unicode_literals, division
 
 # import submodules
-import utils
+from sc2reader.scripts import utils