From 7ab02673761566f8209772faa65ab92bd2828de2 Mon Sep 17 00:00:00 2001 From: Brian Gainor Date: Fri, 3 May 2019 14:02:41 -0400 Subject: [PATCH] Don't show already-built national wonders in build menu Should check whether wonder is already built *first*, before we check whether prereqs are satisfied. --- core/src/com/unciv/models/gamebasics/Building.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/models/gamebasics/Building.kt b/core/src/com/unciv/models/gamebasics/Building.kt index 31f4cad6ad..68493d6133 100644 --- a/core/src/com/unciv/models/gamebasics/Building.kt +++ b/core/src/com/unciv/models/gamebasics/Building.kt @@ -217,11 +217,11 @@ class Building : NamedStats(), IConstruction{ // National wonders 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) }) 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) }) return "Wonder is being built elsewhere" }