event.pid is actually an index into replay.people.

And all this time we thought it was the player number. Crazy!
Fixes #90, at least for the example replay given.

Author: GraylinKim

sc2reader/events.py

@@ -16,12 +16,12 @@ def __init__(self, frame, pid):
         # self.time = Length(seconds=self.second)
 
     def load_context(self, replay):
-#        print "Hi", self.pid, replay.person, self.__class__
-        if self.pid != 16 and self.pid not in replay.person:
-            self.logger.error("Bad pid ({}) for event {} at {}.".format(self.pid, self.__class__, Length(seconds=int(self.frame/16))))
-
-        if self.pid != 16:
-            self.player = replay.person[self.pid]
+        if self.pid < len(replay.people):
+            self.player = replay.people[self.pid]
+        elif self.pid != 16:
+            self.logger.error("Bad pid ({0}) for event {1} at {2}.".format(self.pid, self.__class__, Length(seconds=self.second)))
+        else:
+            pass # This is a global event
 
     def _str_prefix(self):
         player_name = self.player.name if getattr(self,'pid', 16)!=16 else "Global"

sc2reader/resources.py

@@ -511,14 +511,13 @@ def load_events(self):
             event.load_context(self)
             # TODO: Should this be documented or removed? I don't like it.
             if event.pid != 16:
-                player = self.person[event.pid]
-                player.events.append(event)
+                event.player.events.append(event)
                 if is_camera:
-                    player.camera_events.append(event)
+                    event.player.camera_events.append(event)
                 elif is_selection:
-                    player.selection_events.append(event)
+                    event.player.selection_events.append(event)
                 elif is_ability:
-                    player.ability_events.append(event)
+                    event.player.ability_events.append(event)
 
     def register_reader(self, data_file, reader, filterfunc=lambda r: True):
         """