From f503737e1570ca04689f9300d67d23f604fa70ec Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 3 Oct 2023 13:04:53 +0300 Subject: [PATCH] Version rollout (#10225) * Bump version and create initial changelog entry * Update Simplified_Chinese (#10214) * Update Polish.properties (#10212) * Update Polish.properties * Update Polish.properties * Update Polish.properties * Update Russian.properties (#10211) Add required translations and one missing; also some corrections * Update Italian.properties (#10210) * Update Brazilian_Portuguese.properties (#10203) --------- Co-authored-by: yairm210 Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Nicolas Flamme Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 12 ++--- .../jsons/translations/Italian.properties | 12 ++--- .../jsons/translations/Polish.properties | 8 +-- .../jsons/translations/Russian.properties | 23 ++++----- .../Simplified_Chinese.properties | 25 +++------- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 50 +++++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/920.txt | 49 ++++++++++++++++++ 9 files changed, 132 insertions(+), 53 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/920.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index af3c0dc2a5..e7da5ee0c2 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -748,8 +748,7 @@ Reset = Resetar Show zoom buttons in world screen = Mostrar botões de zoom na tela do mundo Experimental Demographics scoreboard = Placar de dados demográficos experimentais - # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = Tamanho da arte do conjunto de unidades na Civilopedia ### Visual Hints subgroup @@ -2053,10 +2052,8 @@ Prevents spreading of religion to the city it is next to = Impede a propagação Removes other religions when spreading religion = Remove outras religiões ao espalhar religião May Paradrop up to [amount] tiles from inside friendly territory = Pode saltar até [amount] de painéis dentro do território aliado Can perform Air Sweep = Pode executar varredura de ar - # Requires translation! -Can Spread Religion = - # Requires translation! -Can remove other religions from cities = +Can Spread Religion = Pode espalhar a religião +Can remove other religions from cities = Pode remover outras religiões das cidades Can speed up construction of a building = Pode acelerar a construção de um edifício Can speed up the construction of a wonder = Pode acelerar a construção de uma maravilha Can hurry technology research = Pode apressar pesquisa tecnológica @@ -6230,8 +6227,7 @@ Truffles = Trufas #################### Lines from UnitPromotions from Civ V - Gods & Kings #################### - # Requires translation! -Devout = +Devout = Devoto(a) Hussar = Hussardo diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index a10b793fe7..ab937a84da 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -748,8 +748,7 @@ Reset = Resetta Show zoom buttons in world screen = Mostra tasti zoom nella schermata mondiale Experimental Demographics scoreboard = Punteggio demografico sperimentale - # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = Grandezza pixel Unitset sulla Civilopedia ### Visual Hints subgroup @@ -2053,10 +2052,8 @@ Prevents spreading of religion to the city it is next to = Previene la diffusion Removes other religions when spreading religion = Rimuove le altre religioni quando diffonde la propria May Paradrop up to [amount] tiles from inside friendly territory = Può paracadutarsi fino a [amount] caselle in territorio amico Can perform Air Sweep = Può eseguire una Perlustrazione - # Requires translation! -Can Spread Religion = - # Requires translation! -Can remove other religions from cities = +Can Spread Religion = Può diffondere una Religione +Can remove other religions from cities = Può rimuovere religioni straniere dalle città Can speed up construction of a building = Può accelerare la costruzione di un edificio Can speed up the construction of a wonder = Può accelerare la costruzione di una meraviglia Can hurry technology research = Può accelerare la ricerca tecnologica @@ -6230,8 +6227,7 @@ Truffles = Tartufi #################### Lines from UnitPromotions from Civ V - Gods & Kings #################### - # Requires translation! -Devout = +Devout = Devoto Hussar = Ussaro diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 8a09f49a23..30426a8495 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -749,7 +749,7 @@ Show zoom buttons in world screen = Pokaż przyciski Powiększ  i Pomniejsz Experimental Demographics scoreboard = Eksperymentalna tablica Demografii # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = Rozmiar obrazka jednostki w Civilopedii ### Visual Hints subgroup @@ -2054,9 +2054,9 @@ Removes other religions when spreading religion = Usuwa inne religie podczas sze May Paradrop up to [amount] tiles from inside friendly territory = Możliwość desantu w promieniu do [amount] pól od przyjaznego terenu Can perform Air Sweep = Może przeprowadzić Oczyszczanie nieba # Requires translation! -Can Spread Religion = +Can Spread Religion = Może rozszerzać religię # Requires translation! -Can remove other religions from cities = +Can remove other religions from cities = Może wytępiać obce religie z miast Can speed up construction of a building = Może przyśpieszyć konstruowanie budynku Can speed up the construction of a wonder = Może przyspieszyć budowę Cudu Can hurry technology research = Może przyspieszyć badanie technologii @@ -6231,7 +6231,7 @@ Truffles = Trufle # Requires translation! -Devout = +Devout = Pobożny Hussar = Huzar diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index db88a4b1ee..389cd2e786 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -148,6 +148,7 @@ We will remember this. = Мы это запомним. [civName] has declared war on [targetCivName]! = [civName] объявляет войну державе [targetCivName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] и [targetCivName] подписали мирное соглашение! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] и [targetCivName] подписали декларацию дружбы! +[civName] and [targetCivName] have signed the Defensive Pact! = [civName] и [targetCivName] подписали оборонительный союз! [civName] has denounced [targetCivName]! = [civName] осуждает державу [targetCivName]! Do you want to break your promise to [leaderName]? = Вы хотите нарушить свое обещание, данное лидеру: [leaderName]? Break promise = Нарушить обещание @@ -176,7 +177,7 @@ Current leader is [civInfo] with [amount] Technologies discovered. = Текущ Demands = Требования Please don't settle new cities near us. = Пожалуйста, не закладывайте новых городов рядом с нами. Very well, we shall look for new lands to settle. = Хорошо, мы найдем другие земли для поселений. -We shall do as we please. = Мы поступим, как сочтем нужным. +We shall do as we please. = Мы поступим, как сочтём нужным. We noticed your new city near our borders, despite your promise. This will have....implications. = Мы заметили ваш новый город около наших границ. Это может повлечь... последствия. I've been informed that my armies have taken tribute from [civName], a city-state under your protection.\nI assure you, this was quite unintentional, and I hope that this does not serve to drive us apart. = Мне сообщили, что мои войска взяли дань с [civName], города-государства, находящегося под вашей защитой.\nУверяю вас, это было совершенно непреднамеренно, и я надеюсь, что это не будет причиной портить наши отношения. We asked [civName] for a tribute recently and they gave in.\nYou promised to protect them from such things, but we both know you cannot back that up. = Мы не так давно попросили [civName] выплатить нам дань, и они согласились.\nВы обещали защищать их от подобных выходок, но мы оба прекрасно знаем, что ваши слова ничем не подкреплены. @@ -212,9 +213,9 @@ We have married into the ruling family of [civName], bringing them under our con You have broken your Pledge to Protect [civName]! = Вы нарушили свое обещание защищать [civName]! City-States grow wary of your aggression. The resting point for Influence has decreased by [amount] for [civName]. = Города-государства опасаются вашей агрессии. Базовое влияние уменьшилось на [amount] для [civName]. -[cityState] is being attacked by [civName] and asks all major civilizations to help them out by gifting them military units. = Город [cityState] атакован державой [civName] и просит всех великих цивилизаций помочь им, подарив им военных юнитов. +[cityState] is being attacked by [civName] and asks all major civilizations to help them out by gifting them military units. = Город [cityState] атакован державой [civName] и просит все великие цивилизации помочь им, подарив им военных юнитов. [cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = [cityState] под нашествием варваров! Уничтожьте варваров рядом с их территорией, чтобы заработать влияние. -[cityState] is grateful that you killed a Barbarian that was threatening them! = [cityState] благодарны вам за избавление от угрожавшим им варваров! +[cityState] is grateful that you killed a Barbarian that was threatening them! = [cityState] благодарны вам за избавление от угрожавших им варваров! [cityState] is being attacked by [civName]! Kill [amount] of the attacker's military units and they will be immensely grateful. = Город [cityState] атакован державой [civName]! Уничтожьте [amount] военных юнитов агрессора и вам будут безмерно благодарны. [cityState] is deeply grateful for your assistance in the war against [civName]! = [cityState] безмерно благодарны вам за помощь в войне против державы [civName]! [cityState] no longer needs your assistance against [civName]. = [cityState] больше не нуждается в вашей помощи против державы [civName]. @@ -443,7 +444,7 @@ No human players selected! = Не выбраны игроки (люди)! Invalid Player ID! = Неверный ID игрока! No victory conditions were selected! = Не выбраны условия победы! Mods: = Моды: -Extension mods = Моды - расширения +Extension mods = Моды-расширения Base ruleset: = Базовый набор правил: # Note - do not translate the colour names between «». Changing them works if you know what you're doing. The mod you selected is incorrectly defined! = Выбранный вами мод имеет неправильное описание! @@ -748,8 +749,7 @@ Reset = Сбросить Show zoom buttons in world screen = Показывать кнопки масштабирования на экране мира Experimental Demographics scoreboard = Экспериментальная таблица рейтинга - # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = Размер изображений палитры юнитов в Цивилопедии ### Visual Hints subgroup @@ -2053,10 +2053,8 @@ Prevents spreading of religion to the city it is next to = Предотвращ Removes other religions when spreading religion = Очищает от остальных религий при распространении своей May Paradrop up to [amount] tiles from inside friendly territory = Может десантироваться с парашютом максимум на [amount] клеток от дружественной территории Can perform Air Sweep = Может проводить воздушную зачистку - # Requires translation! -Can Spread Religion = - # Requires translation! -Can remove other religions from cities = +Can Spread Religion = Может распространять религию +Can remove other religions from cities = Может удалять другие религии из городов Can speed up construction of a building = Может ускорить строительство здания Can speed up the construction of a wonder = Может ускорить строительство чуда Can hurry technology research = Может ускорить изучение технологии @@ -6230,11 +6228,10 @@ Truffles = Трюфели #################### Lines from UnitPromotions from Civ V - Gods & Kings #################### - # Requires translation! -Devout = +Devout = Набожный -Hussar = Гуссар +Hussar = Гусар Hakkapeliitta = Хаккапелит diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 00acd5f2f5..05fa6e6fdb 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -748,8 +748,7 @@ Reset = 重置 Show zoom buttons in world screen = 在游戏界面显示缩放按钮 Experimental Demographics scoreboard = 启用实验性统计记分板 - # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = 文明百科规则集图片大小 ### Visual Hints subgroup @@ -932,14 +931,10 @@ Your city [cityName] can bombard the enemy! = 你的城市[cityName]可以轰击 [amount] of your cities can bombard the enemy! = 你有 [amount] 座城市可以轰击敌人！ [amount] enemy units were spotted near our territory = 我们的领土附近发现了 [amount] 个敌方单位 [amount] enemy units were spotted in our territory = 我们的领土内发现了 [amount] 个敌方单位 - # Requires translation! -A(n) [nukeType] from [civName] has exploded in our territory! = - # Requires translation! -A(n) [nukeType] has been detonated by [civName]! = - # Requires translation! -A(n) [nukeType] has been detonated by an unkown civilization! = - # Requires translation! -After an attempted attack by our [nukeType], [civName] has declared war on us! = +A(n) [nukeType] from [civName] has exploded in our territory! = 一枚来自 [civName] 的 [nukeType] 在我们领土上爆炸了! +A(n) [nukeType] has been detonated by [civName]! = 一枚来自 [civName] 的 [nukeType] 被引爆了! +A(n) [nukeType] has been detonated by an unkown civilization! = 一枚来自 未知文明 的 [nukeType] 被引爆了! +After an attempted attack by our [nukeType], [civName] has declared war on us! = 由于受我们 [nukeType] 的打击, [civName] 对我们宣战! After being hit by our [nukeType], [civName] has declared war on us! = 在被我们的[nukeType]打击后，[civName]向我们宣战了！ The civilization of [civName] has been destroyed! = [civName]文明已经灭亡！ The City-State of [name] has been destroyed! = 城邦[name]覆灭了！ @@ -2057,10 +2052,8 @@ Prevents spreading of religion to the city it is next to = 阻止紧邻城市的 Removes other religions when spreading religion = 传播宗教时消除异端 May Paradrop up to [amount] tiles from inside friendly territory = 可空降到离友好领土[amount]格的位置 Can perform Air Sweep = 可以进行空中扫荡 - # Requires translation! -Can Spread Religion = - # Requires translation! -Can remove other religions from cities = +Can Spread Religion = 可以传播宗教 +Can remove other religions from cities = 可以驱除城市异教 Can speed up construction of a building = 可以加速建筑物的建造 Can speed up the construction of a wonder = 可以加速一个奇观的建造 Can hurry technology research = 可以加速科技研究 @@ -6233,9 +6226,7 @@ Truffles = 松露 #################### Lines from UnitPromotions from Civ V - Gods & Kings #################### - - # Requires translation! -Devout = +Devout = 神圣 Hussar = 轻骑兵 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index f07796c6e8..af1afd9d3b 100644 --- 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 = 919 - const val appVersion = "4.8.9-patch2" + const val appCodeNumber = 920 + const val appVersion = "4.8.10" const val gdxVersion = "1.11.0" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index 9f98be86ba..5b2fb18198 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,53 @@ +## 4.8.10 + +chore: More luxury assignment into the new object + +chore: Separated luxury resource placement logic into a separate object + +chore: Separated minor civ placement into a separate object + +chore: Separated start normalization into a separate object + +chore: Split normalizeStart into subfunctions for easier parsing + +chore: Separated MapRegionResources with more functions related to placing resources in tiles + +chore: Started splitting resource functions into separate class from MapRegions + +chore: Split MapRegions into class files, first step of refactor + +4.8.9-patch2 + +Fixed unique validation refactor breaks + +chore: Split conditional unique validation to separate function + +chore: Split RulesetValidator into subfunctions for easier parsing, and separate class for unique validations + +Resolved + +4.8.9-patch1 + +Revert "Apply conditionals for free buildings to the destination city instead of the originating city " + +performance: calculate current settler tile rank once, when comparing to other settlers around on first turn + +Converted "May enhance a religion" unique to a UnitAction + +Converted "May found a religion" unique to a UnitAction + +Added UnitAction unique type for modder clarity and ruleset validation + +🐛 fix golden age points computation to consider negative happiness - By Framonti + +City-States don't trigger defensive pacts - By tuvus + +By SomeTroglodyte: +- City overview Fix Hotfix +- Fix activating unit art in civilopedia crashes + +Reimplement and fix - By SeventhM + ## 4.8.9 New online multiplayer no longer stuck when first player is human spectator diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index d4dc76f795..e8c3dd0986 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -536,7 +536,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.8.9-patch2", 919) + val VERSION = Version("4.8.10", 920) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/920.txt b/fastlane/metadata/android/en-US/changelogs/920.txt new file mode 100644 index 0000000000..19d21b919b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/920.txt @@ -0,0 +1,49 @@ + + +chore: More luxury assignment into the new object + +chore: Separated luxury resource placement logic into a separate object + +chore: Separated minor civ placement into a separate object + +chore: Separated start normalization into a separate object + +chore: Split normalizeStart into subfunctions for easier parsing + +chore: Separated MapRegionResources with more functions related to placing resources in tiles + +chore: Started splitting resource functions into separate class from MapRegions + +chore: Split MapRegions into class files, first step of refactor + +4.8.9-patch2 + +Fixed unique validation refactor breaks + +chore: Split conditional unique validation to separate function + +chore: Split RulesetValidator into subfunctions for easier parsing, and separate class for unique validations + +Resolved + +4.8.9-patch1 + +Revert "Apply conditionals for free buildings to the destination city instead of the originating city " + +performance: calculate current settler tile rank once, when comparing to other settlers around on first turn + +Converted "May enhance a religion" unique to a UnitAction + +Converted "May found a religion" unique to a UnitAction + +Added UnitAction unique type for modder clarity and ruleset validation + +🐛 fix golden age points computation to consider negative happiness - By Framonti + +City-States don't trigger defensive pacts - By tuvus + +By SomeTroglodyte: +- City overview Fix Hotfix +- Fix activating unit art in civilopedia crashes + +Reimplement and fix - By SeventhM \ No newline at end of file