AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 19:08:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

AI battle automation vastly improved for taking over cities

Browse Source
This commit is contained in:
Yair Morgenstern 2023-01-28 19:53:14 +02:00
parent 33b2c11b6a
commit 544cc0b17d
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
View File

@ -183,6 +183,9 @@ object UnitAutomation {
if (tryTakeBackCapturedCity(unit)) return if (tryTakeBackCapturedCity(unit)) return
// Focus all units without a specific target on the enemy city closest to one of our cities
if (tryHeadTowardsEnemyCity(unit)) return
if (tryGarrisoningUnit(unit)) return if (tryGarrisoningUnit(unit)) return
if (unit.health < 80 && tryHealUnit(unit)) return if (unit.health < 80 && tryHealUnit(unit)) return
@ -190,13 +193,10 @@ object UnitAutomation {
// move towards the closest reasonably attackable enemy unit within 3 turns of movement (and 5 tiles range) // move towards the closest reasonably attackable enemy unit within 3 turns of movement (and 5 tiles range)
if (tryAdvanceTowardsCloseEnemy(unit)) return if (tryAdvanceTowardsCloseEnemy(unit)) return
if (unit.health < 100 && tryHealUnit(unit)) return
// Focus all units without a specific target on the enemy city closest to one of our cities
if (tryHeadTowardsEnemyCity(unit)) return
if (tryHeadTowardsEncampment(unit)) return if (tryHeadTowardsEncampment(unit)) return
if (unit.health < 100 && tryHealUnit(unit)) return
// else, try to go to unreached tiles // else, try to go to unreached tiles
if (tryExplore(unit)) return if (tryExplore(unit)) return
@ -429,7 +429,8 @@ object UnitAutomation {
val tile = it.currentTile val tile = it.currentTile
it.isCivilian() && it.isCivilian() &&
(it.hasUnique(UniqueType.FoundCity) || unit.isGreatPerson()) (it.hasUnique(UniqueType.FoundCity) || unit.isGreatPerson())
&& tile.militaryUnit == null && unit.movement.canMoveTo(tile) && unit.movement.canReach(tile) && tile.militaryUnit == null && unit.movement.canMoveTo(tile)
&& unit.movement.getDistanceToTiles().containsKey(tile)
} ?: return false } ?: return false
unit.movement.headTowards(settlerOrGreatPersonToAccompany.currentTile) unit.movement.headTowards(settlerOrGreatPersonToAccompany.currentTile)
return true return true
@ -513,13 +514,21 @@ object UnitAutomation {
return false return false
} }
val numberOfUnitsAroundCity = closestReachableEnemyCity.getTilesInDistance(4) val ourUnitsAroundEnemyCity = closestReachableEnemyCity.getTilesInDistance(6)
.count { it.militaryUnit != null && it.militaryUnit!!.civInfo == unit.civInfo } .flatMap { it.getUnits() }
.filter { it.isMilitary() && it.civInfo == unit.civInfo }
if (numberOfUnitsAroundCity < 3) { val city = closestReachableEnemyCity.getCity()!!
val cityCombatant = CityCombatant(city)
val expectedDamagePerTurn = ourUnitsAroundEnemyCity
.map { BattleDamage.calculateDamageToDefender(MapUnitCombatant(it), cityCombatant) }
.sum() - 20 // City heals 20 per turn
if (expectedDamagePerTurn < 1 || city.health / expectedDamagePerTurn > 5){
// We won't be able to take this even with 5 turns of continuous damage!
// don't head straight to the city, try to head to landing grounds - // don't head straight to the city, try to head to landing grounds -
// this is against tha AI's brilliant plan of having everyone embarked and attacking via sea when unnecessary. // this is against tha AI's brilliant plan of having everyone embarked and attacking via sea when unnecessary.
val tileToHeadTo = closestReachableEnemyCity.getTilesInDistanceRange(3..4) val tileToHeadTo = closestReachableEnemyCity.getTilesInDistanceRange(3..5)
.filter { it.isLand && unit.getDamageFromTerrain(it) <= 0 } // Don't head for hurty terrain .filter { it.isLand && unit.getDamageFromTerrain(it) <= 0 } // Don't head for hurty terrain
.sortedBy { it.aerialDistanceTo(unit.currentTile) } .sortedBy { it.aerialDistanceTo(unit.currentTile) }
.firstOrNull { (unit.movement.canMoveTo(it) || it == unit.currentTile) && unit.movement.canReach(it) } .firstOrNull { (unit.movement.canMoveTo(it) || it == unit.currentTile) && unit.movement.canReach(it) }