Fix Ability.__str__ to report the ability name when available.

Author: GraylinKim

sc2reader/events.py

@@ -126,26 +126,28 @@ def load_context(self, replay):
 class AbilityEvent(PlayerActionEvent):
     def __init__(self, framestamp, player, type, code, ability):
         super(AbilityEvent, self).__init__(framestamp, player, type, code)
-        self.ability = ability
+        self.ability_code = ability
 
     def load_context(self, replay):
         super(AbilityEvent, self).load_context(replay)
 
-        if self.ability not in replay.datapack.abilities:
+        if self.ability_code not in replay.datapack.abilities:
             if not getattr(replay, 'marked_error', None):
                 replay.marked_error=True
                 self.logger.error(replay.filename)
                 self.logger.error("Release String: "+replay.release_string)
                 for player in replay.players:
                     self.logger.error("\t"+str(player))
-            self.logger.error("{0}\t{1}\tMissing ability {2} from {3}".format(self.frame, self.player.name, hex(self.ability), replay.datapack.__class__.__name__))
+            self.logger.error("{0}\t{1}\tMissing ability {2} from {3}".format(self.frame, self.player.name, hex(self.ability_code), replay.datapack.__class__.__name__))
+            self.ability = "UNKNOWN"
+        else:
+            self.ability = replay.datapack.abilities[self.ability_code]
 
     def __str__(self):
-        if not self.ability:
+        if not self.ability_code:
             return self._str_prefix() + "Move"
         else:
-            ability_name = self.data.ability(self.ability) if self.ability in self.data.abilities else "UNKNOWN"
-            return self._str_prefix() + "Ability (%s) - %s" % (hex(self.ability), ability_name)
+            return self._str_prefix() + "Ability (%s) - %s" % (hex(self.ability_code), self.ability)
 
 @loggable
 class TargetAbilityEvent(AbilityEvent):