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

Resolved #3324 - Great Person units no longer require a military unit to accompany them if they're close enough to the destination

Browse Source
This commit is contained in:
Yair Morgenstern
2020-11-09 21:45:58 +02:00
parent 86c6624f8e
commit 9693bf0dd6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt
View File

@ -191,8 +191,6 @@ object SpecificUnitAutomation {
}
fun automateImprovementPlacer(unit: MapUnit) {
if (unit.getTile().militaryUnit == null) return // Don't move until you're accompanied by a military unit
val improvementName = unit.getMatchingUniques("Can construct []").first().params[0]
val improvement = unit.civInfo.gameInfo.ruleSet.tileImprovements[improvementName]!!
val relatedStat = improvement.toHashMap().maxBy { it.value }!!.key
@ -216,6 +214,7 @@ object SpecificUnitAutomation {
if (pathToCity.isEmpty()) continue
if (pathToCity.size > 2) {
if (unit.getTile().militaryUnit == null) return // Don't move until you're accompanied by a military unit
unit.movement.headTowards(city.getCenterTile())
return
}
@ -224,7 +223,7 @@ object SpecificUnitAutomation {
val chosenTile = applicableTiles.sortedByDescending { Automation.rankTile(it, unit.civInfo) }
.firstOrNull { unit.movement.canReach(it) }
if (chosenTile == null) continue // to another city
unit.movement.headTowards(chosenTile)
if (unit.currentTile == chosenTile)
UnitActions.getImprovementConstructionActions(unit, unit.currentTile).firstOrNull()?.action?.invoke()