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

Allow battle calculations when not your turn (#10737)

Browse Source 
Allow BattleTable display when it is not the viewing players turn.
This will allow for more planning while waiting for other players.
This commit is contained in:
soggerr
2023-12-15 02:12:45 -07:00
committed by GitHub
parent ad820b6a72
commit bc1a428eeb
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/src/com/unciv/ui/screens/worldscreen/bottombar/BattleTable.kt
View File

@ -58,8 +58,6 @@ class BattleTable(val worldScreen: WorldScreen) : Table() {
}
fun update() {
if (!worldScreen.canChangeState) return hide()
val attacker = tryGetAttacker() ?: return hide()
if (attacker is MapUnitCombatant && attacker.unit.baseUnit.isNuclearWeapon()) {
@ -239,37 +237,46 @@ class BattleTable(val worldScreen: WorldScreen) : Table() {
}
row().pad(5f)
val attackText: String = when (attacker) {
is CityCombatant -> "Bombard"
else -> "Attack"
}
val attackButton = attackText.toTextButton().apply { color= Color.RED }
var attackableTile: AttackableTile? = null
if (worldScreen.canChangeState) {
val attackText: String = when (attacker) {
is CityCombatant -> "Bombard"
else -> "Attack"
}
val attackButton = attackText.toTextButton().apply { color = Color.RED }
if (attacker.canAttack()) {
if (attacker is MapUnitCombatant) {
attackableTile = TargetHelper
.getAttackableEnemies(attacker.unit, attacker.unit.movement.getDistanceToTiles())
.firstOrNull{ it.tileToAttack == defender.getTile()}
} else if (attacker is CityCombatant) {
val canBombard = TargetHelper.getBombardableTiles(attacker.city).contains(defender.getTile())
if (canBombard) {
attackableTile = AttackableTile(attacker.getTile(), defender.getTile(), 0f, defender)
var attackableTile: AttackableTile? = null
if (attacker.canAttack()) {
if (attacker is MapUnitCombatant) {
attackableTile = TargetHelper
.getAttackableEnemies(
attacker.unit,
attacker.unit.movement.getDistanceToTiles()
)
.firstOrNull { it.tileToAttack == defender.getTile() }
} else if (attacker is CityCombatant) {
val canBombard =
TargetHelper.getBombardableTiles(attacker.city).contains(defender.getTile())
if (canBombard) {
attackableTile =
AttackableTile(attacker.getTile(), defender.getTile(), 0f, defender)
}
}
}
}
if (!worldScreen.isPlayersTurn || attackableTile == null) {
attackButton.disable()
attackButton.label.color = Color.GRAY
} else {
attackButton.onClick(UncivSound.Silent) { // onAttackButtonClicked will do the sound
onAttackButtonClicked(attacker, defender, attackableTile)
if (!worldScreen.isPlayersTurn || attackableTile == null) {
attackButton.disable()
attackButton.label.color = Color.GRAY
} else {
attackButton.onClick(UncivSound.Silent) { // onAttackButtonClicked will do the sound
onAttackButtonClicked(attacker, defender, attackableTile)
}
}
add(attackButton).colspan(2)
}
add(attackButton).colspan(2)
pack()