Merges in grom's event.__str__ patches.

Somewhere along the line these got lost. Now they've been found so check them out::

import sc2reader
replay = sc2reader.read_file('test_replays/1.3.0.18092/qxc_vs_PredY_9852.SC2Replay')
for event in replay.events:
    print event

Cool huh? I think it was an emulation of the sc2gears output at the time.

Author: GraylinKim

sc2reader/objects.py

@@ -278,6 +278,13 @@ def __init__(self, timestamp, player_id, event_type, event_code):
         self.is_camera_movement = (event_type == 0x03)
         self.is_unknown = (event_type == 0x02 or event_type == 0x04 or event_type == 0x05)
 
+    def _str_prefix(self):
+        player_name = self.player.name if self.is_local else "Global"
+        return "%d\t%-15s " % (self.frame, player_name)
+
+    def __str__(self):
+        return self._str_prefix() + self.name
+
 class UnknownEvent(Event):
     name = 'UnknownEvent'
 
@@ -302,6 +309,9 @@ def __init__(self, frames, pid, type, code, target, minerals, vespene):
         self.minerals = minerals
         self.vespene = vespene
 
+    def __str__(self):
+        return self._str_prefix() + "%s transfer %d minerals and %d gas to %s" % (self.sender, self.minerals, self.vespene, self.reciever)
+
 class AbilityEvent(Event):
     name = 'AbilityEvent'
     def __init__(self, framestamp, player, type, code, ability):
@@ -330,6 +340,12 @@ def apply(self):
     def get_able_selection(self, ability):
         return [obj for obj in self.player.get_selection().current if hasattr(obj, ability)]
 
+    def __str__(self):
+        if not self.ability:
+            return self._str_prefix() + "Move"
+        ability_name = ABILITIES[self.ability] if self.ability in ABILITIES else "UNKNOWN"
+        return self._str_prefix() + "Ability (%s) - %s" % (hex(self.ability), ability_name)
+
 class TargetAbilityEvent(AbilityEvent):
     name = 'TargetAbilityEvent'
     def __init__(self, framestamp, player, type, code, ability, target):
@@ -363,12 +379,19 @@ def apply(self):
                 pass
         super(TargetAbilityEvent, self).apply()
 
+    def __str__(self):
+        target = str(self.target) if self.target else "NONE"
+        return AbilityEvent.__str__(self) + "; Target: %s" % target
+
 class LocationAbilityEvent(AbilityEvent):
     name = 'LocationAbilityEvent'
     def __init__(self, framestamp, player, type, code, ability, location):
         super(LocationAbilityEvent, self).__init__(framestamp, player, type, code, ability)
         self.location = location
 
+    def __str__(self):
+        return AbilityEvent.__str__(self) + "; Location: %s" % str(self.location)
+
 class UnknownAbilityEvent(AbilityEvent):
     name = 'UnknownAbilityEvent'
     pass
@@ -384,17 +407,24 @@ def __init__(self, framestamp, player, type, code, hotkey, overlay=None):
         self.hotkey = hotkey
         self.overlay = overlay
 
+    def __str__(self):
+        return self._str_prefix() + "Hotkey #%d" % self.hotkey
+
 class SetToHotkeyEvent(HotkeyEvent):
     name = 'SetToHotkeyEvent'
     def apply(self):
         hotkey = self.player.get_hotkey(self.hotkey)
         selection = self.player.get_selection()
         hotkey[self.frame] = selection.current
+        self.selected = selection.current
 
         # They are alive!
         for obj in selection[self.frame]:
             obj.visit(self.frame, self.player)
 
+    def __str__(self):
+        return HotkeyEvent.__str__(self) + " - Set; Selection: %s" % str(self.selected)
+
 class AddToHotkeyEvent(HotkeyEvent):
     name = 'AddToHotkeyEvent'
     def apply(self):
@@ -408,11 +438,15 @@ def apply(self):
         hotkeyed.extend(self.player.get_selection()[self.frame])
         hotkeyed = list(set(hotkeyed)) # remove dups
         hotkey[self.frame] = hotkeyed
+        self.selected = hotkeyed
 
         # They are alive!
         for obj in hotkeyed:
             obj.visit(self.frame, self.player)
 
+    def __str__(self):
+        return HotkeyEvent.__str__(self) + " - Add; Seletion: %s" % str(self.selected)
+
 class GetHotkeyEvent(HotkeyEvent):
     name = 'GetHotkeyEvent'
     def apply(self):
@@ -424,11 +458,15 @@ def apply(self):
 
         selection = self.player.get_selection()
         selection[self.frame] = hotkeyed
+        self.selected = hotkeyed
 
         # selection is alive!
         for obj in hotkeyed:
             obj.visit(self.frame, self.player)
 
+    def __str__(self):
+        return HotkeyEvent.__str__(self) + " - Get; Seletion: %s" % str(self.selected)
+
 class SelectionEvent(Event):
     name = 'SelectionEvent'
 
@@ -464,3 +502,7 @@ def apply(self):
                 pass
 
         selection[self.frame] = selected
+        self.selected = selected
+
+    def __str__(self):
+        return self._str_prefix() + "Selection: " + str(self.selected)