AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hide build menu constructions requiring resources with unique (#3370)

Browse Source 
* "Not displayed as an available construction without []"
Hides constructions that are missing resources

* combined unique check

* removed duplicate code

* clarified if clause

* simplified check and obsoleted existing unique

* previous iteration did not work due to OR instead of AND

* if we don't check to see if this is actually a resource, we get a crash
This commit is contained in:
9kgsofrice 2020-12-02 17:13:15 +00:00 committed by GitHub
parent 2aac9ea314
commit 80688eb4a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import com.unciv.logic.city.CityConstructions
import com.unciv.logic.city.IConstruction import com.unciv.logic.city.IConstruction
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit import com.unciv.logic.map.MapUnit
import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.Unique import com.unciv.models.ruleset.Unique
import com.unciv.models.translations.Translations import com.unciv.models.translations.Translations
@ -122,9 +123,14 @@ 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" for (unique in uniqueObjects.filter { it.placeholderText == "Not displayed as an available construction without []"}) {
&& !construction.containsBuildingOrEquivalent(it.params[0]) }) val filter = unique.params[0]
return "Should not be displayed" return if (construction.containsBuildingOrEquivalent(filter)
|| (construction.cityInfo.civInfo.gameInfo.ruleSet.tileResources.containsKey(filter)
&& construction.cityInfo.civInfo.hasResource(filter)))
""
else "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 ""