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

Fixed translation file

Browse Source
This commit is contained in:
Yair Morgenstern
2019-03-11 20:20:07 +02:00
parent cef4eafa0f
commit 02f1530c44
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Translations.json
View File

@ -8364,7 +8364,7 @@
Italian:"Attacco in massa III" Italian:"Attacco in massa III"
German:"Rudeltaktik III" German:"Rudeltaktik III"
} }
+/ */
// Civilopedia texts // Civilopedia texts
"Basics":{ "Basics":{

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

@ -132,25 +132,24 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
val attackButton = TextButton(attackText.tr(), skin).apply { color= Color.RED } val attackButton = TextButton(attackText.tr(), skin).apply { color= Color.RED }
var attackableEnemy : UnitAutomation.AttackableTile? = null var attackableEnemy : UnitAutomation.AttackableTile? = null
var canAttack : Boolean = attacker.canAttack()
if (canAttack) { if (attacker.canAttack()) {
if (attacker is MapUnitCombatant) { if (attacker is MapUnitCombatant) {
attacker.unit.getDistanceToTiles() attacker.unit.getDistanceToTiles()
attackableEnemy = UnitAutomation().getAttackableEnemies(attacker.unit, attacker.unit.getDistanceToTiles()) attackableEnemy = UnitAutomation()
.getAttackableEnemies(attacker.unit, attacker.unit.getDistanceToTiles())
.firstOrNull{ it.tileToAttack == defender.getTile()} .firstOrNull{ it.tileToAttack == defender.getTile()}
canAttack = attackableEnemy != null
} }
else if (attacker is CityCombatant) else if (attacker is CityCombatant)
{ {
canAttack = UnitAutomation().getBombardTargets(attacker.city).contains(defender.getTile()) val canBombard = UnitAutomation().getBombardTargets(attacker.city).contains(defender.getTile())
if (canAttack) { if (canBombard) {
attackableEnemy = UnitAutomation.AttackableTile(attacker.getTile(), defender.getTile()) attackableEnemy = UnitAutomation.AttackableTile(attacker.getTile(), defender.getTile())
} }
} }
} }
if(!canAttack) attackButton.disable() if(attackableEnemy == null) attackButton.disable()
else { else {
attackButton.onClick { attackButton.onClick {
battle.moveAndAttack(attacker,attackableEnemy!!) battle.moveAndAttack(attacker,attackableEnemy!!)