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

Always select military unit first, don't select great people or settl… (#9569)

Browse Source 
* Always select military unit first, don't select great people or settlers first.

* Make diff less intrusive
This commit is contained in:
WhoIsJohannes 2023-06-12 06:24:34 +02:00 committed by GitHub
parent 4bf319b36a
commit 6c8754adbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt
View File

@ -12,14 +12,13 @@ import com.unciv.logic.battle.CityCombatant
import com.unciv.logic.city.City import com.unciv.logic.city.City
import com.unciv.logic.map.mapunit.MapUnit import com.unciv.logic.map.mapunit.MapUnit
import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.tile.Tile
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.components.UnitGroup import com.unciv.ui.components.UnitGroup
import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.addSeparator
import com.unciv.ui.components.extensions.center import com.unciv.ui.components.extensions.center
import com.unciv.ui.components.extensions.darken import com.unciv.ui.components.extensions.darken
import com.unciv.ui.components.input.onClick
import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toLabel
import com.unciv.ui.components.input.onClick
import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.ImageGetter
import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories
@ -320,14 +319,20 @@ class UnitTable(val worldScreen: WorldScreen) : Table() {
fun MapUnit.isEligible(): Boolean = (this.civ == worldScreen.viewingCiv fun MapUnit.isEligible(): Boolean = (this.civ == worldScreen.viewingCiv
|| worldScreen.viewingCiv.isSpectator()) && this !in selectedUnits || worldScreen.viewingCiv.isSpectator()) && this !in selectedUnits
fun MapUnit.isPrioritized(): Boolean = this.isGreatPerson() || this.hasUnique(UniqueType.FoundCity)
// Civ 5 Order of selection: // This is the Civ 5 Order of selection:
// 1. City // 1. City
// 2. GP + Settlers // 2. GP + Settlers
// 3. Military // 3. Military
// 4. Other civilian (Workers) // 4. Other civilian (Workers)
// 5. None (Deselect) // 5. None (Deselect)
// However we deviate from it because there was a poll on Discord that clearly showed that
// people would prefer the military unit to always be preferred over GP, so we use this:
// 1. City
// 2. Military
// 3. GP + Settlers
// 4. Other civilian (Workers)
// 5. None (Deselect)
val civUnit = selectedTile.civilianUnit val civUnit = selectedTile.civilianUnit
val milUnit = selectedTile.militaryUnit val milUnit = selectedTile.militaryUnit
@ -335,7 +340,6 @@ class UnitTable(val worldScreen: WorldScreen) : Table() {
val nextUnit: MapUnit? val nextUnit: MapUnit?
val priorityUnit = when { val priorityUnit = when {
civUnit != null && civUnit.isEligible() && civUnit.isPrioritized() -> civUnit
milUnit != null && milUnit.isEligible() -> milUnit milUnit != null && milUnit.isEligible() -> milUnit
civUnit != null && civUnit.isEligible() -> civUnit civUnit != null && civUnit.isEligible() -> civUnit
else -> null else -> null
@ -343,8 +347,8 @@ class UnitTable(val worldScreen: WorldScreen) : Table() {
nextUnit = when { nextUnit = when {
curUnit == null -> priorityUnit curUnit == null -> priorityUnit
curUnit == civUnit && milUnit != null && milUnit.isEligible() -> {if (civUnit.isPrioritized()) milUnit else null} curUnit == civUnit && milUnit != null && milUnit.isEligible() -> null
curUnit == milUnit && civUnit != null && civUnit.isEligible() -> {if (civUnit.isPrioritized()) null else civUnit} curUnit == milUnit && civUnit != null && civUnit.isEligible() -> civUnit
else -> priorityUnit else -> priorityUnit
} }