diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 2fdc5804fe..66117a6a7e 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1439,7 +1439,6 @@ Memphis = Heliopolis = # Requires translation! Elephantine = - # Requires translation! Alexandria = Alexandria # Requires translation! Pi-Ramesses = @@ -1871,17 +1870,11 @@ Adria = Arabia = Arábia Harun al-Rashid = Harune Arraxide - # Requires translation! The world will be more beautiful without you. Prepare for war. = O mundo será mais bonito sem você. Prepare-se para a guerra. - # Requires translation! Fool! You will soon regret dearly! I swear it! = Tolo! Você irá se arrepender logo! É uma promessa! - # Requires translation! You have won, congratulations. My palace is now in your possession, and I beg that you care well for the peacock. = Parabéns, você ganhou. Meu palácio está a sua disposição, e eu lhe imploro para cuidar bem do pavão. - # Requires translation! Welcome foreigner, I am Harun Al-Rashid, Caliph of the Arabs. Come and tell me about your empire. = Seja bem vindo forasteiro, eu sou Harune Arraxide, califa dos Arabes. Venha, e me fale sobre seu império. - # Requires translation! Come forth, let's do business. = Venha cá, vamos fazer negócio. - # Requires translation! Peace be upon you. = Que a paz esteja com você. # Requires translation! Mecca = @@ -2061,7 +2054,6 @@ Santa Cruz = Little Rock = Japan = Japão - # Requires translation! Oda Nobunaga = Oda Nobunaga I hereby inform you of our intention to wipe out your civilization from this world. = Por mei deste, informamos nossa intenção de eliminar sua civilização deste mundo. Pitiful fool! Now we shall destroy you! = Tolo lamentável! Agora deveremos destruí-lo! @@ -2190,7 +2182,6 @@ Jaipur = Jaipur Karachi = Carachi Germany = Alemanha - # Requires translation! Otto von Bismarck = Otto von Bismarck I cannot wait until ye grow even mightier. Therefore, prepare for war! = Eu não esperarei por seu avanço. Portanto, prepare-se para guerra! Corrupted villain! We will bring you into the ground! = Vilão corrupto! Nós o levaremos ao chão! @@ -2400,27 +2391,19 @@ Gimje = Anju = Iroquois = Iroqueses - # Requires translation! Hiawatha = Hiawatha - # Requires translation! You are a plague upon Mother Earth! Prepare for battle! = Você é uma praga para a Mãe Terra! Prepare-se para a batalha! - # Requires translation! You evil creature! My braves will slaughter you! = Sua criatura maligna! Os meus guerreiros irão te massacrar! - # Requires translation! You have defeated us... but our spirits will never be vanquished! We shall return! = Você nos derrotou... mas nossos espíritos nunca serão aniquilados! Nós iremos retornar! - # Requires translation! Greetings, stranger. I am Hiawatha, speaker for the Iroquois. We seek peace with all, but we do not shrink from war. = Saudações, estranho. Eu sou Hiawatha, representante dos Iroqueses. Nós procuramos paz com todos, mas não fugimos da guerra. - # Requires translation! Does this trade work for you, my friend? = Você aceita essa troca, meu amigo? # Requires translation! Onoondaga = # Requires translation! Osininka = - # Requires translation! Grand River = Grande Rio # Requires translation! Akwesasme = - # Requires translation! Buffalo Creek = Riacho do Búfalo # Requires translation! Brantford = @@ -2428,7 +2411,6 @@ Brantford = Montreal = # Requires translation! Genesse River = - # Requires translation! Canandaigua Lake = Lago Canandaigua # Requires translation! Lake Simcoe = @@ -2444,7 +2426,6 @@ Akron = Kanesatake = # Requires translation! Ganienkeh = - # Requires translation! Cayuga Castle = Castelo de Cayuga # Requires translation! Chondote = @@ -2452,19 +2433,15 @@ Chondote = Canajoharie = # Requires translation! Nedrow = - # Requires translation! Oneida Lake = Lago de Oneida # Requires translation! Kanonwalohale = - # Requires translation! Green Bay = Baía Verde # Requires translation! Southwold = - # Requires translation! Mohawk Valley = Vale de Mohawk # Requires translation! Schoharie = - # Requires translation! Bay of Quinte = Baía de Quinte # Requires translation! Kanawale = @@ -2477,21 +2454,13 @@ Hahta = Persia = Pérsia Darius I = Dario I - # Requires translation! Your continue existence is an embarrassment to all leaders everywhere! You must be destroyed! = A sua existência é uma vergonha para os líderes em todo o mundo! Você deve ser destruído! - # Requires translation! Curse you! You are beneath me, son of a donkey driver! I will crush you! = Maldito seja! Você está abaixo de mim, filho de um carregador de burros! Eu irei te aniquilar! - # Requires translation! You mongrel! Cursed be you! The world will long lament your heinous crime! = Seu vira-lata! Maldito seja! O mundo irá lamentar por séculos o seu crime hediondo! - # Requires translation! Peace be on you! I am Darius, the great and outstanding king of kings of great Persia... but I suppose you knew that. = Que a paz esteja com você! Eu sou Dario, o incrível e sensacional rei dos reis da grande Persia... mas acredito que você já saiba disso. - # Requires translation! In my endless magnanimity, I am making you this offer. You agree, of course? = Pela minha magnanimidade sem fim, eu lhe proponho esta troca. Você claramente concorda, não? - # Requires translation! Good day to you! = Um bom dia para você! - # Requires translation! Ahh... you... = Ah... você... - # Requires translation! Persepolis = Persépolis # Requires translation! Parsagadae = @@ -2628,9 +2597,7 @@ The hard-shelled crab yields, and the lion lies down to sleep. Kanaloa comes for Aloha! Greetings and blessings upon you, friend. I am Kamehameha, Great King of this strand of islands. = Aloha! Saudações e bençãos para você, amigo. Eu sou Kamehameha, Grande Rei destas ilhas. Come, let our people feast together! = Venha, deixe nosso povo festejar juntos! Welcome, friend! = Bem vindo, amigo! - # Requires translation! Honolulu = Honolulu - # Requires translation! Samoa = Samoa # Requires translation! Tonga = @@ -2709,7 +2676,6 @@ Pileni = # Requires translation! Nukumanu = - # Requires translation! Siam = Reino de Siam Ramkhamhaeng = Ramkhamrhaeng You lowly, arrogant fool! I will make you regret of your insolence! = Seu bastardo arrogante! Eu vou fazer você se arrepender de sua insolência. @@ -3086,7 +3052,6 @@ Chucuito = Choquequirao = Denmark = Dinamarca - # Requires translation! Harald Bluetooth = Haroldo Dente-Azul # Requires translation! If I am to be honest, I tire of those pointless charades. Why don't we settle our disputes on the field of battle, like true men? Perhaps the skalds will sing of your valor... or mine! = diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 56b5091eab..0226471b5b 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1220,7 +1220,6 @@ Deity = Dewa #################### Lines from Nations from Civ V - Vanilla #################### - # Requires translation! Spectator = Penonton Babylon = Babel @@ -3398,7 +3397,6 @@ Heal adjacent units for an additional 15 HP per turn = Menyembuhkan unit bersebe #################### Lines from Nations from Civ V - G&K #################### - # Requires translation! Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = Mengapa kami berperang? Karena Inanna menghendakinya. Sekarang, saksikanlah kekuatan bangsa Sumeria! diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index d0c84b17fb..6561e82be5 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -3397,7 +3397,6 @@ Heal adjacent units for an additional 15 HP per turn = 隣接するユニット #################### Lines from Nations from Civ V - G&K #################### - # Requires translation! Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = なぜ我々は戦う、イナンナが要求しているからだ。シュメール人の力を見ておくがいい！ diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 88ac7cb3f3..44370ec0d2 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -492,7 +492,6 @@ Your relationship with [cityStateName] degraded = [cityStateName] 도시국가 A new barbarian encampment has spawned! = 새로운 야만인 주둔지가 만들어졌습니다! Received [goldAmount] Gold for capturing [cityName] = [cityName]을(를) 점령하여 금 [goldAmount]을(를) 얻었습니다 Our proposed trade request is no longer relevant! = 우리가 제안한 거래가 더 이상 유효하지 않습니다! -Our proposed trade is no longer relevant! = 우리가 제안한 거래가 더 이상 유효하지 않습니다! [defender] could not withdraw from a [attacker] - blocked. = [defender]이(가) 차단되어 [attacker]에게서 철수할 수 없습니다! [defender] withdrew from a [attacker] = [defender]이(가) [attacker]에게서 철수했습니다 [building] has provided [amount] Gold! = [building]이(가) 금 [amount]을(를) 제공했습니다! @@ -1221,11 +1220,8 @@ Deity = 신 #################### Lines from Nations from Civ V - Vanilla #################### - # Requires verification Spectator = 관전자 -# Nations template: 문명 / 지도자 / AI가 전쟁선포 / 플레이어가 전쟁선포 / 멸망 / 조우 / 거래창 / 우호 인사 / 적대 인사 - Babylon = 바빌론 Nebuchadnezzar II = 네부카드네자르 2세 The demon wants the blood of soldiers! = 악마가 병사들의 피를 갈구하는구나! diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 0a223a1631..050869bb90 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,20 +1,20 @@ -Brazilian_Portuguese = 71 +Brazilian_Portuguese = 72 Traditional_Chinese = 63 Italian = 99 Polish = 96 Russian = 99 Lithuanian = 26 Romanian = 46 -Korean = 99 +Korean = 100 Simplified_Chinese = 91 German = 100 -Japanese = 99 +Japanese = 100 Turkish = 75 English = 1 Ukrainian = 99 French = 98 Portuguese = 52 -Indonesian = 99 +Indonesian = 100 Czech = 62 Spanish = 99 Malay = 6 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 451d20c59c..65cdf85bb5 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.3.71" const val appName = "Unciv" - const val appCodeNumber = 446 - const val appVersion = "3.9.10" + const val appCodeNumber = 447 + const val appVersion = "3.9.11" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index fa58a7e45b..14d0c2fc69 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,25 @@ +## 3.9.11 + +Better Civilopedia icons for buildings and units + +Resolved #2822 - normalized the amount of strategic resources + +Resolved #2819 - units no longer gain XP from attacking already defeated cities + +Resolved #2820 - resurrected civs are at peace with everyone + + By alkorolyov: + +- Fixed two empty mods checkbox in game options +- Two experimental switches: Spectator mode & Extended Map Editor + + By ninjatao: + +- Do not generate fallout on impasssible terran. +- Fix AI nuke radius + +Translation updates + ## 3.9.10 Resource toggle button is consistent with population toggle - by @lishaoxia1985 diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt index 35524ed988..0fa96dc705 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt @@ -5,7 +5,6 @@ import com.badlogic.gdx.Gdx import com.badlogic.gdx.scenes.scene2d.ui.SelectBox import com.badlogic.gdx.scenes.scene2d.ui.Skin import com.badlogic.gdx.utils.Array -import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.* import com.unciv.logic.civilization.PlayerType @@ -151,9 +150,7 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe var newGame: GameInfo? = null override fun render(delta: Float) { - if (newGame != null) { - game.loadGame(newGame!!) - } + if (newGame != null) game.loadGame(newGame!!) super.render(delta) } } @@ -168,7 +165,6 @@ class TranslatedSelectBox(values : Collection, default:String, skin: Ski val array = Array() values.forEach { array.add(TranslatedString(it)) } items = array - val defaultItem = array.firstOrNull { it.value == default } - selected = if (defaultItem != null) defaultItem else array.first() + selected = array.firstOrNull { it.value == default } ?: array.first() } } \ No newline at end of file