Add support for several new camera events.

In particular, any camera event with code 0xX8 gets parsed out now with a
rather odd inconsistency for code 0x88. This replaces several one off patches
for the 0x18 and 0x08.

Author: GraylinKim

sc2reader/parsers.py

@@ -305,13 +305,21 @@ def parse_camera87_event(self, buffer, frames, type, code, pid):
         buffer.skip(8)
         return CameraMovementEvent(frames, pid, type, code)
 
-    def parse_camera08_event(self, buffer, frames, type, code, pid):
-        flags, extra = buffer.read_byte(), buffer.read_byte()
-        buffer.skip( (flags&0x0F) << 3 )
-        return CameraMovementEvent(frames, pid, type, code)
+    def parse_cameraX8_event(self, buffer, frames, type, code, pid):
+        # No idea why these two cases are ever so slightly different. There
+        # must be a pattern in here somewhere that I haven't found yet.
+        #
+        # TODO: Find out why we occassionally shift by 2 instead of 3
+        if code == 0x88:
+            flags = buffer.read_byte()
+            extra = buffer.read_byte()
+            buffer.skip( (code & 0xF0 | flags & 0x0F) << 2 )
+
+        else:
+            flags = buffer.read_byte()
+            extra = buffer.read_byte()
+            buffer.skip( (code & 0xF0 | flags & 0x0F) << 3 )
 
-    def parse_camera18_event(self, buffer, frames, type, code, pid):
-        buffer.skip(162)
         return CameraMovementEvent(frames, pid, type, code)
 
     def parse_cameraX1_event(self, buffer, frames, type, code, pid):

sc2reader/readers.py

@@ -296,8 +296,7 @@ def get_camera_parser(self, code):
         # has no meaningful impact on the course of the game. These events will
         # infrequently occur before the game starts for some unknown reason.
         if   code == 0x87: return self.parse_camera87_event
-        elif code == 0x08: return self.parse_camera08_event
-        elif code == 0x18: return self.parse_camera18_event
+        elif code & 0x0F == 8: return self.parse_cameraX8_event
         elif code & 0x0F == 1: return self.parse_cameraX1_event
         else:
             # TODO: Raise a better error