Modify the TargetAbilityEvent interface.

Changes:
  * New Event.target_id and Event.target_type take the place of the
    previous Event.target field's components.
  * Event.target now is always a DataObject representing the target
    or None if no such object could be found.

NOTE: If the targetted object is behind fog of war the unit id will
not be available which creates a anonymous object of the specified
type. These units are not added to the replay.objects lookup table.

Author: GraylinKim

sc2reader/events.py

@@ -143,23 +143,29 @@ def __str__(self):
 class TargetAbilityEvent(AbilityEvent):
     def __init__(self, framestamp, player, type, code, ability, target):
         super(TargetAbilityEvent, self).__init__(framestamp, player, type, code, ability)
-        self.target = target
+        self.target = None
+        self.target_id, self.target_type = target
+        #Forgot why we have to munge this
+        self.target_type = self.target_type << 8 | 0x01
+
 
     def load_context(self, replay):
         super(TargetAbilityEvent, self).load_context(replay)
+        uid = (self.target_id, self.target_type)
 
-        obj_id, obj_type = self.target
-        obj_type = obj_type << 8 | 0x01 #Forgot why we have to munge this
-
-        if (obj_id, obj_type) in replay.objects:
-            self.target = replay.objects[(obj_id, obj_type)]
+        if uid in replay.objects:
+            self.target = replay.objects[uid]
 
-        elif obj_id:
-            if obj_type not in replay.datapack.types:
-                self.target = DataObject(0x00)
+        else:
+            if self.target_type not in replay.datapack.types:
+                self.target = None
             else:
-                self.target = replay.datapack.types[obj_type](obj_id)
-            replay.objects[(obj_id, obj_type)] = self.target
+                unit_class = replay.datapack.types[self.target_type]
+                self.target = unit_class(self.target_id)
+
+                # For units behind the fog of war, don't make an entry
+                if self.target.id:
+                    replay.objects[uid] = self.target
 
     def __str__(self):
         if self.target: