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

no message

Browse Source
This commit is contained in:
Yair Morgenstern 2019-03-12 19:25:41 +02:00
parent 81b29a5b57
commit eba3aa3033
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -70,7 +70,7 @@ class CityConstructions {
fun isBuilt(buildingName: String): Boolean = builtBuildings.contains(buildingName) fun isBuilt(buildingName: String): Boolean = builtBuildings.contains(buildingName)
fun isBuilding(buildingName: String): Boolean = currentConstruction == buildingName fun isBeingConstructed(constructionName: String): Boolean = currentConstruction == constructionName
internal fun getConstruction(constructionName: String): IConstruction { internal fun getConstruction(constructionName: String): IConstruction {
if (GameBasics.Buildings.containsKey(constructionName)) if (GameBasics.Buildings.containsKey(constructionName))

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

@ -179,7 +179,7 @@ class Building : NamedStats(), IConstruction{
.any {it.cityConstructions.isBuilt(name)}) .any {it.cityConstructions.isBuilt(name)})
return false return false
if(civInfo.cities.any { it!=construction.cityInfo && it.cityConstructions.isBuilding(name) }) if(civInfo.cities.any { it!=construction.cityInfo && it.cityConstructions.isBeingConstructed(name) })
return false return false
} }
@ -187,7 +187,7 @@ class Building : NamedStats(), IConstruction{
if (requiredBuildingInAllCities != null && civInfo.cities.any { !it.cityConstructions.containsBuildingOrEquivalent(requiredBuildingInAllCities!!) }) if (requiredBuildingInAllCities != null && civInfo.cities.any { !it.cityConstructions.containsBuildingOrEquivalent(requiredBuildingInAllCities!!) })
return false return false
if(requiredBuildingInAllCities!=null && civInfo.cities.any { if(requiredBuildingInAllCities!=null && civInfo.cities.any {
it.cityConstructions.isBuilding(name) || it.cityConstructions.isBuilt(name) it.cityConstructions.isBeingConstructed(name) || it.cityConstructions.isBuilt(name)
}) })
return false return false

1
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View File

@ -34,6 +34,7 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
pickProductionButton.add(buttonText.toLabel().setFontColor(Color.WHITE)) pickProductionButton.add(buttonText.toLabel().setFontColor(Color.WHITE))
pickProductionButton.onClick { pickProductionButton.onClick {
cityScreen.city.cityConstructions.currentConstruction = construction cityScreen.city.cityConstructions.currentConstruction = construction
cityScreen.city.cityStats.update()
cityScreen.update() cityScreen.update()
} }
if(construction==cityScreen.city.cityConstructions.currentConstruction) if(construction==cityScreen.city.cityConstructions.currentConstruction)