Allow advanced shipyards to be built if requirement is enqueued

~Robotic line yards require a Drydock enqueued or built ~Cellular and Xenocoordination yards require Incubator built or enqueud ~Asteroid Reformation requires Processor to be enqued ~Solar Compressor requires Energy Compressor to be enqueud *and* both require the right sun type or an artificial black hole enqueued
freeorion · May 13, 2016 · 9e062b7 · 9e062b7
1 parent 8ff58e2
commit 9e062b7
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 25 deletions.
diff --git a/default/scripting/buildings/shipyards/ASTEROID_REF.focs.txt b/default/scripting/buildings/shipyards/ASTEROID_REF.focs.txt
@@ -8,10 +8,13 @@ BuildingType
         Not Contains Building name = "BLD_SHIPYARD_AST_REF"
         Planet type = Asteroids
         OwnedBy empire = Source.Owner
-        Contains And [
-            Building name = "BLD_SHIPYARD_AST"
-            OwnedBy empire = Source.Owner
-        ]
+        Or  [
+            Contains And [
+                Building name = "BLD_SHIPYARD_AST"
+                OwnedBy empire = Source.Owner
+                ]
+            Enqueued type = Building name = "BLD_SHIPYARD_AST"
+            ]
         Not Contains And [
             Building name = "BLD_SHIPYARD_AST_REF"
             OwnedBy empire = Source.Owner

diff --git a/default/scripting/buildings/shipyards/CON_ADV_ENGINE.focs.txt b/default/scripting/buildings/shipyards/CON_ADV_ENGINE.focs.txt
@@ -11,10 +11,13 @@ BuildingType
             Building name = "BLD_SHIPYARD_BASE"
             OwnedBy empire = Source.Owner
         ]
-        Contains And [
-            Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
-            OwnedBy empire = Source.Owner
-        ]
+        Or  [
+            Contains And [
+                Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
+                OwnedBy empire = Source.Owner
+                ]
+            Enqueued type = Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
+            ]
         OwnedBy empire = Source.Owner
     ]
     EnqueueLocation = [[ENQUEUE_BUILD_ONE_PER_PLANET]]

diff --git a/default/scripting/buildings/shipyards/CON_GEOINT.focs.txt b/default/scripting/buildings/shipyards/CON_GEOINT.focs.txt
@@ -11,10 +11,13 @@ BuildingType
             Building name = "BLD_SHIPYARD_BASE"
             OwnedBy empire = Source.Owner
         ]
-        Contains And [
-            Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
-            OwnedBy empire = Source.Owner
-        ]
+        Or  [
+            Contains And [
+                Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
+                OwnedBy empire = Source.Owner
+                ]
+            Enqueued type = Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
+            ]
         OwnedBy empire = Source.Owner
     ]
     EnqueueLocation = [[ENQUEUE_BUILD_ONE_PER_PLANET]]

diff --git a/default/scripting/buildings/shipyards/CON_NANOROBO.focs.txt b/default/scripting/buildings/shipyards/CON_NANOROBO.focs.txt
@@ -11,10 +11,13 @@ BuildingType
             Building name = "BLD_SHIPYARD_BASE"
             OwnedBy empire = Source.Owner
         ]
-        Contains And [
-            Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
-            OwnedBy empire = Source.Owner
-        ]
+        Or  [
+            Contains And [
+                Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
+                OwnedBy empire = Source.Owner
+                ]
+            Enqueued type = Building name = "BLD_SHIPYARD_ORBITAL_DRYDOCK"
+            ]
         OwnedBy empire = Source.Owner
     ]
     EnqueueLocation = [[ENQUEUE_BUILD_ONE_PER_PLANET]]

diff --git a/default/scripting/buildings/shipyards/ENERGY_COMP.focs.txt b/default/scripting/buildings/shipyards/ENERGY_COMP.focs.txt
@@ -11,6 +11,10 @@ BuildingType
             Building name = "BLD_SHIPYARD_BASE"
             OwnedBy empire = Source.Owner
         ]
+        Or [
+            Star type = [White Blue BlackHole]
+            Enqueued type = Building name = "BLD_ART_BLACK_HOLE"
+            ]
         OwnedBy empire = Source.Owner
     ]
     EnqueueLocation = [[ENQUEUE_BUILD_ONE_PER_PLANET]]

diff --git a/default/scripting/buildings/shipyards/ENERGY_SOLAR.focs.txt b/default/scripting/buildings/shipyards/ENERGY_SOLAR.focs.txt
@@ -7,14 +7,21 @@ BuildingType
     location = And [
         Planet
         Not Contains Building name = "BLD_SHIPYARD_ENRG_SOLAR"
-        Contains And [
-            Building name = "BLD_SHIPYARD_ENRG_COMP"
-            OwnedBy empire = Source.Owner
+        Or  [
+            Contains And [
+                Building name = "BLD_SHIPYARD_ENRG_COMP"
+                OwnedBy empire = Source.Owner
+                ]
+            Enqueued type = Building name = "BLD_SHIPYARD_ENRG_COMP"
         ]
         Contains And [
             Building name = "BLD_SHIPYARD_BASE"
             OwnedBy empire = Source.Owner
         ]
+        Or [
+            Star type = BlackHole
+            Enqueued type = Building name = "BLD_ART_BLACK_HOLE"
+            ]
         OwnedBy empire = Source.Owner
     ]
     EnqueueLocation = [[ENQUEUE_BUILD_ONE_PER_PLANET]]

diff --git a/default/scripting/buildings/shipyards/ORGANIC_CEL_GRO.focs.txt b/default/scripting/buildings/shipyards/ORGANIC_CEL_GRO.focs.txt
@@ -11,9 +11,12 @@ BuildingType
             Building name = "BLD_SHIPYARD_BASE"
             OwnedBy empire = Source.Owner
         ]
-        Contains And [
-            Building name = "BLD_SHIPYARD_ORG_ORB_INC"
-            OwnedBy empire = Source.Owner
+        Or  [
+            Contains And [
+                Building name = "BLD_SHIPYARD_ORG_ORB_INC"
+                OwnedBy empire = Source.Owner
+                ]
+            Enqueued type = Building name = "BLD_SHIPYARD_ORG_ORB_INC"
         ]
         OwnedBy empire = Source.Owner
     ]

diff --git a/default/scripting/buildings/shipyards/ORGANIC_XENO_FAC.focs.txt b/default/scripting/buildings/shipyards/ORGANIC_XENO_FAC.focs.txt
@@ -11,9 +11,12 @@ BuildingType
             Building name = "BLD_SHIPYARD_BASE"
             OwnedBy empire = Source.Owner
         ]
-        Contains And [
-            Building name = "BLD_SHIPYARD_ORG_ORB_INC"
-            OwnedBy empire = Source.Owner
+        Or  [
+            Contains And [
+                Building name = "BLD_SHIPYARD_ORG_ORB_INC"
+                OwnedBy empire = Source.Owner
+                ]
+            Enqueued type = Building name = "BLD_SHIPYARD_ORG_ORB_INC"
         ]
         OwnedBy empire = Source.Owner
     ]