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

Don't show already-built national wonders in build menu

Browse Source 
Should check whether wonder is already built *first*, before we check
whether prereqs are satisfied.
This commit is contained in:
Brian Gainor 2019-05-03 14:02:41 -04:00 committed by Yair Morgenstern
parent 6c7a0f9f4e
commit 7ab0267376
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/models/gamebasics/Building.kt
View File

@ -217,11 +217,11 @@ class Building : NamedStats(), IConstruction{
// National wonders // National wonders
if(requiredBuildingInAllCities!=null) { if(requiredBuildingInAllCities!=null) {
if (civInfo.cities.any { !it.cityConstructions.containsBuildingOrEquivalent(requiredBuildingInAllCities!!) })
return "Requires a $requiredBuildingInAllCities in all cities"
if (civInfo.cities.any {it.cityConstructions.isBuilt(name) }) if (civInfo.cities.any {it.cityConstructions.isBuilt(name) })
return "Wonder is already built" return "Wonder is already built"
if (civInfo.cities.any { !it.cityConstructions.containsBuildingOrEquivalent(requiredBuildingInAllCities!!) })
return "Requires a $requiredBuildingInAllCities in all cities"
if (civInfo.cities.any {it!=construction.cityInfo && it.cityConstructions.isBeingConstructed(name) }) if (civInfo.cities.any {it!=construction.cityInfo && it.cityConstructions.isBeingConstructed(name) })
return "Wonder is being built elsewhere" return "Wonder is being built elsewhere"
} }