diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 37524692..7a0dfe7e 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -824,6 +824,8 @@ } "We have encountered [civName]!":{} + + "Cannot provide upkeep for [unitName] - unit has been disbanded!":{} // Save and load game diff --git a/core/src/com/unciv/logic/automation/Automation.kt b/core/src/com/unciv/logic/automation/Automation.kt index b8461533..a2a41a4d 100644 --- a/core/src/com/unciv/logic/automation/Automation.kt +++ b/core/src/com/unciv/logic/automation/Automation.kt @@ -81,6 +81,7 @@ class Automation { val enemyCivsByDistanceToOurs = civInfo.diplomacy.values.map { it.otherCiv() } .filterNot { it == civInfo || it.cities.isEmpty() || !civInfo.diplomacy[it.civName]!!.canDeclareWar() } .groupBy { getMinDistanceBetweenCities(civInfo,it) } + .toSortedMap() val ourCombatStrength = evaluteCombatStrength(civInfo) for (group in enemyCivsByDistanceToOurs){ if(group.key>7) break