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

Merge branch 'master' of https://github.com/yairm210/Unciv

Browse Source
This commit is contained in:
Yair Morgenstern 2020-09-01 22:58:59 +03:00
commit 6d190d1097
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,9 +396,15 @@ class CityConstructions {
if (isQueueFull()) return
if (currentConstructionFromQueue == "" || currentConstructionFromQueue == "Nothing") {
currentConstructionFromQueue = constructionName
currentConstructionIsUserSet = true
} else if (getConstruction(constructionQueue.last()) is PerpetualConstruction) {
if (getConstruction(constructionName) is PerpetualConstruction) { // perpetual constructions will replace each other
constructionQueue.removeAt(constructionQueue.size - 1)
constructionQueue.add(constructionName)
} else
constructionQueue.add(constructionQueue.size - 1, constructionName) // insert new construction before perpetual one
} else
constructionQueue.add(constructionName)
currentConstructionIsUserSet = true
}
/** If this was done automatically, we should automatically try to choose a new construction and treat it as such */

2
core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
View File

@ -115,7 +115,7 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS
}).open()
}
if ((cityScreen.city.hasSoldBuildingThisTurn && !cityScreen.city.civInfo.gameInfo.gameParameters.godMode) || cityScreen.city.isPuppet
|| !UncivGame.Current.worldScreen.isPlayersTurn)
|| !UncivGame.Current.worldScreen.isPlayersTurn || !cityScreen.canChangeState)
sellBuildingButton.disable()
}
wonderDetailsTable.addSeparator()

2
core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
View File

@ -47,7 +47,7 @@ class CityScreenCityPickerTable(val cityScreen: CityScreen) : Table(){
}
val currentCityLabel = city.name.toLabel(fontSize = 30, fontColor = civInfo.nation.getInnerColor())
currentCityLabel.onClick {
if (cityScreen.canChangeState) currentCityLabel.onClick {
val editCityNamePopup = Popup(cityScreen)
val textArea = TextField(city.name, CameraStageBaseScreen.skin)
textArea.alignment = Align.center