Revert "Revert "Add colony buildings for natives that can colonize bu…

…t can't …"
freeorion · May 10, 2015 · ea30314 · ea30314
1 parent b49183d
commit ea30314
Show file tree

Hide file tree

Showing 5 changed files with 330 additions and 3 deletions.
diff --git a/default/col_bld_gen.py b/default/col_bld_gen.py
@@ -12,15 +12,18 @@
     ("SP_EAXAW", "Eaxaw", "icons/species/eaxaw.png"),
     ("SP_EGASSEM", "Egassem", "icons/species/egassem.png"),
     ("SP_ETTY", "Etty", "icons/species/etty.png"),
+    ("SP_FURTHEST", "Furthest", "icons/species/furthest.png"),
     ("SP_GEORGE", "George", "icons/species/george.png"),
     ("SP_GYSACHE", "Gysache", "icons/species/gysache.png"),
     ("SP_HHHOH", "Hhhoh", "icons/species/hhhoh.png"),
     ("SP_HUMAN", "Human", "icons/species/human.png"),
     ("SP_KOBUNTURA", "Kobuntura", "icons/species/intangible-04.png"),
     ("SP_LAENFA", "Laenfa", "icons/species/laenfa.png"),
     ("SP_MUURSH", "Mu Ursh", "icons/species/muursh.png"),
+    ("SP_PHINNERT", "Phinnert", "icons/species/phinnert.png"),
     ("SP_SCYLIOR", "Scylior", "icons/species/scylior.png"),
     ("SP_SETINON", "Setinon", "icons/species/amorphous-02.png"),
+    ("SP_SILEXIAN", "Silexian", "icons/species/robotic-06.png"),
     ("SP_SSLITH", "Sslith", "icons/species/sslith.png"),
     ("SP_TAEGHIRUS", "Tae Ghirus", "icons/species/t-aeghirus.png"),
     ("SP_TRITH", "Trith", "icons/species/trith.png"),

diff --git a/default/col_buildings.txt b/default/col_buildings.txt
@@ -806,6 +806,107 @@ BuildingType
     ]
     icon = "icons/species/etty.png"
 
+BuildingType
+    name = "BLD_COL_FURTHEST"
+    description = "BLD_COL_FURTHEST_DESC"
+    buildcost = 50 * [[COLONY_UPKEEP_MULTIPLICATOR]]
+    buildtime = max(5.0, 1.0 +
+        (min value = ShortestPath object = Target.SystemID object = LocalCandidate.SystemID
+            condition = And [
+                Planet
+                OwnedBy empire = Source.Owner
+                Species name = "SP_FURTHEST"
+                Population low = [[MIN_RECOLONIZING_SIZE]]
+                Happiness low = 5
+                ResourceSupplyConnected empire = Source.Owner condition = Target
+            ]
+        ) / max(60, (max
+                      value = LocalCandidate.speed
+                      condition = And [
+                          Ship
+                          OwnedBy empire = Source.Owner
+                      ]
+               ))
+    )
+    location = And [
+        Planet
+        OwnedBy empire = Source.Owner
+        Population high = 0
+        Not Planet environment = Uninhabitable species = "SP_FURTHEST"
+        Not Contains Building name = "BLD_COL_FURTHEST"
+        ResourceSupplyConnected empire = Source.Owner condition = And [
+            Planet
+            OwnedBy empire = Source.Owner
+            Species name = "SP_FURTHEST"
+            Population low = [[MIN_RECOLONIZING_SIZE]]
+            Happiness low = 5
+        ]
+    ]
+    EnqueueLocation = And [
+        Planet
+        OwnedBy empire = Source.Owner
+        Population high = 0
+        Not Planet environment = Uninhabitable species = "SP_FURTHEST"
+        Not Contains Building name = "BLD_COL_FURTHEST"
+        Not Enqueued type = Building name = "BLD_COL_FURTHEST"
+        ResourceSupplyConnected empire = Source.Owner condition = And [
+            Planet
+            OwnedBy empire = Source.Owner
+            Species name = "SP_FURTHEST"
+            Population low = [[MIN_RECOLONIZING_SIZE]]
+            Happiness low = 5
+        ]
+    ]
+    effectsgroups = [
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = And [
+                Not OwnerHasTech name = "GRO_LIFECYCLE_MAN"
+                Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            ]
+            effects = [
+                SetSpecies name = "SP_FURTHEST"
+                SetPopulation value = 1
+            ]
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = And [
+                OwnerHasTech name = "GRO_LIFECYCLE_MAN"
+                Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            ]
+            effects = [
+                SetSpecies name = "SP_FURTHEST"
+                SetPopulation value = [[MIN_RECOLONIZING_SIZE]]
+            ]
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            effects = [
+                GenerateSitRepMessage
+                    message = "SITREP_NEW_COLONY_ESTABLISHED"
+                    icon = "icons/species/furthest.png"
+                    parameters = [
+                        tag = "species" data = "SP_FURTHEST"
+                        tag = "planet" data = Target.ID
+                    ]
+                    empire = Source.Owner
+            ]
+        EffectsGroup
+            scope = Source
+            activation = Turn low = Source.CreationTurn + 2
+            effects = Destroy
+    ]
+    icon = "icons/species/furthest.png"
+
 BuildingType
     name = "BLD_COL_GEORGE"
     description = "BLD_COL_GEORGE_DESC"
@@ -1513,6 +1614,107 @@ BuildingType
     ]
     icon = "icons/species/muursh.png"
 
+BuildingType
+    name = "BLD_COL_PHINNERT"
+    description = "BLD_COL_PHINNERT_DESC"
+    buildcost = 50 * [[COLONY_UPKEEP_MULTIPLICATOR]]
+    buildtime = max(5.0, 1.0 +
+        (min value = ShortestPath object = Target.SystemID object = LocalCandidate.SystemID
+            condition = And [
+                Planet
+                OwnedBy empire = Source.Owner
+                Species name = "SP_PHINNERT"
+                Population low = [[MIN_RECOLONIZING_SIZE]]
+                Happiness low = 5
+                ResourceSupplyConnected empire = Source.Owner condition = Target
+            ]
+        ) / max(60, (max
+                      value = LocalCandidate.speed
+                      condition = And [
+                          Ship
+                          OwnedBy empire = Source.Owner
+                      ]
+               ))
+    )
+    location = And [
+        Planet
+        OwnedBy empire = Source.Owner
+        Population high = 0
+        Not Planet environment = Uninhabitable species = "SP_PHINNERT"
+        Not Contains Building name = "BLD_COL_PHINNERT"
+        ResourceSupplyConnected empire = Source.Owner condition = And [
+            Planet
+            OwnedBy empire = Source.Owner
+            Species name = "SP_PHINNERT"
+            Population low = [[MIN_RECOLONIZING_SIZE]]
+            Happiness low = 5
+        ]
+    ]
+    EnqueueLocation = And [
+        Planet
+        OwnedBy empire = Source.Owner
+        Population high = 0
+        Not Planet environment = Uninhabitable species = "SP_PHINNERT"
+        Not Contains Building name = "BLD_COL_PHINNERT"
+        Not Enqueued type = Building name = "BLD_COL_PHINNERT"
+        ResourceSupplyConnected empire = Source.Owner condition = And [
+            Planet
+            OwnedBy empire = Source.Owner
+            Species name = "SP_PHINNERT"
+            Population low = [[MIN_RECOLONIZING_SIZE]]
+            Happiness low = 5
+        ]
+    ]
+    effectsgroups = [
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = And [
+                Not OwnerHasTech name = "GRO_LIFECYCLE_MAN"
+                Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            ]
+            effects = [
+                SetSpecies name = "SP_PHINNERT"
+                SetPopulation value = 1
+            ]
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = And [
+                OwnerHasTech name = "GRO_LIFECYCLE_MAN"
+                Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            ]
+            effects = [
+                SetSpecies name = "SP_PHINNERT"
+                SetPopulation value = [[MIN_RECOLONIZING_SIZE]]
+            ]
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            effects = [
+                GenerateSitRepMessage
+                    message = "SITREP_NEW_COLONY_ESTABLISHED"
+                    icon = "icons/species/phinnert.png"
+                    parameters = [
+                        tag = "species" data = "SP_PHINNERT"
+                        tag = "planet" data = Target.ID
+                    ]
+                    empire = Source.Owner
+            ]
+        EffectsGroup
+            scope = Source
+            activation = Turn low = Source.CreationTurn + 2
+            effects = Destroy
+    ]
+    icon = "icons/species/phinnert.png"
+
 BuildingType
     name = "BLD_COL_SCYLIOR"
     description = "BLD_COL_SCYLIOR_DESC"
@@ -1715,6 +1917,107 @@ BuildingType
     ]
     icon = "icons/species/amorphous-02.png"
 
+BuildingType
+    name = "BLD_COL_SILEXIAN"
+    description = "BLD_COL_SILEXIAN_DESC"
+    buildcost = 50 * [[COLONY_UPKEEP_MULTIPLICATOR]]
+    buildtime = max(5.0, 1.0 +
+        (min value = ShortestPath object = Target.SystemID object = LocalCandidate.SystemID
+            condition = And [
+                Planet
+                OwnedBy empire = Source.Owner
+                Species name = "SP_SILEXIAN"
+                Population low = [[MIN_RECOLONIZING_SIZE]]
+                Happiness low = 5
+                ResourceSupplyConnected empire = Source.Owner condition = Target
+            ]
+        ) / max(60, (max
+                      value = LocalCandidate.speed
+                      condition = And [
+                          Ship
+                          OwnedBy empire = Source.Owner
+                      ]
+               ))
+    )
+    location = And [
+        Planet
+        OwnedBy empire = Source.Owner
+        Population high = 0
+        Not Planet environment = Uninhabitable species = "SP_SILEXIAN"
+        Not Contains Building name = "BLD_COL_SILEXIAN"
+        ResourceSupplyConnected empire = Source.Owner condition = And [
+            Planet
+            OwnedBy empire = Source.Owner
+            Species name = "SP_SILEXIAN"
+            Population low = [[MIN_RECOLONIZING_SIZE]]
+            Happiness low = 5
+        ]
+    ]
+    EnqueueLocation = And [
+        Planet
+        OwnedBy empire = Source.Owner
+        Population high = 0
+        Not Planet environment = Uninhabitable species = "SP_SILEXIAN"
+        Not Contains Building name = "BLD_COL_SILEXIAN"
+        Not Enqueued type = Building name = "BLD_COL_SILEXIAN"
+        ResourceSupplyConnected empire = Source.Owner condition = And [
+            Planet
+            OwnedBy empire = Source.Owner
+            Species name = "SP_SILEXIAN"
+            Population low = [[MIN_RECOLONIZING_SIZE]]
+            Happiness low = 5
+        ]
+    ]
+    effectsgroups = [
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = And [
+                Not OwnerHasTech name = "GRO_LIFECYCLE_MAN"
+                Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            ]
+            effects = [
+                SetSpecies name = "SP_SILEXIAN"
+                SetPopulation value = 1
+            ]
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = And [
+                OwnerHasTech name = "GRO_LIFECYCLE_MAN"
+                Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            ]
+            effects = [
+                SetSpecies name = "SP_SILEXIAN"
+                SetPopulation value = [[MIN_RECOLONIZING_SIZE]]
+            ]
+        EffectsGroup
+            scope = And [
+                Object id = Source.PlanetID
+                Planet
+            ]
+            activation = Turn low = Source.CreationTurn + 1 high = Source.CreationTurn + 1
+            effects = [
+                GenerateSitRepMessage
+                    message = "SITREP_NEW_COLONY_ESTABLISHED"
+                    icon = "icons/species/robotic-06.png"
+                    parameters = [
+                        tag = "species" data = "SP_SILEXIAN"
+                        tag = "planet" data = Target.ID
+                    ]
+                    empire = Source.Owner
+            ]
+        EffectsGroup
+            scope = Source
+            activation = Turn low = Source.CreationTurn + 2
+            effects = Destroy
+    ]
+    icon = "icons/species/robotic-06.png"
+
 BuildingType
     name = "BLD_COL_SSLITH"
     description = "BLD_COL_SSLITH_DESC"

diff --git a/default/preunlocked_items.txt b/default/preunlocked_items.txt
@@ -20,13 +20,16 @@ Item type = Building name = "BLD_COL_EGASSEM"
 Item type = Building name = "BLD_COL_ETTY"
 Item type = Building name = "BLD_COL_GEORGE"
 Item type = Building name = "BLD_COL_GYSACHE"
+Item type = Building name = "BLD_COL_FURTHEST"
 Item type = Building name = "BLD_COL_HHHOH"
 Item type = Building name = "BLD_COL_HUMAN"
 Item type = Building name = "BLD_COL_KOBUNTURA"
 Item type = Building name = "BLD_COL_LAENFA"
 Item type = Building name = "BLD_COL_MUURSH"
+Item type = Building name = "BLD_COL_PHINNERTE"
 Item type = Building name = "BLD_COL_SCYLIOR"
 Item type = Building name = "BLD_COL_SETINON"
+Item type = Building name = "BLD_COL_SILEXIAN"
 Item type = Building name = "BLD_COL_SSLITH"
 Item type = Building name = "BLD_COL_TAEGHIRUS"
 Item type = Building name = "BLD_COL_TRITH"

diff --git a/default/species.txt b/default/species.txt
@@ -570,7 +570,7 @@ Species
     gameplay_description = "SP_FURTHEST_GAMEPLAY_DESC"
     Native
 
-    //CanColonize
+    CanColonize
 
     tags = [ "ORGANIC" "AI_TAG_BAD_RESEARCH" "AI_TAG_BAD_POPULATION" "AI_TAG_BAD_SUPPLY" ]
 
@@ -996,7 +996,7 @@ Species
     gameplay_description = "SP_PHINNERT_GAMEPLAY_DESC"
     Native
 
-    //CanColonize
+    CanColonize
 
     tags = [ "ORGANIC" "AI_TAG_NO_RESEARCH" "AI_TAG_BAD_SUPPLY" ]
 
@@ -1148,7 +1148,7 @@ Species
     gameplay_description = "SP_SILEXIAN_GAMEPLAY_DESC"
     Native
 
-    //CanColonize
+    CanColonize
 
     Tags = [ "ROBOTIC" "AI_TAG_NO_INDUSTRY" "AI_TAG_BAD_RESEARCH" "AI_TAG_BAD_WEAPONS" "AI_TAG_GREAT_SUPPLY" ]