Mix in Scourge when enemy air units are on the field (fixes #3, fixes #4

)

src/zerg/attacks/guardian.pyai

@@ -2,4 +2,6 @@ use_attack_vs(Zerg, Terran, Protoss)
 
 if owned(greater spire):
     attack_multiple(8, 2 Mutalisk, 1 Guardian)
+    if enemyownsair():
+        attack_train(4, scourge)
     attack_simple()

src/zerg/attacks/hydra.pyai

@@ -2,4 +2,9 @@ use_attack_vs(Zerg, Terran, Protoss)
 
 if owned(hydralisk den):
     attack_multiple(8, 4 Hydra)
-    attack_simple()
+    attack_simple()
+    if enemyownsair():
+        if owned(spire):
+            attack_train(4, scourge)
+        if owned(greater spire):
+            attack_train(4, scourge)

src/zerg/attacks/lurker ling defiler.pyai

@@ -5,4 +5,10 @@ if owned(hive):
         if owned(defiler mound):
             attack_train(3, defiler)
         attack_multiple(2, 5 Lurker, 16 Ling)
-        attack_simple()
+        if enemyownsair():
+            if owned(spire):
+                attack_train(4, scourge)
+            if owned(greater spire):
+                attack_train(4, scourge)
+        attack_simple()
+

src/zerg/attacks/muta ling.pyai

@@ -2,4 +2,6 @@ use_attack_vs(Zerg, Terran, Protoss)
 
 if owned(spire):
     attack_multiple(3, 4 Muta, 12 Ling)
+    if enemyownsair():
+        attack_train(4, scourge)
     attack_simple()

src/zerg/attacks/ultra ling.pyai

@@ -4,4 +4,9 @@ if owned(Ultralisk cavern):
     if owned(defiler mound):
         attack_train(4, Zerg Defiler)
     attack_multiple(4, 2 Ultralisk, 12 Zergling)
+    if enemyownsair():
+        if owned(spire):
+            attack_train(4, scourge)
+        if owned(greater spire):
+            attack_train(4, scourge)
     attack_simple()

src/zerg/managers/tech_manager.pyai

@@ -14,14 +14,23 @@ upgrade(1, Zerg Melee Attacks, 80)
 wait_build(1, lair)
 wait_build(1, hydralisk den)
 
+if enemyownsair():
+    build_start(1, spire)
+
 tech(Lurker Aspect, 80)
 
 wait(2000)
 
+if enemyownsair():
+    build_start(1, spire)
+
 build_finish(1, Zerg Queen's Nest, 80)
 build_finish(1, Zerg Hive)
 upgrade(1, Adrenal Glands, 80)
 
+if enemyownsair():
+    build_start(1, spire)
+
 wait(1000)
 upgrade(2, Zerg Carapace, 80)
 upgrade(1, Zerg Missile Attacks, 80)

tools/macros.js

@@ -171,6 +171,11 @@ var parse = function parse(content) {
         return expandEnemyOwns(units, block);
     });
 
+    content = content.replace(/enemyownsair_jump\((.*)\)/g, function(original, block) {
+        var units = ['Terran Science Vessel', 'Terran Wraith', 'Terran Valkyrie', 'Terran Battlecruiser', 'Zerg Mutalisk', 'Zerg Scourge', 'Zerg Guardian', 'Zerg Devourer', 'Zerg Queen', 'Protoss Scout', 'Protoss Corsair', 'Protoss Carrier', 'Protoss Arbiter'];
+        return expandEnemyOwns(units, block);
+    });
+
     content = content.replace(/build_start\((.*)\)/g, function(original, args) {
         args = args.split(',');
         var amount = args[0];