mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-29 06:09:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #512 from ninjatao/issue/498

Browse Source 
Make units pillage improvement to heal, especially barbarians.
This commit is contained in:
Yair Morgenstern
2019-03-06 15:17:17 +02:00
committed by GitHub
parent b059ee36db d91a23b723
commit b2a29714bd
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,11 @@ class UnitAutomation{
// if there is an attackable unit in the vicinity, attack!
if (tryAttackNearbyEnemy(unit,unitDistanceToTiles)) return
// Barbarians try to pillage improvements if no targets reachable
if (unit.civInfo.isBarbarianCivilization()) {
if (pillageImprovement(unit, unitDistanceToTiles)) return
}
if (tryGarrisoningUnit(unit)) return
if (unit.health < 80) {
@ -101,6 +106,8 @@ class UnitAutomation{
val tilesInDistance = unitDistanceToTiles.keys.filter { unit.canMoveTo(it) }
val unitTile = unit.getTile()
if (pillageImprovement(unit, unitDistanceToTiles)) return
val tilesByHealingRate = tilesInDistance.groupBy { rankTileForHealing(it,unit) }
if(tilesByHealingRate.isEmpty()) return
val bestTilesForHealing = tilesByHealingRate.maxBy { it.key }!!.value
@ -113,6 +120,20 @@ class UnitAutomation{
}
}
fun pillageImprovement(unit: MapUnit, unitDistanceToTiles: HashMap<TileInfo, Float>) : Boolean {
val tilesInDistance = unitDistanceToTiles.filter {it.value < unit.currentMovement}.keys
.filter { unit.canMoveTo(it) && it.improvement != null }
if (tilesInDistance.isEmpty()) return false
val tileToPillage = tilesInDistance.maxBy { it.getDefensiveBonus() }!!
if (unit.getTile()!=tileToPillage)
unit.moveToTile(tileToPillage)
UnitActions().getUnitActions(unit,UnCivGame.Current.worldScreen)
.first { it.name=="Pillage" }.action()
return true
}
fun containsAttackableEnemy(tile: TileInfo, combatant: ICombatant): Boolean {
if(combatant is MapUnitCombatant){
if (combatant.unit.isEmbarked()) {