mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 09:48:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

check whether the city has been a puppet in "Pick construction" action. (#7963)

Browse Source
This commit is contained in:
nacro711072
2022-10-27 15:05:33 +08:00
committed by GitHub
parent 731e9f5815
commit ef1c81bef7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -672,10 +672,16 @@ class WorldScreen(
viewingCiv.shouldGoToDueUnit() ->
NextTurnAction("Next unit", Color.LIGHT_GRAY) { switchToNextUnit() }
viewingCiv.cities.any { it.cityConstructions.currentConstructionFromQueue == "" } ->
viewingCiv.cities.any {
!it.isPuppet &&
it.cityConstructions.currentConstructionFromQueue == ""
} ->
NextTurnAction("Pick construction", Color.CORAL) {
val cityWithNoProductionSet = viewingCiv.cities
.firstOrNull { it.cityConstructions.currentConstructionFromQueue == "" }
.firstOrNull {
!it.isPuppet &&
it.cityConstructions.currentConstructionFromQueue == ""
}
if (cityWithNoProductionSet != null) game.pushScreen(
CityScreen(cityWithNoProductionSet)
)