AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

AI units now fortify when healing and prefer tiles with defensive bonuses while healing

Browse Source
This commit is contained in:
Yair Morgenstern 2018-08-13 09:25:29 +03:00
parent fee0b718ec
commit 27b4c2c2ab
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,21 +80,18 @@ class UnitAutomation{
} }
fun healUnit(unit:MapUnit) { fun healUnit(unit:MapUnit) {
val tilesInDistance = unit.getDistanceToTiles().keys val tilesInDistance = unit.getDistanceToTiles().keys.filter { unit.canMoveTo(it) }
val unitTile = unit.getTile() val unitTile = unit.getTile()
// Go to friendly tile if within distance - better healing! val tilesByHealingRate = tilesInDistance.groupBy { rankTileForHealing(it,unit) }
val friendlyTile = tilesInDistance.firstOrNull { it.getOwner()?.civName == unit.owner && unit.canMoveTo(it) } if(tilesByHealingRate.isEmpty()) return
if (unitTile.getOwner()?.civName != unit.owner && friendlyTile != null) { val bestTilesForHealing = tilesByHealingRate.maxBy { it.key }!!.value
unit.moveToTile(friendlyTile) // within the tiles with best healing rate, we'll prefer one which has defensive bonuses
return val bestTileForHealing = bestTilesForHealing.maxBy { it.getDefensiveBonus() }!!
} if(unitTile!=bestTileForHealing && rankTileForHealing(bestTileForHealing,unit)>rankTileForHealing(unitTile,unit))
unit.moveToTile(bestTileForHealing)
// Or at least get out of enemy territory yaknow if(unit.currentMovement>0 && !unit.hasUnique("No defensive terrain bonus") && !unit.isFortified() ){
val neutralTile = tilesInDistance.firstOrNull { it.getOwner() == null && unit.canMoveTo(it)} unit.action="Fortify 0"
if (unitTile.getOwner()?.civName != unit.owner && unitTile.getOwner() != null && neutralTile != null) {
unit.moveToTile(neutralTile)
return
} }
} }