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

Resolved #2647 - Automated workers run away from enemy military units

Browse Source
This commit is contained in:
Yair Morgenstern
2020-05-22 11:08:39 +03:00
parent 890a64c533
commit 2f43213616
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/com/unciv/logic/automation/WorkerAutomation.kt
View File

@ -11,13 +11,14 @@ import com.unciv.models.ruleset.tile.TileImprovement
class WorkerAutomation(val unit: MapUnit) { class WorkerAutomation(val unit: MapUnit) {
fun containsEnemyMilitaryUnit(tileInfo: TileInfo) = tileInfo.militaryUnit != null
&& tileInfo.militaryUnit!!.civInfo.isAtWarWith(unit.civInfo)
fun automateWorkerAction() { fun automateWorkerAction() {
val enemyUnitsInWalkingDistance = unit.movement.getDistanceToTiles().keys val enemyUnitsInWalkingDistance = unit.movement.getDistanceToTiles().keys
.filter { .filter(this::containsEnemyMilitaryUnit)
it.militaryUnit != null && it.militaryUnit!!.civInfo.isAtWarWith(unit.civInfo)
}
if (enemyUnitsInWalkingDistance.isNotEmpty()) return // Don't you dare move. if (enemyUnitsInWalkingDistance.isNotEmpty()) return runAway()
val currentTile = unit.getTile() val currentTile = unit.getTile()
val tileToWork = findTileToWork() val tileToWork = findTileToWork()
@ -61,6 +62,25 @@ class WorkerAutomation(val unit: MapUnit) {
} }
fun countDistanceToClosestEnemy(tile: TileInfo): Int {
for(i in 1..3)
if(tile.getTilesAtDistance(i).any(this::containsEnemyMilitaryUnit))
return i
return 4
}
private fun runAway() {
val reachableTiles = unit.movement.getDistanceToTiles()
val enterableCity = reachableTiles.keys.firstOrNull { it.isCityCenter() && unit.movement.canMoveTo(it) }
if(enterableCity!=null) {
unit.movement.moveToTile(enterableCity)
return
}
val tileFurthestFromEnemy = reachableTiles.keys.filter { unit.movement.canMoveTo(it) }
.maxBy(this::countDistanceToClosestEnemy)!!
unit.movement.moveToTile(tileFurthestFromEnemy)
}
private fun tryConnectingCities(unit: MapUnit):Boolean { // returns whether we actually did anything private fun tryConnectingCities(unit: MapUnit):Boolean { // returns whether we actually did anything
//Player can choose not to auto-build roads & railroads. //Player can choose not to auto-build roads & railroads.