diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 34ed87782d..b368bf3490 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -175,6 +175,7 @@ class UnitAutomation{ for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there val tilesInAttackRange = if (unit.hasUnique("Indirect Fire")) reachableTile.getTilesInDistance(rangeOfAttack) else reachableTile.getViewableTiles(rangeOfAttack, unit.type.isWaterUnit()) + attackableTiles += tilesInAttackRange.asSequence().filter { it in tilesWithEnemies } .map { AttackableTile(reachableTile,it) } } diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index ea2457c245..3b648a3794 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -1,6 +1,7 @@ package com.unciv.logic.battle import com.badlogic.gdx.graphics.Color +import com.unciv.Constants import com.unciv.logic.GameInfo import com.unciv.logic.automation.UnitAutomation import com.unciv.logic.city.CityInfo @@ -8,7 +9,6 @@ import com.unciv.logic.civilization.AlertType import com.unciv.logic.civilization.PopupAlert import com.unciv.logic.civilization.diplomacy.DiplomaticModifiers import com.unciv.logic.map.TileInfo -import com.unciv.Constants import com.unciv.models.gamebasics.unit.UnitType import java.util.* import kotlin.math.max @@ -81,8 +81,7 @@ class Battle(val gameInfo:GameInfo) { if(defender.isDefeated() && defender is CityCombatant - && attacker.isMelee() - && attacker.getUnitType().isLandUnit()){ + && attacker.isMelee()){ conquerCity(defender.city, attacker) }