3.4.6

android/assets/jsons/translationsByLanguage/Czech.properties

@@ -877,6 +877,8 @@ Defeated = Poražený(á)
 Tiles = Políčka
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -961,6 +963,8 @@ Clear terrain features = Smazat vlastnosti terénu
 Clear improvements = Smazat vylepšení
 Clear resource = Smazat zdroje
 Requires = Požadavky
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Dutch.properties

@@ -1419,6 +1419,8 @@ Defeated =
 Tiles = 
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -1579,6 +1581,8 @@ Clear improvements =
 Clear resource = 
  # Requires translation!
 Requires = 
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/English.properties

@@ -1574,6 +1574,8 @@ Defeated =
 Tiles = 
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -1734,6 +1736,8 @@ Clear improvements =
 Clear resource = 
  # Requires translation!
 Requires = 
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/French.properties

@@ -691,7 +691,6 @@ We have discovered [naturalWonder]! = Nous avons découverts [naturalWonder] !
 We have received [goldAmount] Gold for discovering [naturalWonder] = Nous avons reçu [goldAmount] Or pour la découverte de [naturalWonder]
 Your relationship with [cityStateName] is about to degrade = Notre relation avec [cityStateName] va se dégrader
 Your relationship with [cityStateName] degraded = Notre relation avec [cityStateName] est dégradée
- # Requires translation!
 A new barbarian encampment has spawned! = Un nouveau campement barbare est apparu !
 
 # World Screen UI
@@ -866,6 +865,8 @@ Action = Action
 Defeated = Vaincu
 Tiles = Cases
 Natural Wonders = Merveilles de la Nature
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -923,7 +924,6 @@ May contain [listOfResources] = Peut contenir [listOfResources]
 Upgrades to [upgradedUnit] = Améliorer en [upgradedUnit]
 Obsolete with [obsoleteTech] = Obsolète avec [obsoleteTech]
 Occurs on [listOfTerrains] = Doit possèder [listOfTerrains]
- # Requires translation!
 Placed on [terrainType] = Placé en [terrainType]
 Can be found on  = Peut être trouver sur 
 Improved by [improvement] = Amélioré par [improvement]
@@ -950,6 +950,8 @@ Clear terrain features = Effacer les caractéristiques des terrains
 Clear improvements = Effacer les améliorations
 Clear resource = Effacer les ressources
 Requires = Requiert
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 
@@ -1310,9 +1312,7 @@ Fountain of Youth = Fontaine de Jouvence
 
 # Natural Wonders Uniques
 
- # Requires translation!
 Grants 500 Gold to the first civilization to discover it = Donne 500 Or a la première civilisation qui le découvre
- # Requires translation!
 Grants Rejuvenation (all healing effects doubled) to adjacent military land units for the rest of the game = Occtroie le Rajeunissement (tous les effets de soins sont doublés) a toutes les unités militaires adjacentes pour le reste de la partie
 
 # Resources
@@ -1448,9 +1448,7 @@ Pikeman = Piquier
 Landsknecht = Lansquenet
 Knight = Chevalier
 Camel Archer = Archer méhariste
- # Requires translation!
 Conquistador = Conquistador
- # Requires translation!
 Defense bonus when embarked = Bonus de défense quand embarqué
 Naresuan's Elephant = Elephant de Naresuan
 Samurai = Samuraï
@@ -1458,13 +1456,11 @@ Combat very likely to create Great Generals = A de grande chance de faire appara
 Caravel = Caravelle
 Turtle Ship = Bateau Tortue
 +1 Visibility Range = +1 à la Portée de Vision
- # Requires translation!
 +2 Visibility Range = +2 à la Portée de Vision
 Cannon = Canon
 Musketman = Arquebusier
 Musketeer = Mousquetaire
 Janissary = Janissaire
- # Requires translation!
 Tercio = Tercio
 Heals [amountHealed] damage if it kills a unit = Soigne [amountHealed] dégâts si il tue une unité
 Minuteman = Minuteman

android/assets/jsons/translationsByLanguage/German.properties

@@ -880,6 +880,8 @@ Defeated = Besiegt
 Tiles = Felder
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -964,6 +966,8 @@ Clear terrain features = Lösche Geländemerkmale
 Clear improvements = Lösche Verbesserungen
 Clear resource = Lösche Ressource
 Requires = Benötigt
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Indonesian.properties

@@ -1271,6 +1271,8 @@ Defeated =
 Tiles = 
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -1431,6 +1433,8 @@ Clear improvements =
 Clear resource = 
  # Requires translation!
 Requires = 
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Italian.properties

@@ -865,6 +865,8 @@ Action = Azione
 Defeated = Sconfitto
 Tiles = Caselle
 Natural Wonders = Meraviglie Naturali
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -948,6 +950,8 @@ Clear terrain features = Elimina caratteristica del terreno
 Clear improvements = Elimina miglioramenti
 Clear resource = Elimina risorsa
 Requires = Richiede
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Korean.properties

@@ -901,6 +901,8 @@ Defeated = 패배
 Tiles = 타일
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -985,6 +987,8 @@ Clear terrain features = 지형 요소 지우기
 Clear improvements = 시설 지우기
 Clear resource = 자원 지우기
 Requires = 선행 조건
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Malay.properties

@@ -1463,6 +1463,8 @@ Defeated =
 Tiles = 
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -1623,6 +1625,8 @@ Clear improvements =
 Clear resource = 
  # Requires translation!
 Requires = 
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Polish.properties

@@ -865,6 +865,8 @@ Action = Akcja
 Defeated = Pokonany
 Tiles = Pola
 Natural Wonders = Cuda Naturalne
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -948,6 +950,8 @@ Clear terrain features = Wyczyść cechy terenu
 Clear improvements = Wyczyść ulepszenia
 Clear resource = Wyczyść zasoby
 Requires = Wymagane
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Portuguese.properties

@@ -935,6 +935,8 @@ Defeated = Derrotado
 Tiles = 
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -1060,6 +1062,8 @@ Clear improvements =
  # Requires translation!
 Clear resource = 
 Requires = Requer
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Romanian.properties

@@ -1251,6 +1251,8 @@ Defeated = Învins
 Tiles = 
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -1409,6 +1411,8 @@ Clear improvements =
  # Requires translation!
 Clear resource = 
 Requires = necesită
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Russian.properties

@@ -137,7 +137,6 @@ Connects trade routes over water = Создаёт водные торговые
 
 University = Университет
 +2 Science from each worked Jungle tile = Джунгли обеспечивают +2 науки
- # Requires translation!
 Wat = Ват 
 
 Oxford University = Оксфордский университет
@@ -866,6 +865,8 @@ Action = Действие
 Defeated = Побеждён
 Tiles = Клетки
 Natural Wonders = Чудеса природы
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -923,7 +924,6 @@ May contain [listOfResources] = Может содержать [listOfResources]
 Upgrades to [upgradedUnit] = Улучшается до [upgradedUnit]
 Obsolete with [obsoleteTech] = Устаревает после [obsoleteTech]
 Occurs on [listOfTerrains] = Появляется на [listOfTerrains]
- # Requires translation!
 Placed on [terrainType] = Расположен на [terrainType]
 Can be found on  = Может быть найден в 
 Improved by [improvement] = Улучшен [improvement]
@@ -950,6 +950,8 @@ Clear terrain features = Убрать особенности ландшафта
 Clear improvements = Удалить улучшения
 Clear resource = Удалить ресурсы
 Requires = Требует
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 
@@ -1310,9 +1312,7 @@ Fountain of Youth = Фонтан вечной молодости
 
 # Natural Wonders Uniques
 
- # Requires translation!
 Grants 500 Gold to the first civilization to discover it = Даёт 500 золота первой цивилизации которая открыла его.
- # Requires translation!
 Grants Rejuvenation (all healing effects doubled) to adjacent military land units for the rest of the game = Даёт Омоложение (все лечащие эффекты удвоены) всем соседним юнитам до конца игры 
 
 # Resources
@@ -1448,9 +1448,7 @@ Pikeman = Пикинер
 Landsknecht = Ландскнехт
 Knight = Рыцарь
 Camel Archer = Лучник на верблюде
- # Requires translation!
 Conquistador = Конкистадор
- # Requires translation!
 Defense bonus when embarked = Бонус к защите когда погружен на корабль
 Naresuan's Elephant = Слон Наресуана
 Samurai = Самурай
@@ -1458,13 +1456,11 @@ Combat very likely to create Great Generals = Большой шанс получ
 Caravel = Каравелла
 Turtle Ship = Кобуксон
 +1 Visibility Range = +1 Диапазон видимости
- # Requires translation!
 +2 Visibility Range = +2 Диапазона видимости
 Cannon = Пушка
 Musketman = Стрельцы
 Musketeer = Мушкетёр
 Janissary = Янычары
- # Requires translation!
 Tercio = Терция
 Heals [amountHealed] damage if it kills a unit = Восстаналивает [amountHealed] здоровья при уничтожении юнита
 Minuteman = Минитмэн

android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties

@@ -878,6 +878,8 @@ Defeated = 战败
 Tiles = 地块
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -962,6 +964,8 @@ Clear terrain features = 清除地貌
 Clear improvements = 清除设施
 Clear resource = 清除资源
 Requires = 需要
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Spanish.properties

@@ -865,6 +865,8 @@ Action =  Acción
 Defeated = Derrotado
 Tiles = Casillas
 Natural Wonders = Maravillas naturales
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -949,6 +951,8 @@ Clear terrain features = Limpiar características de terreno
 Clear improvements = Limpiar mejoras
 Clear resource = Limpiar recurso
 Requires = Requiere
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties

@@ -878,6 +878,8 @@ Defeated = 戰敗
 Tiles = 地區
  # Requires translation!
 Natural Wonders = 
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -962,6 +964,8 @@ Clear terrain features = 清除地貌
 Clear improvements = 清除設施
 Clear resource = 清除資源
 Requires = 需要
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 

android/assets/jsons/translationsByLanguage/Ukrainian.properties

@@ -11,11 +11,11 @@ Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to u
 Meet another civilization!\nExplore the map until you encounter another civilization! = Зустріньте іншу цивілізацію!\nДосліджуйте мапу до зустрічі з іншою цивілізацією!
 Open the options table!\nClick the menu button (top left) > click 'Options' = Відкрийте вкладку з налаштуваннями\nНатисніть кнопку меню (згори ліворуч) >\n Натисність «Налаштування»
 Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Click 'Create improvement' (above the unit table, bottom left)\n > Choose the farm > \n Leave the worker there until it's finished = Збудуйте поліпшення! \n Збудуйте Робітника > Перемістіться до клітинки рівнини чи пасовища > \n 
-Натисність «Створити поліпшення» (над віконцем довідки, знизу ліворуч) \ n> Оберіть ферму> \ n Залиште Робітника до закінчення роботи
 Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually = Створіть торговий шлях!\nБудуйте дороги між вашою столицею та іншим містом\nАбо автоматизуйте робітника і дозвольте йому зробити це самому
 Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = Захопіть місто!\n Зменшіть здоров’я міста до низького рівня> \nУвійдіть до міста з ближньобійником
 Move an air unit!\nSelect an air unit > select another city withing range > \nMove the unit to the other city = Перемістіть повітряний підрозділ!\nОберіть його !\n оберіть інше місто в радіусі дії > \nПеремість підрозділ в інше місто
 See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Подивіться статистику\nУвійдіть до екрану огляну (верхній правий кут) >\nНатисніть кнопку «Статистика»
+
 Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send me (yairm210@hotmail.com) an email with the game information (menu -> save game -> copy game info -> paste into email) and I'll try to fix it as fast as I can! = Жах! Схоже щось пішло КАТАСТРОФІЧНО неправильно! Цього АБСОЛЮТНО НЕ ПОВИННО БУЛО СТАТИСЯ! Будь ласка, надішліть мені (yairm210@hotmail.com) електронний лист з ігровою інформацією (меню -> зберегти гру -> копіювати інформацію про гру -> вставити до email) і я спробую виправити якнайшвидше!
 Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not supposed to happen! Please send us an report and we'll try to fix it as fast as we can! = Жах! Схоже щось пішло КАТАСТРОФІЧНО неправильно! Цього АБСОЛЮТНО НЕ ПОВИННО БУЛО СТАТИСЯ! Будь ласка, надішліть нам звіт про помилку і ми виправимо якнайшидше.
 
@@ -837,7 +837,6 @@ Your citizens have been happy with your rule for so long that the empire enters
 You have entered the [newEra]! = Ви увійшли до епохи [newEra]!
  # Requires translation!
 [civName] has entered the [eraName]! = 
-[policyBranch] policy branch unlocked! = Політичну гілку [policyBranch] розблоковано!
 [policyBranch] policy branch unlocked! = Галузь політики [policyBranch] розблоковано
 Overview = Огляд
 Total = Усього
@@ -866,6 +865,8 @@ Action = Дія
 Defeated = Переможено
 Tiles = Клітини
 Natural Wonders = Природні дива
+ # Requires translation!
+Treasury deficit = 
 
 #Victory
 
@@ -949,6 +950,8 @@ Clear terrain features = Очистити особливості місцево
 Clear improvements = Видалити вдосконалення
 Clear resource = Видалити ресурс
 Requires = Потребує
+ # Requires translation!
+Menu = 
 
 # Civilopedia Tutorials names
 
@@ -1004,7 +1007,7 @@ Citizenship = Права і обов'язки громадянина
 Tile improvement speed +25%, receive a free worker near the capital = Покращення клітинок відбувається на +25% швидше, новий працівник коло столиці
 Republic = Республіка
  # Requires translation!
-+1 construction in every city, +5% construction when constructing buildings =
++1 construction in every city, +5% construction when constructing buildings = 
 Representation = Представництво
 Each city founded increases culture cost of policies 33% less than normal. Starts a golden age. = Кожне засноване місто зменшує ціну інституту на 33%. Розпочинає золотий вік.
 Meritocracy = Меритократія

android/assets/jsons/translationsByLanguage/completionPercentages.properties

@@ -5,9 +5,9 @@ Russian = 99
 Romanian = 48
 Korean = 94
 Simplified_Chinese = 96
-German = 96
+German = 95
 English = 0
-Ukrainian = 98
+Ukrainian = 99
 French = 99
 Portuguese = 83
 Indonesian = 21

android/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 355
-        versionName "3.4.5-patch1"
+        versionCode 356
+        versionName "3.4.6"
 
         archivesBaseName = "Unciv"
     }

core/src/com/unciv/logic/automation/UnitAutomation.kt

@@ -123,7 +123,7 @@ class UnitAutomation{
     fun tryHealUnit(unit: MapUnit, unitDistanceToTiles: PathsToTilesWithinTurn):Boolean {
         val tilesInDistance = unitDistanceToTiles.keys.filter { unit.movement.canMoveTo(it) }
         if(unitDistanceToTiles.isEmpty()) return true // can't move, so...
-        val unitTile = unit.getTile()
+        val currentUnitTile = unit.getTile()
 
         if (tryPillageImprovement(unit, unitDistanceToTiles)) return true
 
@@ -139,12 +139,12 @@ class UnitAutomation{
         }
 
         val bestTilesForHealing = tilesByHealingRate.maxBy { it.key }!!.value
-        // within the tiles with best healing rate, we'll prefer one which has defensive bonuses
+        // within the tiles with best healing rate (say 15), we'll prefer one which has the highest defensive bonuses
         val bestTileForHealing = bestTilesForHealing.maxBy { it.getDefensiveBonus() }!!
         val bestTileForHealingRank = unit.rankTileForHealing(bestTileForHealing)
-        if(bestTileForHealingRank == 0) return false // can't actually heal here...
 
-        if(unitTile!=bestTileForHealing && bestTileForHealingRank > unit.rankTileForHealing(unitTile))
+        if(currentUnitTile!=bestTileForHealing
+                && bestTileForHealingRank > unit.rankTileForHealing(currentUnitTile))
             unit.movement.moveToTile(bestTileForHealing)
 
         if(unit.currentMovement>0 && unit.canFortify()) unit.fortify()