Version rollout (#10848)

* Bump version and create initial changelog entry * Use randomize seed checkbox for partial generation (#10844) * use randomize seed checkbox for partial generation and debug the behavior of raiseMountainsAndHills in partial generation * small changes * Update Finnish.properties (#10843) * Update Finnish.properties * Update Finnish.properties * Update Finnish.properties * Update Korean.properties (#10842) * Update French.properties (#10838) --------- Co-authored-by: yairm210 <[email protected]> Co-authored-by: Rémi Dufour <[email protected]> Co-authored-by: Securetux <[email protected]> Co-authored-by: Yattong the Mackerel <[email protected]> Co-authored-by: Ouaz <[email protected]>
yairm210 · Dec 31, 2023 · 1cd72e4 · 1cd72e4
1 parent 15a1733
commit 1cd72e4
Show file tree

Hide file tree

Showing 9 changed files with 229 additions and 173 deletions.
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
@@ -1258,10 +1258,10 @@ Move to city = Aller à la ville
 Reset Citizens = Réinitialiser les citoyens
 Citizen Management = Gestion des citoyens
  # Requires translation!
-Citizen Focus = 
+Citizen Focus = Focus des citoyens
 Avoid Growth = Éviter Croissance
  # Requires translation!
-Manual = 
+Manual = Manuel
 Please enter a new name for your city = Veuillez saisir un nouveau nom pour votre ville
 Please select a tile for this building's [improvement] = Veuillez sélectionner une case pour la construction de [improvement]
 Move to the top of the queue = Déplacer en tête de file
@@ -2083,7 +2083,7 @@ Can speed up construction of a building = Peut accélérer la construction d'un
 Can speed up the construction of a wonder = Peut accélérer la construction d'une merveille
 Can hurry technology research = Peut accélérer une recherche technologique
  # Requires translation!
-Can generate a large amount of culture = 
+Can generate a large amount of culture = Peut générer une grande quantité de Culture
 Can undertake a trade mission with City-State, giving a large sum of gold and [amount] Influence = Peut entreprendre une mission commerciale avec une Cité-État, rapportant une grande quantité d'or et [amount] Influence
 Can transform to [unit] = Transformable en [unit]
 [relativeAmount]% Strength = [relativeAmount]% Puissance

diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
@@ -100,9 +100,9 @@ Requires all of the following: = 다음이 모두 필요함:
 Leads to [techName] = [techName] 해금
 Leads to: = 해금: 
  # Requires translation!
-Enables: = 
+Enables: = 활성화: 
  # Requires translation!
-Disables: = 
+Disables: = 비활성화: 
 
 Current construction = 현재 건설중
 Construction queue = 건설 대기중
@@ -122,9 +122,9 @@ Research Agreement = 연구 협정
 Declare war = 선전포고
 Declare war on [civName]? = [civName]에 선전포고할까요?
  # Requires translation!
-[civName] will also join them in the war = 
+[civName] will also join them in the war = [civName]이(가) 상대편으로 참전합니다.
  # Requires translation!
-An unknown civilization will also join them in the war = 
+An unknown civilization will also join them in the war = 알 수 없는 문명이 상대편으로 참전합니다.
 This will cancel your defensive pact with [civName] = [civName]와(과)의 방위 협정이 취소됩니다.
 Go to on map = 해당 위치 
 Let's begin! = 여정을 시작합니다!
@@ -540,11 +540,11 @@ Invalid overlay image = 유효한 이미지가 아님
 World wrap is incompatible with an overlay and was deactivated. = 원통형 지도가 겹친 이미지와 맞지 않아 비활성화되었습니다.
 An overlay image is incompatible with world wrap and was deactivated. = 겹치려는 이미지가 원통형 지도와 맞지 않아 비활성화되었습니다.
  # Requires translation!
-Choose a Wesnoth map file = 
+Choose a Wesnoth map file = 웨스노스 지도 파일을 선택하세요
  # Requires translation!
-That map is invalid! = 
+That map is invalid! = 유효하지 않은 지도입니다!
  # Requires translation!
-("[code]" does not conform to TerrainCodesWML) = 
+("[code]" does not conform to TerrainCodesWML) = ("[code]"가 TerrainCodesWML을 따르지 않음)
 
 ## Map/Tool names
 My new map = 새 지도
@@ -563,7 +563,7 @@ Create ancient ruins = 고대 유적 생성
 Floodfill = 채우기
 [nation] starting location = [nation] 시작 지점
  # Requires translation!
-Any Civ = 
+Any Civ = 임의의 문명
 Remove features = 추가지형 제거
 Remove improvement = 시설 제거
 Remove resource = 자원 제거
@@ -723,21 +723,21 @@ Display = 화면
 ### Screen subgroup
 
  # Requires translation!
-Screen = 
-Screen Mode = 창 모드
+Screen = 화면
+Screen Mode = 화면 모드
  # Requires translation!
-Windowed = 
-Fullscreen = 전체 화면
+Windowed = 창 모드
+Fullscreen = 전체 모드
  # Requires translation!
-Borderless = 
+Borderless = 테두리없음
 
 Screen Size = 화면 크기
 
 ### Enable panning the map when you move the mouse to the edge of the window
  # Requires translation!
-Map mouse auto-scroll = 
+Map mouse auto-scroll = 마우스로 화면 이동
  # Requires translation!
-Map panning speed = 
+Map panning speed = 이동 속도
 
 ### Graphics subgroup
 
@@ -767,10 +767,10 @@ Reset = 초기화
 Show zoom buttons in world screen = 세계 화면에서 확대/축소 버튼 보기
 Experimental Demographics scoreboard = 인구통계학적 순위 보기
  # Requires translation!
-Never close popups by clicking outside = 
+Never close popups by clicking outside = 팝업창 바깥 터치 시 창을 닫지 않음
 
  # Requires translation!
-Size of Unitset art in Civilopedia = 
+Size of Unitset art in Civilopedia = 문명 백과사전의 유닛 도트 크기
 
 ### Visual Hints subgroup
 
@@ -6872,4 +6872,3 @@ In the Resources overview, click on a resource icon to center the world screen o
 Alternatively, click on the "Unimproved" number to center the world screen only on owned tiles where the resource is not improved. = 
  # Requires translation!
 If more than one tile is available, click repeatedly on the notification to cycle through all of them. = 
-
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 950
-    const val appVersion = "4.9.14"
+    const val appCodeNumber = 951
+    const val appVersion = "4.9.15"
 
     const val gdxVersion = "1.12.1"
     const val ktorVersion = "2.2.3"

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,29 @@
+## 4.9.15
+
+Fixed tests
+
+Added Tile Breakdown table, accessible by clicking on the stats in tile info table
+
+Solved rare pillage-related crash
+
+Most images are smoothed
+
+Construction icons are linearly interpolated, aka 'smoothed'
+
+game.png is no longer a special boy
+
+Console: Add "activate trigger" for civ!
+
+Console: Allow "-delimited strings
+
+'capture all capitals' victory accepts defeat of civs that did not found capitals
+
+Added console command to reveal entire map
+
+Map editor generation steps don't add multiple terrain features of the same type
+
+Worker remove feature far away from cities fix  - By tuvus
+
 ## 4.9.14
 
 Fixed Scenario crashes

diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
@@ -464,7 +464,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.9.14", 950)
+        val VERSION = Version("4.9.15", 951)
         //endregion
 
         lateinit var Current: UncivGame

diff --git a/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt b/core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
@@ -407,10 +407,29 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc
             elevation = abs(elevation).pow(1.0 - tileMap.mapParameters.elevationExponent.toDouble()) * elevation.sign
 
             when {
-                elevation <= 0.5 -> tile.baseTerrain = flat
-                elevation <= 0.7 && hill != null -> tile.addTerrainFeature(hill)
+                elevation <= 0.5 -> {
+                    tile.baseTerrain = flat
+                    if (hill != null && tile.terrainFeatures.contains(hill)) {
+                        tile.removeTerrainFeature(hill)
+                    }
+                }
+                elevation <= 0.7 && hill != null -> {
+                    tile.addTerrainFeature(hill)
+                    tile.baseTerrain = flat
+                }
                 elevation <= 0.7 && hill == null -> tile.baseTerrain = flat // otherwise would be hills become mountains
-                elevation <= 1.0 && mountain != null -> tile.baseTerrain = mountain
+                elevation > 0.7 && mountain != null -> {
+                    tile.baseTerrain = mountain
+                    if (hill != null && tile.terrainFeatures.contains(hill)) {
+                        tile.removeTerrainFeature(hill)
+                    }
+                }
+                else -> {
+                    tile.baseTerrain = flat
+                    if (hill != null && tile.terrainFeatures.contains(hill)) {
+                        tile.removeTerrainFeature(hill)
+                    }
+                }
             }
             tile.setTerrainTransients()
         }

diff --git a/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorGenerateTab.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/tabs/MapEditorGenerateTab.kt
@@ -39,11 +39,6 @@ class MapEditorGenerateTab(
     private val newTab = MapEditorNewMapTab(this)
     private val partialTab = MapEditorGenerateStepsTab(this)
 
-    // Since we allow generation components to be run repeatedly, it might surprise the user that
-    // the outcome stays the same when repeated - due to them operating on the same seed.
-    // So we change the seed behind the scenes if already used for a certain step...
-    private val seedUsedForStep = mutableSetOf<MapGeneratorSteps>()
-
     init {
         name = "Generate"
         top()
@@ -66,14 +61,11 @@ class MapEditorGenerateTab(
     }
 
     private fun generate(step: MapGeneratorSteps) {
-        if (step == MapGeneratorSteps.All && newTab.mapParametersTable.randomizeSeed) {
-            newTab.mapParametersTable.reseed()
-        }
-        if (step == MapGeneratorSteps.Landmass && step in seedUsedForStep) {
-            // reseed visibly when starting from scratch (new seed shows in advanced settings widget)
+        if (newTab.mapParametersTable.randomizeSeed) {
+            // reseed visibly if the "Randomize seed" checkbox is checked
             newTab.mapParametersTable.reseed()
-            seedUsedForStep -= step
         }
+
         val mapParameters = editorScreen.newMapParameters.clone()  // this clone is very important here
         val message = mapParameters.mapSize.fixUndesiredSizes(mapParameters.worldWrap)
         if (message != null) {
@@ -93,11 +85,6 @@ class MapEditorGenerateTab(
             return
         }
 
-        if (step in seedUsedForStep) {
-            mapParameters.reseed()
-        } else if (step != MapGeneratorSteps.All){
-            seedUsedForStep += step
-        }
 
         Gdx.input.inputProcessor = null // remove input processing - nothing will be clicked!
         setButtonsEnabled(false)

diff --git a/fastlane/metadata/android/en-US/changelogs/951.txt b/fastlane/metadata/android/en-US/changelogs/951.txt
@@ -0,0 +1,25 @@
+
+
+Fixed tests
+
+Added Tile Breakdown table, accessible by clicking on the stats in tile info table
+
+Solved rare pillage-related crash
+
+Most images are smoothed
+
+Construction icons are linearly interpolated, aka 'smoothed'
+
+game.png is no longer a special boy
+
+Console: Add "activate trigger" for civ!
+
+Console: Allow "-delimited strings
+
+'capture all capitals' victory accepts defeat of civs that did not found capitals
+
+Added console command to reveal entire map
+
+Map editor generation steps don't add multiple terrain features of the same type
+
+Worker remove feature far away from cities fix  - By tuvus