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

Improvement part2, for great general actions.

Browse Source
This commit is contained in:
Duan Tao
2018-12-29 10:52:01 +08:00
parent f70c725b85
commit b57a6f65fe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,14 +401,14 @@ class SpecificUnitAutomation{
fun automateGeneral(unit: MapUnit){
//try to follow nearby units. Do not garrison in city if possible
val militantToCompany = unit.civInfo.getCivUnits()
.firstOrNull { val tile = it.currentTile
it.type.isLandUnit() && it.getMaxMovement() <= 2.0f
&& (tile.civilianUnit == null || tile.civilianUnit == unit)
&& unit.canMoveTo(tile) && !tile.isCityCenter() && unit.movementAlgs().canReach(tile) }
val militantToCompany = unit.getDistanceToTiles().map { it.key }
.firstOrNull {val militant = it.militaryUnit;
militant != null && militant.civInfo == unit.civInfo
&& (it.civilianUnit == null || it.civilianUnit == unit)
&& militant.getMaxMovement() <= 2.0f && !it.isCityCenter()}
if(militantToCompany!=null) {
unit.movementAlgs().headTowards(militantToCompany.currentTile)
unit.movementAlgs().headTowards(militantToCompany)
return
}