Fixed bugs in resource transfer parsing and added a parser for 04-XC type events.

Author: GraylinKim

sc2reader/objects.py

@@ -63,7 +63,7 @@ def __init__(self, data):
             self.name, self.value = "Player Type", PLAYER_TYPES[self.value]
 
         elif self.id == 0x07D1:
-            self.name = "Game Type"
+            self.name,self.value = "Game Type",''.join(reversed(self.value))
 
         elif self.id == 0x0BB8:
             self.name, self.value = "Game Speed", GAME_SPEEDS[self.value]
@@ -244,8 +244,8 @@ class CameraMovementEvent(Event):
 
 class ResourceTransferEvent(Event):
     name = 'ResourceTransfer'
-    def __init__(self, timestamp, player, type, code, target, minerals, vespene):
-        super(ResourceTransferEvent, self).__init__(timestamp, player, type, code)
+    def __init__(self, frames, pid, type, code, target, minerals, vespene):
+        super(ResourceTransferEvent, self).__init__(frames, pid, type, code)
         self.sender = pid
         self.reciever = target
         self.minerals = minerals

sc2reader/parsers.py

@@ -1,6 +1,7 @@
 from itertools import chain
 
 from sc2reader.objects import *
+from sc2reader.utils import BIG_ENDIAN,LITTLE_ENDIAN
 
 class SetupParser(object):
     def parse_join_event(self, buffer, frames, type, code, pid):
@@ -120,17 +121,17 @@ def parse_hotkey_event(self, buffer, frames, type, code, pid):
             return GetHotkeyEvent(frames, pid, type, code, hotkey, overlay)
 
     def parse_transfer_event(self, buffer, frames, type, code, pid):
-        def read_resource_amount(buffer):
+        def read_resource(buffer):
             block = buffer.read_int(BIG_ENDIAN)
             base, multiplier, extension = block >> 8, block & 0xF0, block & 0x0F
             return base*multiplier+extension
 
-        target = event.code >> 4
-        bytes.skip(1)   #84
-        minerals,vespene = read_resource_amount(), read_resource_amount()
-        bytes.skip(8)
+        target = code >> 4
+        buffer.skip(1)   #84
+        minerals,vespene = read_resource(buffer), read_resource(buffer)
+        buffer.skip(8)
 
-        return ResourceTransferEvent(frames, pid, event_type, event_code, target, minerals, vespene)
+        return ResourceTransferEvent(frames, pid, type, code, target, minerals, vespene)
 
 class Unknown2Parser(object):
     def parse_0206_event(self, buffer, frames, type, code, pid):
@@ -194,3 +195,7 @@ def parse_0400_event(self, buffer, frames, type, code, pid):
     def parse_04X2_event(self, buffer, frames, type, code, pid):
         buffer.skip(2)
         return UnknownEvent(frames, pid, type, code)
+        
+    def parse_04XC_event(self, buffer, frames, type, code, pid):
+        #no body
+        return UnknownEvent(frames, pid, type, code)

sc2reader/readers.py

@@ -184,6 +184,9 @@ def read(self, filecontents, replay):
                 event = parser(buffer, frames, type, code, pid)
                 buffer.align()
                 event.bytes = buffer.read_range(start,buffer.cursor)
+
+                print "%s - %s" % (event,event.bytes.encode("hex"))
+                print "Next: %s" % buffer.peek(10 if 10<buffer.left else buffer.left)
                 replay.events.append(event)
             else:
                 msg = "Unknown event: %s - %s at %s"
@@ -216,7 +219,8 @@ def get_unknown4_parser(self, code):
         elif code == 0xC6: return self.parse_04C6_event
         elif code == 0x87: return self.parse_0487_event
         elif code == 0x00: return self.parse_0400_event
-        elif code & 0x0F == 2: return self.parse_04X2_event
+        elif code & 0x0F == 0x02: return self.parse_04X2_event
+        elif code & 0x0F == 0x0C: return self.parse_04XC_event
 
 class GameEventsReader(GameEventsBase,Unknown2Parser,Unknown4Parser,ActionParser,SetupParser,CameraParser):
     def reads(self, build):

sc2reader/utils.py

@@ -88,8 +88,9 @@ def seek(self, position, mode=SEEK_SET):
             self.last_byte = ord(self.io.read(1))
 
     def peek(self, length):
-        start,ret = self.cursor,self.read_hex(length)
+        start,last,ret = self.cursor,self.last_byte,self.read_hex(length)
         self.seek(start, SEEK_SET)
+        self.last_byte = last
         return ret
 
     '''