diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index 6b6df892c9..d7ab287a34 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -29,7 +29,7 @@ "name": "Stone Works", "happiness": 1, "production": 1, - "requiredNearbyImprovedResources": ["Marble","Stone"], + "requiredNearbyImprovedResources": ["Marble", "Stone"], "resourceBonusStats": {"production": 1}, "maintenance": 1, "hurryCostModifier": 25, diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index ae69a81196..bc9e8d0926 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -1067,7 +1067,7 @@ "interceptRange": 2, "cost": 375, "requiredTech": "Combustion", - "uniques": ["Can attack submarines","[40]% chance to intercept air attacks","May withdraw before melee"], // todo: add bonus vs submarines + "uniques": ["Can attack submarines", "[40]% chance to intercept air attacks", "May withdraw before melee"], // todo: add bonus vs submarines "hurryCostModifier": 20 }, { diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index c68752c7c1..e64df3c084 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -233,6 +233,7 @@ class Building : NamedStats(), IConstruction{ val rejectionReason = getRejectionReason(cityConstructions) return rejectionReason=="" || rejectionReason.startsWith("Requires") + || rejectionReason.startsWith("Consumes") || rejectionReason == "Wonder is being built elsewhere" } diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index 0ca799120c..004a5cfe7e 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -86,9 +86,7 @@ class BaseUnit : INamed, IConstruction { return unit } - override fun canBePurchased(): Boolean { - return true - } + override fun canBePurchased() = true override fun getProductionCost(civInfo: CivilizationInfo): Int { var productionCost = cost.toFloat()