From edb5ff92eda80554be053ded2a77acebc07b255e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 2 Nov 2019 20:10:01 +0200 Subject: [PATCH] Fixed Indirect Fire promotion --- android/assets/jsons/Nations/Nations.json | 4 ++-- core/src/com/unciv/logic/automation/UnitAutomation.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/assets/jsons/Nations/Nations.json b/android/assets/jsons/Nations/Nations.json index f9505503c7..3a183a4795 100644 --- a/android/assets/jsons/Nations/Nations.json +++ b/android/assets/jsons/Nations/Nations.json @@ -496,8 +496,8 @@ afterPeace:"Congratulations on your victory! I hope that peace between us will last forever!" tradeRequest:"Let us do business! Would you be interested?" - outerColor:[18,84,30], - innerColor:[245,248,185], + outerColor:[245,248,185], + innerColor:[18,84,30], uniqueName:"Barbary Corsairs" unique:"Pay only one third the usual cost for naval unit maintenance. Melee naval units have a 1/3 chance to capture defeated naval units.", cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya", diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 226b2c3107..0c61a56d6b 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -221,7 +221,8 @@ class UnitAutomation{ for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there val tilesInAttackRange = - if (unit.hasUnique("Indirect Fire") || unit.type.isAirUnit()) reachableTile.getTilesInDistance(rangeOfAttack) + if (unit.hasUnique("Ranged attacks may be performed over obstacles") || unit.type.isAirUnit()) + reachableTile.getTilesInDistance(rangeOfAttack) else reachableTile.getViewableTiles(rangeOfAttack, unit.type.isWaterUnit()) attackableTiles += tilesInAttackRange.asSequence().filter { it in tilesWithEnemies }