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

Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732)

Browse Source
This commit is contained in:
SomeTroglodyte
2021-08-02 19:50:56 +02:00
committed by GitHub
parent 4a434b3689
commit a248a1178c
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,7 @@ class Building : NamedStats(), IConstruction, ICivilopediaText {
/** City can only be built if one of these resources is nearby - it must be improved! */
var requiredNearbyImprovedResources: List<String>? = null
@Deprecated("As of 3.15.19, replace with 'Cannot be built with []' unique")
private var cannotBeBuiltWith: String? = null
var cityStrength = 0
var cityHealth = 0
@ -501,8 +502,13 @@ class Building : NamedStats(), IConstruction, ICivilopediaText {
return "Requires a [${requiredBuilding}] in this city, which doesn't seem to exist in this ruleset!"
return "Requires a [${civInfo.getEquivalentBuilding(requiredBuilding!!)}] in this city"
}
if (cannotBeBuiltWith != null && construction.isBuilt(cannotBeBuiltWith!!))
return "Cannot be built with $cannotBeBuiltWith"
// cannotBeBuiltWith is Deprecated as of 3.15.19
val cannotBeBuiltWith = uniqueObjects
.firstOrNull { it.placeholderText == "Cannot be built with []" }
?.params?.get(0)
?: this.cannotBeBuiltWith
if (cannotBeBuiltWith != null && construction.isBuilt(cannotBeBuiltWith))
return "Cannot be built with [$cannotBeBuiltWith]"
for ((resource, amount) in getResourceRequirements())
if (civInfo.getCivResourcesByName()[resource]!! < amount) {