Merge pull request #11 from gravelweb/update-target

ZergMacroTracker: Look for UpdateTargetAbilityEvent to track injects.

sc2parse/plugins.py

@@ -1129,7 +1129,7 @@ def ZergMacroTracker(replay):
     for player in replay.players:
         player.hatches = dict()
 
-    efilter = lambda e: e.name == "TargetAbilityEvent" and hasattr(e, "ability") and e.ability_name == 'SpawnLarva'
+    efilter = lambda e: e.name.endswith("TargetAbilityEvent") and hasattr(e, "ability") and e.ability_name == "SpawnLarva"
     for event in filter(efilter, replay.events):
         owner = event.player
         target_hatch = event.target

sc2parse/tests.py

@@ -552,6 +552,19 @@ def dont_test_creepspread_speed(self):
       after = datetime.now()
       print after - before
 
+    def test_zerg_macro_injects(self):
+        # FIXME: Not handling queued injects in LOTV (ggtrackerstack issue#50)
+        # Will need tests for expansions < LOTV as well
+        replay = self.get_parsed_replay(33)
+
+        hatches = sorted(replay.players[1].hatches.itervalues())
+        injects = [h.injects for h in hatches]
+        self.assertEqual(injects, [
+            [3774, 4508, 5297, 6343, 7346, 8147, 9668],
+            [3811, 4518, 5307, 6352, 7355, 8155, 9678],
+            [],
+        ])
+
 
 class SC2ReaderToEsdbPKDependentTestCases(TransactionTestCase):
     reset_sequences = True