Accomodate an additional player data field in new builds.

Author: GraylinKim

sc2reader/objects.py

@@ -10,7 +10,6 @@
 Location = namedtuple('Location',('x','y'))
 
 MapData = namedtuple('MapData',['gateway','map_hash'])
-PlayerData = namedtuple('PlayerData',['name','bnet','race','color','unknown1','unknown2','handicap','unknown3','result'])
 ColorData = namedtuple('ColorData',['a','r','g','b'])
 BnetData = namedtuple('BnetData',['unknown1','unknown2','subregion','uid'])
 

sc2reader/readers.py

@@ -96,7 +96,9 @@ class AttributesEventsReader_17326(AttributesEventsReader_Base):
 
 
 class DetailsReader_Base(Reader):
+    PlayerData = namedtuple('PlayerData',['name','bnet','race','color','unknown1','unknown2','handicap','unknown3','result'])
     Details = namedtuple('Details',['players','map','unknown1','unknown2','os','file_time','utc_adjustment','unknown4','unknown5','unknown6','unknown7','unknown8','unknown9','unknown10'])
+
     def __call__(self, data, replay):
         # The entire details file is just a serialized data structure
         #
@@ -153,7 +155,7 @@ def __call__(self, data, replay):
         for pdata in details[0]:
             pdata[1] = BnetData(*ordered_values(pdata[1]))
             pdata[3] = ColorData(*ordered_values(pdata[3]))
-            player = PlayerData(*ordered_values(pdata))
+            player = self.PlayerData(*ordered_values(pdata))
             players.append(player)
         details[0] = players
 
@@ -167,6 +169,9 @@ class DetailsReader_22612(DetailsReader_Base):
 class DetailsReader_Beta(DetailsReader_Base):
     Details = namedtuple('Details',['players','map','unknown1','unknown2','os','file_time','utc_adjustment','unknown4','unknown5','unknown6','unknown7','unknown8','unknown9','unknown10', 'unknown11', 'unknown12'])
 
+class DetailsReader_Beta_24764(DetailsReader_Beta):
+    PlayerData = namedtuple('PlayerData',['name','bnet','race','color','unknown1','unknown2','handicap','unknown3','result','unknown4'])
+
 class MessageEventsReader_Base(Reader):
     POFFSET=-1
     TARGET_BITS=3

sc2reader/resources.py

@@ -558,7 +558,8 @@ def register_default_readers(self):
         """Registers factory default readers."""
         self.register_reader('replay.details', readers.DetailsReader_Base(), lambda r: r.build < 22612)
         self.register_reader('replay.details', readers.DetailsReader_22612(), lambda r: r.build >= 22612 and r.expansion=='WoL')
-        self.register_reader('replay.details', readers.DetailsReader_Beta(), lambda r: r.expansion=='HotS')
+        self.register_reader('replay.details', readers.DetailsReader_Beta(), lambda r: r.build < 24764 and r.expansion=='HotS')
+        self.register_reader('replay.details', readers.DetailsReader_Beta_24764(), lambda r: r.build >= 24764 and r.expansion=='HotS')
         self.register_reader('replay.initData', readers.InitDataReader_Base())
         self.register_reader('replay.message.events', readers.MessageEventsReader_Base(), lambda r: r.build < 24247)
         self.register_reader('replay.message.events', readers.MessageEventsReader_Beta_24247(), lambda r: r.build >= 24247)