AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #8637 - fixed air sweep crash

Browse Source 
Due to air sweep tiles being "attackable tiles" even when not containing combatants
This commit is contained in:
Yair Morgenstern 2023-02-09 19:09:58 +02:00
parent ca86e6fde7
commit bf0dd071e0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/automation/unit/AttackableTile.kt
View File

@ -5,4 +5,4 @@ import com.unciv.logic.map.tile.Tile
class AttackableTile(val tileToAttackFrom: Tile, val tileToAttack: Tile, class AttackableTile(val tileToAttackFrom: Tile, val tileToAttack: Tile,
val movementLeftAfterMovingToAttackTile:Float, val movementLeftAfterMovingToAttackTile:Float,
/** This is only for debug purposes */ val combatant:ICombatant) /** This is only for debug purposes */ val combatant:ICombatant?)

22
core/src/com/unciv/logic/automation/unit/BattleHelper.kt
View File

@ -80,17 +80,17 @@ object BattleHelper {
Battle.getMapCombatantOfTile(tile)!! Battle.getMapCombatantOfTile(tile)!!
) )
else if (tile in tilesWithoutEnemies) continue // avoid checking the same empty tile multiple times else if (tile in tilesWithoutEnemies) continue // avoid checking the same empty tile multiple times
else if (checkTile(unit, tile, tilesToCheck)) { else if (tileContainsAttackableEnemy(unit, tile, tilesToCheck)) {
tilesWithEnemies += tile tilesWithEnemies += tile
attackableTiles += AttackableTile( attackableTiles += AttackableTile(
reachableTile, tile, movementLeft, reachableTile, tile, movementLeft,
Battle.getMapCombatantOfTile(tile)!! Battle.getMapCombatantOfTile(tile)
) )
} else if (unit.isPreparingAirSweep()) { } else if (unit.isPreparingAirSweep()) {
tilesWithEnemies += tile tilesWithEnemies += tile
attackableTiles += AttackableTile( attackableTiles += AttackableTile(
reachableTile, tile, movementLeft, reachableTile, tile, movementLeft,
Battle.getMapCombatantOfTile(tile)!! Battle.getMapCombatantOfTile(tile)
) )
} else tilesWithoutEnemies += tile } else tilesWithoutEnemies += tile
} }
@ -98,10 +98,12 @@ object BattleHelper {
return attackableTiles return attackableTiles
} }
private fun checkTile(unit: MapUnit, tile: Tile, tilesToCheck: List<Tile>?): Boolean { private fun tileContainsAttackableEnemy(unit: MapUnit, tile: Tile, tilesToCheck: List<Tile>?): Boolean {
if (!containsAttackableEnemy(tile, MapUnitCombatant(unit))) return false if (!containsAttackableEnemy(tile, MapUnitCombatant(unit))) return false
if (tile !in (tilesToCheck ?: unit.civ.viewableTiles)) return false if (tile !in (tilesToCheck ?: unit.civ.viewableTiles)) return false
val mapCombatant = Battle.getMapCombatantOfTile(tile) val mapCombatant = Battle.getMapCombatantOfTile(tile)
return (!unit.baseUnit.isMelee() || mapCombatant !is MapUnitCombatant || !mapCombatant.unit.isCivilian() || unit.movement.canPassThrough(tile)) return (!unit.baseUnit.isMelee() || mapCombatant !is MapUnitCombatant || !mapCombatant.unit.isCivilian() || unit.movement.canPassThrough(tile))
} }
@ -179,10 +181,10 @@ object BattleHelper {
if (unit.baseUnit.isMelee() && capturableCity != null) if (unit.baseUnit.isMelee() && capturableCity != null)
return capturableCity // enter it quickly, top priority! return capturableCity // enter it quickly, top priority!
else if (nonCityTilesToAttack.isNotEmpty()) // second priority, units if (nonCityTilesToAttack.isNotEmpty()) // second priority, units
return chooseUnitToAttack(unit, nonCityTilesToAttack) return chooseUnitToAttack(unit, nonCityTilesToAttack)
else if (cityWithHealthLeft != null) return cityWithHealthLeft // third priority, city if (cityWithHealthLeft != null) return cityWithHealthLeft // third priority, city
return null return null
} }
@ -206,7 +208,7 @@ object BattleHelper {
if (canKill != null) return canKill if (canKill != null) return canKill
// otherwise pick the unit we can kill the fastest // otherwise pick the unit we can kill the fastest
return attacksToKill.minByOrNull { it.value }!!.key return attacksToKill.minBy { it.value }.key
} }
// only civilians in attacking range - GP most important, second settlers, then anything else // only civilians in attacking range - GP most important, second settlers, then anything else
@ -217,12 +219,12 @@ object BattleHelper {
// Melee - prioritize by distance, so we have most movement left // Melee - prioritize by distance, so we have most movement left
if (unit.baseUnit.isMelee()){ if (unit.baseUnit.isMelee()){
return unitsToConsider.maxByOrNull { it.movementLeftAfterMovingToAttackTile }!! return unitsToConsider.maxBy { it.movementLeftAfterMovingToAttackTile }
} }
// We're ranged, prioritize that we can kill // We're ranged, prioritize that we can kill
return unitsToConsider.minByOrNull { return unitsToConsider.minBy {
Battle.getMapCombatantOfTile(it.tileToAttack)!!.getHealth() Battle.getMapCombatantOfTile(it.tileToAttack)!!.getHealth()
}!! }
} }
} }