Make sure that attribute pids match everywhere else.

HotS.24247+ switches to 0-indexing for pids instead of the 1-indexing
that it had used in the past for everything except for the
attribute.events file. This makes sure the numbers line up.

Author: GraylinKim

sc2reader/readers.py

@@ -62,6 +62,7 @@ def __call__(self, data, replay):
 
 class AttributesEventsReader_Base(Reader):
     header_length = 4
+    offset=False
 
     def __call__(self, data, replay):
         # The replay.attribute.events file is comprised of a small header and
@@ -81,6 +82,11 @@ def __call__(self, data, replay):
                     data.read_byte(),
                     data.read(4).strip('\00 ')[::-1]
                 ]
+
+            # Hack added for 24247 and higher in HotS
+            if info[2]!=16 and self.offset:
+                info[2]= info[2]-1
+
             #print hex(info[1]), "P"+str(info[2]), info[3]
             attribute_events.append(Attribute(info))
 
@@ -91,6 +97,8 @@ class AttributesEventsReader_17326(AttributesEventsReader_Base):
     # The header length is increased from 4 to 5 bytes from patch 17326 and on.
     header_length = 5
 
+class AttributesEventsReader_24247(AttributesEventsReader_17326):
+    offset=True
 
 class DetailsReader_Base(Reader):
     Details = namedtuple('Details',['players','map','unknown1','unknown2','os','file_time','utc_adjustment','unknown4','unknown5','unknown6','unknown7','unknown8','unknown9','unknown10'])

sc2reader/resources.py

@@ -555,6 +555,7 @@ def register_default_readers(self):
         self.register_reader('replay.message.events', readers.MessageEventsReader_Base())
         self.register_reader('replay.attributes.events', readers.AttributesEventsReader_Base(), lambda r: r.build <  17326)
         self.register_reader('replay.attributes.events', readers.AttributesEventsReader_17326(), lambda r: r.build >= 17326)
+        self.register_reader('replay.attributes.events', readers.AttributesEventsReader_24247(), lambda r: r.build >= 24247 and r.expansion=='HotS')
         self.register_reader('replay.game.events', readers.GameEventsReader_16117(), lambda r: 16117 <= r.build < 16561)
         self.register_reader('replay.game.events', readers.GameEventsReader_16561(), lambda r: 16561 <= r.build < 18574)
         self.register_reader('replay.game.events', readers.GameEventsReader_18574(), lambda r: 18574 <= r.build < 19595)