Merge branch 'develop'

Author: Quitch

pa/q_uber/fabber_builds/subpersonalities/air.json

@@ -7,7 +7,12 @@
       "shared_instance_count": "BasicFactory",
       "priority": 376,
       "base_sort": "FromMainBase",
-      "builders": ["UberCommander", "AnyUberBasicFabber"],
+      "builders": [
+        "UberCommander",
+        "BasicBotFabber",
+        "BasicNavalFabber",
+        "BasicVehicleFabber"
+      ],
       "build_conditions": [
         [
           {
@@ -23,14 +28,16 @@
             "test_type": "AloneOnPlanet",
             "boolean": false
           },
-          {
-            "test_type": "CanDeployLandFromBase",
-            "boolean": true
-          },
           {
             "test_type": "CanAffordPotentialDrain",
             "string0": "BasicAirFactory"
           },
+          {
+            "test_type": "UnitCountOnPlanet",
+            "unit_type_string0": "Factory - Orbital",
+            "compare0": ">=",
+            "value0": 1
+          },
           {
             "test_type": "CanFindPlaceToBuild",
             "string0": "BasicAirFactory"
@@ -76,10 +83,6 @@
             "test_type": "HaveEcoForAdvanced",
             "boolean": true
           },
-          {
-            "test_type": "CanDeployLandFromBase",
-            "boolean": true
-          },
           {
             "test_type": "CanAffordPotentialDrain",
             "string0": "AdvancedAirFactory"
@@ -113,7 +116,12 @@
       "shared_instance_count": "BasicFactory",
       "priority": 376,
       "base_sort": "FromMainBase",
-      "builders": ["LegionCommander", "AnyLegionFabberBasic"],
+      "builders": [
+        "LegionCommander",
+        "LegionBotBasicFabber",
+        "LegionNavalBasicFabber",
+        "LegionVehicleBasicFabber"
+      ],
       "build_conditions": [
         [
           {
@@ -129,14 +137,16 @@
             "test_type": "AloneOnPlanet",
             "boolean": false
           },
-          {
-            "test_type": "CanDeployLandFromBase",
-            "boolean": true
-          },
           {
             "test_type": "CanAffordPotentialDrain",
             "string0": "LegionFactoryBasicAir"
           },
+          {
+            "test_type": "UnitCountOnPlanet",
+            "unit_type_string0": "Factory - Orbital",
+            "compare0": ">=",
+            "value0": 1
+          },
           {
             "test_type": "CanFindPlaceToBuild",
             "string0": "LegionFactoryBasicAir"
@@ -182,10 +192,6 @@
             "test_type": "HaveEcoForAdvanced",
             "boolean": true
           },
-          {
-            "test_type": "CanDeployLandFromBase",
-            "boolean": true
-          },
           {
             "test_type": "CanAffordPotentialDrain",
             "string0": "LegionFactoryAdvancedAir"