From eb984f06dc0a2c786714a25a03e4d2a48f989778 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 9 Feb 2024 12:37:42 +0200 Subject: [PATCH] 4.10.8 --- .../jsons/translations/Afrikaans.properties | 2 ++ .../jsons/translations/Belarusian.properties | 2 ++ .../assets/jsons/translations/Bosnian.properties | 2 ++ .../translations/Brazilian_Portuguese.properties | 2 ++ .../jsons/translations/Bulgarian.properties | 2 ++ .../assets/jsons/translations/Catalan.properties | 2 ++ .../assets/jsons/translations/Czech.properties | 2 ++ .../assets/jsons/translations/Dutch.properties | 2 ++ .../assets/jsons/translations/English.properties | 2 ++ .../jsons/translations/Filipino.properties | 2 ++ .../assets/jsons/translations/Finnish.properties | 2 ++ .../assets/jsons/translations/French.properties | 2 ++ .../assets/jsons/translations/German.properties | 2 ++ .../assets/jsons/translations/Greek.properties | 2 ++ .../jsons/translations/Hungarian.properties | 2 ++ .../jsons/translations/Indonesian.properties | 2 ++ .../assets/jsons/translations/Italian.properties | 2 ++ .../jsons/translations/Japanese.properties | 2 ++ .../assets/jsons/translations/Korean.properties | 2 ++ .../assets/jsons/translations/Latin.properties | 2 ++ .../jsons/translations/Lithuanian.properties | 2 ++ .../assets/jsons/translations/Malay.properties | 2 ++ .../Persian_(Pinglish-DIN).properties | 2 ++ .../Persian_(Pinglish-UN).properties | 2 ++ .../assets/jsons/translations/Polish.properties | 2 ++ .../jsons/translations/Portuguese.properties | 2 ++ .../jsons/translations/Romanian.properties | 2 ++ .../assets/jsons/translations/Russian.properties | 2 ++ .../assets/jsons/translations/Rusyn.properties | 2 ++ .../translations/Simplified_Chinese.properties | 2 ++ .../assets/jsons/translations/Spanish.properties | 2 ++ .../assets/jsons/translations/Swedish.properties | 2 ++ .../translations/Traditional_Chinese.properties | 2 ++ .../assets/jsons/translations/Turkish.properties | 2 ++ .../jsons/translations/Ukrainian.properties | 2 ++ .../jsons/translations/Vietnamese.properties | 2 ++ .../completionPercentages.properties | 4 ++-- changelog.md | 14 ++++++-------- .../mapregions/MapRegionResources.kt | 8 ++++---- .../mapgenerator/mapregions/StartNormalizer.kt | 3 +-- .../src/com/unciv/models/ruleset/tile/Terrain.kt | 5 ----- .../com/unciv/models/ruleset/unit/BaseUnit.kt | 4 ++-- .../screens/cityscreen/ConstructionInfoTable.kt | 4 ++-- docs/Modders/uniques.md | 7 ++++++- .../metadata/android/en-US/changelogs/967.txt | 16 ++++++---------- 45 files changed, 101 insertions(+), 36 deletions(-) diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index a406b386a4892..f737c447a778f 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -3389,6 +3389,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index a7c95e3593031..5227c304568e9 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -3312,6 +3312,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties index a1744f30160bb..95e09f5299317 100644 --- a/android/assets/jsons/translations/Bosnian.properties +++ b/android/assets/jsons/translations/Bosnian.properties @@ -3623,6 +3623,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 3a014117965e9..4241526275441 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = Requer uma população de ao menos [amou Triggers a global alert upon build start = Aciona um alerta global no início da construção Triggers a global alert upon completion = Aciona um alerta global após a conclusão Cost increases by [amount] per owned city = Custo aumentado em [amount] por cidade governada + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Requer um(a) [buildingFilter] em pelo menos [amount] cidades Can only be built [cityFilter] = Só pode ser construído [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Precisa governar [tileFilter] dentro de [amount] painéis diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index b73663d9f74ed..7b441e97a503d 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -2712,6 +2712,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 800cca4648f98..c3868853cc607 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = Cal com a mínim una població de [amoun Triggers a global alert upon build start = Provoca una alerta global quan es comença a construir. Triggers a global alert upon completion = Quan es completa, provoca una alerta mundial Cost increases by [amount] per owned city = El cost augmenta en [amount] per cada ciutat que tingui la civilització + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Cal un [buildingFilter] en almenys [amount] ciutats. Can only be built [cityFilter] = Només es pot construir [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Cal tenir un [tileFilter] propi a com a molt [amount] caselles de distància diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 6532ea003b605..86729cb3bbd3d 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -2359,6 +2359,8 @@ Triggers a global alert upon build start = Vyvolá globální upozornění při Triggers a global alert upon completion = Vyvolá globální oznámení po dokončení Cost increases by [amount] per owned city = Cena se zvyšuje o [amount] za každé město # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = Can only be built [cityFilter] = Lze postavit pouze [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Musí být do vzdálenosti [amount] od vlastněného políčka [tileFilter] diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index d456bdae33de2..4168171a42b64 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -2058,6 +2058,8 @@ Requires at least [amount] population = Vereist minstens [amount] bevolking Triggers a global alert upon build start = Veroorzaakt een globaal alarmsignaal bij het starten Triggers a global alert upon completion = Veroorzaakt een globaal alarmsignaal bij voltooiing Cost increases by [amount] per owned city = Kosten nemen toe met [amount] per stad in bezit + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Vereist een [buildingFilter] in minstens [amount] steden Can only be built [cityFilter] = Kan alleen gebouwd worden [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Moet [tileFilter] bezitten binnen [amount] tegels diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 5cf703cb2bcc6..e1f4b1add4cb2 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -3819,6 +3819,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 2bdac1ef1a340..0c675787d9670 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -2221,6 +2221,8 @@ Requires at least [amount] population = Kinakailangan na hindi bababa sa [amount Triggers a global alert upon build start = Nagti-trigger ng pandaigdigang abiso sa pagsisimula ng pagtayo Triggers a global alert upon completion = Nagti-trigger ng pandaigdigang alerto kapag nakumpleto Cost increases by [amount] per owned city = Ang gastos ay lumalaki ng [amount] bawat lungsod na pag-aari + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Kailangan ng [buildingFilter] na hindi bababa sa [amount] lungsod Can only be built [cityFilter] = Maaari lamang itayo [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Dapat may pag-aari ng [tileFilter] sa loob ng [amount] tiles diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 406ce2b91357d..fb40835657bc1 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -2851,6 +2851,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 3da6e22fe4a90..e8cee222b5b81 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = Nécessite au moins [amount] en populati Triggers a global alert upon build start = Déclenche une alerte générale au démarrage de la construction Triggers a global alert upon completion = Déclenche une alerte générale une fois achevé Cost increases by [amount] per owned city = Le coût augmente de [amount] par ville possédée + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Nécessite un(e) [buildingFilter] dans au moins [amount] villes Can only be built [cityFilter] = Peut être construit uniquement [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Vous devez posséder [tileFilter] dans un rayon de [amount] cases diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index fff197e6a923c..5e6a9dc72520b 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = Benötigt mindestens [amount] Bevölkeru Triggers a global alert upon build start = Löst einen globalen Alarm bei Baubeginn aus Triggers a global alert upon completion = Löst bei Fertigstellung einen globalen Alarm aus Cost increases by [amount] per owned city = Kosten erhöhen sich um [amount] pro Stadt in Eurem Besitz + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Erfordert [buildingFilter] in mindestens [amount] Städten Can only be built [cityFilter] = Kann nur [cityFilter] gebaut werden Must have an owned [tileFilter] within [amount] tiles = Benötigt [tileFilter] im Besitz innerhalb von [amount] Feldern diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index fdfe634868f9c..6289db5a9f8f0 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -3435,6 +3435,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 778c3846f33a2..ee324ec73c6db 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -2062,6 +2062,8 @@ Requires at least [amount] population = Legalább [amount] lakosra van szükség Triggers a global alert upon build start = A világ összes nemzete értesül róla, ha valaki elkezdi Triggers a global alert upon completion = A világ összes nemzete értesül a megvalósításáról Cost increases by [amount] per owned city = Minden saját város [amount] egységgel drágítja + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = [buildingFilter] szükséges legalább [amount] városban Can only be built [cityFilter] = Csak [cityFilter] építhető Must have an owned [tileFilter] within [amount] tiles = [amount] mezőn belül legyen egy [tileFilter] meződ diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 914bb83928729..d16696e3a2168 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2058,6 +2058,8 @@ Requires at least [amount] population = Membutuhkan setidaknya [amount] populasi Triggers a global alert upon build start = Memicu peringatan global ketika memulai pembangunan Triggers a global alert upon completion = Memicu peringatan global saat selesai Cost increases by [amount] per owned city = Biaya meningkat sebesar [amount] per kota yang dimiliki + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Memerlukan [buildingFilter] pada setidaknya [amount] kota Can only be built [cityFilter] = Hanya dapat dibangun [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Harus memiliki [tileFilter] dengan jarak kurang dari [amount] daerah diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 5730bcfbefac4..94e11cf87d745 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = Richiede almeno [amount] abitanti Triggers a global alert upon build start = Attiva un allarme globale quando inizia Triggers a global alert upon completion = Lancia un'allerta globale quando completato Cost increases by [amount] per owned city = Il costo aumenta di [amount] per Città posseduta + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Richiede [buildingFilter] in almeno [amount] città Can only be built [cityFilter] = Costruibile solo [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Deve rasentare [tileFilter] entro [amount] caselle diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index ecba14e89b008..5e67506f4f7b0 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -2147,6 +2147,8 @@ Requires at least [amount] population = 最低でも人口が[amount]必要 Triggers a global alert upon build start = 生産を開始すると警告が発生する Triggers a global alert upon completion = 生産を完了すると警告が発生する Cost increases by [amount] per owned city = 所有する都市ごとにコストが[amount]増加 + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = 都市に最低[amount]個の[buildingFilter]の建物が必要 Can only be built [cityFilter] = [cityFilter]のみで建設可能 Must have an owned [tileFilter] within [amount] tiles = [amount]タイル以内に[tileFilter]がなければならない diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 2b77c52ff9dfc..0f9ed3b992c07 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -2069,6 +2069,8 @@ Requires at least [amount] population = 인구 [amount] 이상부터 생산 가 Triggers a global alert upon build start = 건설 시작시 전 세계에 알림 Triggers a global alert upon completion = 건설 완료시 전 세계에 알림 Cost increases by [amount] per owned city = 도시 하나당 비용 +[amount] + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = 최소 [amount]개 도시에 [buildingFilter] 필요 Can only be built [cityFilter] = [cityFilter]에만 건설 가능 Must have an owned [tileFilter] within [amount] tiles = [tileFilter]에서 [amount]타일 내에 도시가 있어야 함 diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index 80be4a199064e..8eb40369e81cd 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -3568,6 +3568,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 180c02a8f5494..8de5b5ffd4c90 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -2330,6 +2330,8 @@ Requires at least [amount] population = Reikia mažiausiai [amount] gyventojų Triggers a global alert upon build start = Pasaulinis pranešimas pradedant statybą Triggers a global alert upon completion = Pasaulinis pranešimas užbaigus Cost increases by [amount] per owned city = Kaina padininama [amount] už kiekvieną jūsų miestą + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Reikalauja: [buildingFilter] mažiausiai [amount] miestuose Can only be built [cityFilter] = Gali statyti tik: [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Reikalinga(s): [tileFilter] ne toliau [amount] laukelių diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 44bd8722b86fc..718ce49d0826c 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -2764,6 +2764,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 95accd9485669..f795a377857a9 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -3214,6 +3214,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index d24b401893601..e9f068241ffef 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -2785,6 +2785,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 507b5b54523a8..1dd9217457ba5 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = Wymaga co najmniej [amount] Obywateli Triggers a global alert upon build start = Po rozpoczęciu budowania inicjuje alert globalny Triggers a global alert upon completion = Po ukończeniu inicjuje alert globalny Cost increases by [amount] per owned city = Koszt wzrasta o [amount]⚙ za każde kolejne miasto + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Wymaga [buildingFilter] w co najmniej [amount] miastach Can only be built [cityFilter] = Można zbudować tylko [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Musi leżeć nie dalej niż [amount] pola od [tileFilter] na terenie twojego państwa diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 9fff0e680fe8b..ede12de403dd8 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -2342,6 +2342,8 @@ Triggers a global alert upon build start = Aciona um alerta global no início da Triggers a global alert upon completion = Aciona um alerta global após a conclusão Cost increases by [amount] per owned city = O custo aumenta em [amount] por cidade possuída # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = Can only be built [cityFilter] = Só pode ser construído [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Deve ter um [tileFilter] próprio dentro de [amount] de blocos diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 8aee07a8b1f2d..f53c5121deb7b 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -2240,6 +2240,8 @@ Triggers a global alert upon build start = Declanșează o alertă globală la Triggers a global alert upon completion = Declanșează o alertă globală la finalizare Cost increases by [amount] per owned city = Costul crește cu [amount] pe oraș deținut # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = Can only be built [cityFilter] = Poate fi construit numai [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Trebuie să aibă un [tileFilter] deținut în [amount] dale diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index e7b86d9431de4..d78f0f8889266 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2070,6 +2070,8 @@ Requires at least [amount] population = Требуется как минимум Triggers a global alert upon build start = Вызывает глобальное оповещение при начале строительства Triggers a global alert upon completion = Вызывает глобальное оповещение при завершении Cost increases by [amount] per owned city = Стоимость строительства увеличивается на [amount] за каждый город под вашим контролем + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Требуется [buildingFilter] как минимум в [amount] городах Can only be built [cityFilter] = Можно построить только [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Городу должна принадлежать клетка [tileFilter] в радиусе [amount] клеток diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties index 3680a3f8aa979..724928ce7b453 100644 --- a/android/assets/jsons/translations/Rusyn.properties +++ b/android/assets/jsons/translations/Rusyn.properties @@ -3187,6 +3187,8 @@ Triggers a global alert upon completion = # Requires translation! Cost increases by [amount] per owned city = # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index e9e9aa9e73666..e258533b5a31b 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = 至少需要[amount]人口 Triggers a global alert upon build start = 在建造开始时触发全局警报 Triggers a global alert upon completion = 完成后触发全局警报 Cost increases by [amount] per owned city = 每座己方城市使建造所需的产能花费增加 [amount] + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = 需要至少[amount]个城市建有[buildingFilter] Can only be built [cityFilter] = 能被建造在[cityFilter] Must have an owned [tileFilter] within [amount] tiles = 城市[amount]格内的己方地块必须有[tileFilter] diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 273d7a1b8a365..b83ecefafe24a 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2056,6 +2056,8 @@ Requires at least [amount] population = Requiere al menos [amount] de población Triggers a global alert upon build start = Activa una alerta mundial al iniciar su construcción Triggers a global alert upon completion = Activa una alerta mundial al completarse Cost increases by [amount] per owned city = El costo aumenta en [amount] por ciudad de propiedad + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = requerir a [buildingFilter] en al menos [amount] ciudades Can only be built [cityFilter] = Solo puede ser construido [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Debe tener una [tileFilter] perteneciente a menos de [amount] casillas diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 1a70ab74d605b..2dc9b6135db09 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -2336,6 +2336,8 @@ Requires at least [amount] population = Kräver minst [amount] befolkning Triggers a global alert upon build start = Utlöser en global varning när byggnation börjar Triggers a global alert upon completion = Orsakar en global varning vid fullbordning Cost increases by [amount] per owned city = Kostnad ökar med [amount] per ägd stad + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Kräver en [buildingFilter] i minst [amount] städer Can only be built [cityFilter] = Kan bara byggas [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Måste ha en ägd [tileFilter] inom [amount] rutor diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 59fb0596fc1ae..6990cb1d6733b 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -2159,6 +2159,8 @@ Requires at least [amount] population = 至少需要[amount]人口 Triggers a global alert upon build start = 在建造開始時觸發全局警報 Triggers a global alert upon completion = 完成後觸發全局警報 Cost increases by [amount] per owned city = 每座己方城市使建造所需的產能花費增加[amount] + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = 需要在最少[amount]座城市中擁有[buildingFilter] Can only be built [cityFilter] = 只能被建造在[cityFilter] Must have an owned [tileFilter] within [amount] tiles = 城市[amount]格內的己方地塊必須有[tileFilter] diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 66dff9018cc19..acb5366a18535 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -2183,6 +2183,8 @@ Triggers a global alert upon build start = İnşaatının başlatılması küres Triggers a global alert upon completion = Üretimi tamamlandığında küresel bir uyarı gösterir. Cost increases by [amount] per owned city = Maliyet, sahip olunan şehir başına [amount] miktar arttı # Requires translation! +Cost increases by [amount] when built = + # Requires translation! Requires a [buildingFilter] in at least [amount] cities = # Requires translation! Can only be built [cityFilter] = diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 489cdf169d0dd..cc2c12fcbbb30 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2091,6 +2091,8 @@ Requires at least [amount] population = Вимагає щонайменше [amo Triggers a global alert upon build start = З'являється глобальне повідомлення після початку будівництва Triggers a global alert upon completion = З'являється глобальне повідомлення по закінченню будівництва Cost increases by [amount] per owned city = Вартість збільшується на [amount] за кожне ваше місто + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Вимагає [buildingFilter] принаймні в [amount] містах Can only be built [cityFilter] = Може бути побудовано лише [cityFilter] Must have an owned [tileFilter] within [amount] tiles = На відстані [amount] клітинок мусить бути ваша клітинка типу [tileFilter] diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 761dcfdfe4e23..6cc2600af9a4e 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -2329,6 +2329,8 @@ Requires at least [amount] population = Yêu cầu ít nhất [amount] dân số Triggers a global alert upon build start = Kích hoạt cảnh báo toàn cầu khi bắt đầu xây dựng Triggers a global alert upon completion = Kích hoạt cảnh báo toàn cầu sau khi hoàn thành Cost increases by [amount] per owned city = Chi phí tăng thêm [amount] cho mỗi thành phố sở hữu + # Requires translation! +Cost increases by [amount] when built = Requires a [buildingFilter] in at least [amount] cities = Yêu cầu [buildingFilter] ở ít nhất [amount] thành phố Can only be built [cityFilter] = Chỉ có thể được xây dựng [cityFilter] Must have an owned [tileFilter] within [amount] tiles = Phải có [tileFilter] được sở hữu trong [amount] ô diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index f128ee0caf386..53b0048aad428 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,7 +1,7 @@ Afrikaans = 8 Belarusian = 9 Bosnian = 3 -Brazilian_Portuguese = 100 +Brazilian_Portuguese = 99 Bulgarian = 43 Catalan = 99 Czech = 79 @@ -9,7 +9,7 @@ Dutch = 97 English = 0 Filipino = 89 Finnish = 38 -French = 100 +French = 99 German = 99 Greek = 14 Hungarian = 78 diff --git a/changelog.md b/changelog.md index eb85fc6d0fc27..dc4b8984708e8 100644 --- a/changelog.md +++ b/changelog.md @@ -2,18 +2,16 @@ Fixed unhappiness effect when at 0 happiness -Allow BaseUnit unique functions to return UnitType uniques +All BaseUnit uniques, e.g. Never appears as a Barbarian unit, Limited to [amount] per Civilization, can be placed on unit type By SeventhM: -- Add unique for increasing price every time it's built -- Fix mistakes with unavailable unique +- Add unique for increasing price every time it's built +- Fix mistakes with unavailable unique By SomeTroglodyte: -- Tweak Overview-Politics-Diagram for a defeated player -- Patch AlertPopup to correctly close when it cannot find a required asset -- Fix Capture when a teleport was necessary - -fix light/dark mode tooltip in the wiki - By alexban011 +- Fix Capture when a teleport was necessary +- Tweak Overview Politics Diagram for a defeated player +- Patch AlertPopup to correctly close when it cannot find a required asset ## 4.10.7 diff --git a/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt b/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt index c49ec2423b4bb..620cd64d772da 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt @@ -18,11 +18,11 @@ object MapRegionResources { * Tries to avoid impacts, but falls back to lowest impact otherwise. * Goes through the list in order, so pre-shuffle it! * Assumes all tiles in the list are of the same terrain type when generating weightings, irrelevant if only one option. - * Respects terrainsCanBeFoundOn when there is only one option, unless [forcePlacement] is true. * @return a map of the resources in the options list to number placed. */ - fun placeResourcesInTiles(tileData: TileDataMap, frequency: Int, tileList: List, resourceOptions: List, - baseImpact: Int = 0, randomImpact: Int = 0, majorDeposit: Boolean = false, - forcePlacement: Boolean = false): Map { + fun placeResourcesInTiles( + tileData: TileDataMap, frequency: Int, tileList: List, resourceOptions: List, + baseImpact: Int = 0, randomImpact: Int = 0, majorDeposit: Boolean = false + ): Map { if (tileList.none() || resourceOptions.isEmpty()) return mapOf() val impactType = when (resourceOptions.first().resourceType) { ResourceType.Strategic -> MapRegions.ImpactType.Strategic diff --git a/core/src/com/unciv/logic/map/mapgenerator/mapregions/StartNormalizer.kt b/core/src/com/unciv/logic/map/mapgenerator/mapregions/StartNormalizer.kt index 6df374db05e3d..fef5b7621d192 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/mapregions/StartNormalizer.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/mapregions/StartNormalizer.kt @@ -129,8 +129,7 @@ object StartNormalizer { 999, resourceTiles, listOf(resource), - majorDeposit = true, - forcePlacement = true + majorDeposit = true ) } } diff --git a/core/src/com/unciv/models/ruleset/tile/Terrain.kt b/core/src/com/unciv/models/ruleset/tile/Terrain.kt index 8694467b668e8..68ed670fc8532 100644 --- a/core/src/com/unciv/models/ruleset/tile/Terrain.kt +++ b/core/src/com/unciv/models/ruleset/tile/Terrain.kt @@ -2,7 +2,6 @@ package com.unciv.models.ruleset.tile import com.badlogic.gdx.graphics.Color import com.unciv.Constants -import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetStatsObject @@ -144,10 +143,6 @@ class Terrain : RulesetStatsObject() { return textList } - fun canBePlacedOn(tile: Tile){ - - } - fun setTransients() { damagePerTurn = getMatchingUniques(UniqueType.DamagesContainingUnits).sumOf { it.params[0].toInt() } } diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index 44f3230777d59..ca1d3699bd1b2 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -259,8 +259,8 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction { // This returns the name of the unit this tech upgrades this unit to, // or null if there is no automatic upgrade at that tech. fun automaticallyUpgradedInProductionToUnitByTech(techName: String): String? { - for (obsoleteTech: String in techsAtWhichAutoUpgradeInProduction()) - if (obsoleteTech != null && obsoleteTech == techName) + for (obsoleteTech: String in techsAtWhichAutoUpgradeInProduction()) + if (obsoleteTech == techName) return upgradesTo return null } diff --git a/core/src/com/unciv/ui/screens/cityscreen/ConstructionInfoTable.kt b/core/src/com/unciv/ui/screens/cityscreen/ConstructionInfoTable.kt index 794e9275da24b..8fd3550888cf6 100644 --- a/core/src/com/unciv/ui/screens/cityscreen/ConstructionInfoTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/ConstructionInfoTable.kt @@ -130,11 +130,11 @@ class ConstructionInfoTable(val cityScreen: CityScreen) : Table() { cityScreen.update() } ) { - sellBuildingConfirmed(construction, isFree) + sellBuildingConfirmed(construction) }.open() } - private fun sellBuildingConfirmed(construction: Building, isFree: Boolean) { + private fun sellBuildingConfirmed(construction: Building) { cityScreen.city.sellBuilding(construction) cityScreen.clearSelection() cityScreen.update() diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index b8802342d5d03..1dc45084b04a7 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -1052,7 +1052,12 @@ Due to performance considerations, this unique is cached, thus conditionals may ??? example "Cost increases by [amount] per owned city" Example: "Cost increases by [3] per owned city" - Applicable to: Building + Applicable to: Building, Unit + +??? example "Cost increases by [amount] when built" + Example: "Cost increases by [3] when built" + + Applicable to: Building, Unit ??? example "Requires a [buildingFilter] in all cities" Example: "Requires a [Culture] in all cities" diff --git a/fastlane/metadata/android/en-US/changelogs/967.txt b/fastlane/metadata/android/en-US/changelogs/967.txt index 58c5f04da4a89..d46183b2cafe1 100644 --- a/fastlane/metadata/android/en-US/changelogs/967.txt +++ b/fastlane/metadata/android/en-US/changelogs/967.txt @@ -1,16 +1,12 @@ - - Fixed unhappiness effect when at 0 happiness -Allow BaseUnit unique functions to return UnitType uniques +All BaseUnit uniques, e.g. Never appears as a Barbarian unit, Limited to [amount] per Civilization, can be placed on unit type By SeventhM: -- Add unique for increasing price every time it's built -- Fix mistakes with unavailable unique +- Add unique for increasing price every time it's built +- Fix mistakes with unavailable unique By SomeTroglodyte: -- Tweak Overview-Politics-Diagram for a defeated player -- Patch AlertPopup to correctly close when it cannot find a required asset -- Fix Capture when a teleport was necessary - -fix light/dark mode tooltip in the wiki - By alexban011 \ No newline at end of file +- Fix Capture when a teleport was necessary +- Tweak Overview Politics Diagram for a defeated player +- Patch AlertPopup to correctly close when it cannot find a required asset \ No newline at end of file