From b2a29f1be24265240cb8105ba16d5554ad943c1d Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 7 Oct 2023 22:33:00 +0300 Subject: [PATCH] 4.8.12 --- android/assets/jsons/translations/Spanish.properties | 5 ----- .../translations/completionPercentages.properties | 6 +++--- changelog.md | 8 ++------ .../com/unciv/logic/map/mapgenerator/RiverGenerator.kt | 8 ++++---- core/src/com/unciv/logic/map/mapunit/MapUnit.kt | 5 ++--- fastlane/metadata/android/en-US/changelogs/922.txt | 10 ++-------- 6 files changed, 13 insertions(+), 29 deletions(-) diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 4ed210b34f..629a5847f8 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -748,7 +748,6 @@ Reset = Reiniciar Show zoom buttons in world screen = Mostrar Botones para Zoom del Mapa Experimental Demographics scoreboard = Tabla de Puntaje Demográfica - # Requires translation! Size of Unitset art in Civilopedia = Tamaño de las Unidades en la Civilopedia ### Visual Hints subgroup @@ -2044,9 +2043,7 @@ Automatically built in all cities where it is buildable = Construído automátic Creates a [improvementName] improvement on a specific tile = Crea una mejora de [improvementName] en una casilla específica Founds a new city = Funda una nueva ciudad Can instantly construct a [improvementFilter] improvement = Puede construír una mejora de [improvementFilter] de inmediato - # Requires translation! Can Spread Religion = Puede difundir una Religión - # Requires translation! Can remove other religions from cities = Puede remover otras religiones de las ciudades May found a religion = Puede fundar una religión May enhance a religion = Puede realzar una religión @@ -2431,7 +2428,6 @@ Policy = Política FounderBelief = Creencia del fundador FollowerBelief = Creencia del seguidor Building = Edificio - # Requires translation! UnitAction = AccióndUnidad Unit = Unidad UnitType = Tipo de unidad @@ -6226,7 +6222,6 @@ Truffles = Trufas #################### Lines from UnitPromotions from Civ V - Gods & Kings #################### - # Requires translation! Devout = Devoto diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 36ea30a896..5e8155cbef 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -3,7 +3,7 @@ Italian = 99 Russian = 100 Belarusian = 2 Afrikaans = 7 -German = 99 +German = 100 Swedish = 85 Turkish = 79 Ukrainian = 98 @@ -13,7 +13,7 @@ Portuguese = 62 Indonesian = 98 Catalan = 99 Finnish = 36 -Spanish = 99 +Spanish = 100 Malay = 22 Brazilian_Portuguese = 100 Traditional_Chinese = 97 @@ -29,5 +29,5 @@ English = 0 Vietnamese = 92 Czech = 82 Hungarian = 78 -Dutch = 99 +Dutch = 100 Greek = 14 diff --git a/changelog.md b/changelog.md index 03ecfb1d92..bc850e4d27 100644 --- a/changelog.md +++ b/changelog.md @@ -1,15 +1,11 @@ ## 4.8.12 -Separate unit automation from other actions - -chore: Separated 'declare war' logic from DiplomacyManager +Automated units can fortify/set up/other actions AI now uses free tech points - By tuvus By SomeTroglodyte: -- Align ruleset icons in text to font metrics -- Tweak FasterUIDevelopment to offer normal Scene2D debugging, and some linting -- Pure package reorg: Widgets +- Align ruleset icons in text to font metrics ## 4.8.11 diff --git a/core/src/com/unciv/logic/map/mapgenerator/RiverGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/RiverGenerator.kt index 153f657a66..f2e6a40502 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/RiverGenerator.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/RiverGenerator.kt @@ -119,15 +119,15 @@ class RiverGenerator( if (bottomRightOrLeft == BottomRightOrLeft.BottomLeft) { yield(RiverCoordinate(tileMap, position, BottomRightOrLeft.BottomRight)) // same tile, other side if (myTopLeft != null) - yield(RiverCoordinate(tileMap, myTopLeft!!.position, BottomRightOrLeft.BottomRight)) // tile to MY top-left, take its bottom right corner + yield(RiverCoordinate(tileMap, myTopLeft.position, BottomRightOrLeft.BottomRight)) // tile to MY top-left, take its bottom right corner if (myBottomLeft != null) - yield(RiverCoordinate(tileMap, myBottomLeft!!.position, BottomRightOrLeft.BottomRight)) // Tile to MY bottom-left, take its bottom right + yield(RiverCoordinate(tileMap, myBottomLeft.position, BottomRightOrLeft.BottomRight)) // Tile to MY bottom-left, take its bottom right } else { yield(RiverCoordinate(tileMap, position, BottomRightOrLeft.BottomLeft)) // same tile, other side if (myTopRight != null) - yield(RiverCoordinate(tileMap, myTopRight!!.position, BottomRightOrLeft.BottomLeft)) // tile to MY top-right, take its bottom left + yield(RiverCoordinate(tileMap, myTopRight.position, BottomRightOrLeft.BottomLeft)) // tile to MY top-right, take its bottom left if (myBottomRight != null) - yield(RiverCoordinate(tileMap, myBottomRight!!.position, BottomRightOrLeft.BottomLeft)) // tile to MY bottom-right, take its bottom left + yield(RiverCoordinate(tileMap, myBottomRight.position, BottomRightOrLeft.BottomLeft)) // tile to MY bottom-right, take its bottom left } } diff --git a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt index 369cad3363..a0edd4dc34 100644 --- a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt +++ b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt @@ -113,10 +113,9 @@ class MapUnit : IsPartOfGameInfoSerialization { var isTransported: Boolean = false var turnsFortified = 0 - // Old, to be deprecated - @Deprecated("As of 4.5.3") + @Deprecated("As of 4.8.9") var abilityUsesLeft: HashMap = hashMapOf() - @Deprecated("As of 4.5.3") + @Deprecated("As of 4.8.9") var maxAbilityUses: HashMap = hashMapOf() // New - track only *how many have been used*, derive max from uniques, left = max - used diff --git a/fastlane/metadata/android/en-US/changelogs/922.txt b/fastlane/metadata/android/en-US/changelogs/922.txt index ecffb69d06..ca6eec3333 100644 --- a/fastlane/metadata/android/en-US/changelogs/922.txt +++ b/fastlane/metadata/android/en-US/changelogs/922.txt @@ -1,12 +1,6 @@ - - -Separate unit automation from other actions - -chore: Separated 'declare war' logic from DiplomacyManager +Automated units can fortify/set up/other actions AI now uses free tech points - By tuvus By SomeTroglodyte: -- Align ruleset icons in text to font metrics -- Tweak FasterUIDevelopment to offer normal Scene2D debugging, and some linting -- Pure package reorg: Widgets \ No newline at end of file +- Align ruleset icons in text to font metrics \ No newline at end of file