mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 17:28:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix City construction context menu changing Puppets (#10180)

Browse Source
This commit is contained in:
SomeTroglodyte
2023-09-26 12:24:43 +02:00
committed by GitHub
parent 46dd1cfc19
commit 1ec83c62bd
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/ui/popups/CityScreenConstructionMenu.kt
View File

@ -37,13 +37,18 @@ class CityScreenConstructionMenu(
cityConstructions.constructionQueue
.count { it !in PerpetualConstruction.perpetualConstructionsMap }
private val myIndex = cityConstructions.constructionQueue.indexOf(constructionName)
/** Cities (including this one) where changing the construction queue makes sense
* (excludes isBeingRazed even though technically that would be allowed) */
// Can't use CityScreen.canChangeState for other cities
private fun candidateCities() = city.civ.cities.asSequence()
.filterNot { it.isPuppet || it.isInResistance() || it.isBeingRazed }
/** Check whether an "All cities" menu makes sense: `true` if there's more than one city, it's not a Wonder, and any city's queue matches [predicate]. */
private fun allCitiesEntryValid(predicate: (CityConstructions) -> Boolean) =
city.civ.cities.size > 1 &&
city.civ.cities.size > 1 && // Yes any 2 cities, not candidateCities.drop(1).any()
(construction as? Building)?.isAnyWonder() != true &&
city.civ.cities.map { it.cityConstructions }.any(predicate)
candidateCities().map { it.cityConstructions }.any(predicate)
private fun forAllCities(action: (CityConstructions) -> Unit) =
city.civ.cities.map { it.cityConstructions }.forEach(action)
candidateCities().map { it.cityConstructions }.forEach(action)
private val settings = GUI.getSettings()
private val disabledAutoAssignConstructions = settings.disabledAutoAssignConstructions