mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-16 02:40:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

And for units as well of course

Browse Source
This commit is contained in:
Yair Morgenstern
2020-10-07 13:44:42 +03:00
parent e9835eab12
commit 1a4cc125c3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -233,7 +233,6 @@ class Building : NamedStats(), IConstruction {
|| rejectionReason.startsWith("Requires") || rejectionReason.startsWith("Requires")
|| rejectionReason.startsWith("Consumes") || rejectionReason.startsWith("Consumes")
|| rejectionReason == "Wonder is being built elsewhere" || rejectionReason == "Wonder is being built elsewhere"
|| rejectionReason == "Should not be displayed"
} }
fun getRejectionReason(construction: CityConstructions):String { fun getRejectionReason(construction: CityConstructions):String {

3
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -122,6 +122,9 @@ class BaseUnit : INamed, IConstruction {
fun getRejectionReason(construction: CityConstructions): String { fun getRejectionReason(construction: CityConstructions): String {
if (unitType.isWaterUnit() && !construction.cityInfo.getCenterTile().isCoastalTile()) if (unitType.isWaterUnit() && !construction.cityInfo.getCenterTile().isCoastalTile())
return "Can only build water units in coastal cities" return "Can only build water units in coastal cities"
if (uniqueObjects.any { it.placeholderText == "Not displayed as an available construction unless [] is built"
&& !construction.containsBuildingOrEquivalent(it.params[0]) })
return "Should not be displayed"
val civRejectionReason = getRejectionReason(construction.cityInfo.civInfo) val civRejectionReason = getRejectionReason(construction.cityInfo.civInfo)
if (civRejectionReason != "") return civRejectionReason if (civRejectionReason != "") return civRejectionReason
return "" return ""