From 1101f429571240a6ab7c713135342ed9ec19605b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 26 Feb 2024 22:47:43 +0200 Subject: [PATCH] 4.10.13 --- .../jsons/translations/Afrikaans.properties | 2 ++ .../jsons/translations/Belarusian.properties | 2 ++ .../jsons/translations/Bosnian.properties | 2 ++ .../Brazilian_Portuguese.properties | 2 ++ .../jsons/translations/Bulgarian.properties | 2 ++ .../jsons/translations/Catalan.properties | 2 ++ .../jsons/translations/Czech.properties | 2 ++ .../jsons/translations/Dutch.properties | 2 ++ .../jsons/translations/English.properties | 2 ++ .../jsons/translations/Filipino.properties | 2 ++ .../jsons/translations/Finnish.properties | 2 ++ .../jsons/translations/French.properties | 6 ++--- .../jsons/translations/German.properties | 2 ++ .../jsons/translations/Greek.properties | 2 ++ .../jsons/translations/Hungarian.properties | 2 ++ .../jsons/translations/Indonesian.properties | 6 ++--- .../jsons/translations/Italian.properties | 2 ++ .../jsons/translations/Japanese.properties | 2 ++ .../jsons/translations/Korean.properties | 2 ++ .../jsons/translations/Latin.properties | 2 ++ .../jsons/translations/Lithuanian.properties | 2 ++ .../jsons/translations/Malay.properties | 2 ++ .../Persian_(Pinglish-DIN).properties | 2 ++ .../Persian_(Pinglish-UN).properties | 2 ++ .../jsons/translations/Polish.properties | 2 ++ .../jsons/translations/Portuguese.properties | 2 ++ .../jsons/translations/Romanian.properties | 2 ++ .../jsons/translations/Russian.properties | 2 ++ .../jsons/translations/Rusyn.properties | 2 ++ .../Simplified_Chinese.properties | 2 ++ .../jsons/translations/Spanish.properties | 2 ++ .../jsons/translations/Swedish.properties | 2 ++ .../Traditional_Chinese.properties | 2 ++ .../jsons/translations/Turkish.properties | 2 ++ .../jsons/translations/Ukrainian.properties | 2 ++ .../jsons/translations/Vietnamese.properties | 2 ++ .../completionPercentages.properties | 4 +-- changelog.md | 24 +++++------------ .../models/ruleset/unique/Conditionals.kt | 4 +-- .../2-Civilization-related-JSON-files.md | 10 +++---- docs/Modders/uniques.md | 5 ++++ .../metadata/android/en-US/changelogs/972.txt | 26 +++++-------------- 42 files changed, 98 insertions(+), 55 deletions(-) diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index ef5a7163d9..27f83cc55b 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -3778,6 +3778,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index 4d1a77f028..8ec22c68c6 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -3701,6 +3701,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties index 1b42531f15..1c04ae742a 100644 --- a/android/assets/jsons/translations/Bosnian.properties +++ b/android/assets/jsons/translations/Bosnian.properties @@ -4012,6 +4012,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index ec5f5e4b51..86ef8cda0a 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2254,6 +2254,8 @@ during a Golden Age = durante uma Idade de Ouro during We Love The King Day = durante o dia de Nós Amamos o Rei while the empire is happy = enquanto o império está feliz when between [amount] and [amount2] Happiness = quando entre [amount] e [amount2] de Felicidade + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = quando abaixo de [amount] de Felicidade during the [era] = durante o período [era] before the [era] = antes da [era] diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index b21ad2757d..14b8f3118b 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -3098,6 +3098,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index ae4bc1f1f6..63ac934a3e 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -2254,6 +2254,8 @@ during a Golden Age = durant una edat d’or during We Love The King Day = durant el Dia del Rei while the empire is happy = mentre l’imperi és feliç when between [amount] and [amount2] Happiness = quan té entre [amount] i [amount2] de felicitat + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = quan té menys de [amount] de felicitat during the [era] = durant l’[era] before the [era] = abans de l’[era] diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index ca5b4c48e0..8b4f2438a4 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -2619,6 +2619,8 @@ during a Golden Age = během Zlatého věku during We Love The King Day = while the empire is happy = je-li říše spokojená when between [amount] and [amount2] Happiness = při spokojenosti mezi [amount] a [amount2] + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = při menší spokojenosti než [amount] during the [era] = během éry [era] before the [era] = před érou [era] diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 77ce9ecb08..335735f061 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -2267,6 +2267,8 @@ during a Golden Age = tijdens een Gouden Tijdperk during We Love The King Day = tijdens Wij Houden Van De Koning Dag while the empire is happy = terwijl het rijk gelukkig is when between [amount] and [amount2] Happiness = wanneer tussen [amount] en [amount2] Geluk + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = wanneer onder [amount] Geluk during the [era] = tijdens het [era] before the [era] = voor het [era] diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 13a22e95d0..eab8732e77 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -4208,6 +4208,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index e6d251c060..8c02d0501c 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -2446,6 +2446,8 @@ during a Golden Age = sa loob ng Ginintuang Panahon during We Love The King Day = sa kasagsagan ng Araw ng Ating Mahal na Hari while the empire is happy = tuwing maligaya ang imperyo when between [amount] and [amount2] Happiness = kapag nasa pagitan ng [amount] at [amount2] na Kaligayahan + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = kapag bababa ng [amount] Kaligayahan during the [era] = sa loob ng [era] before the [era] = bago ang [era] diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 119f145fc6..eef349baff 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -3230,6 +3230,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index a410c6faa6..637cf031c2 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1107,9 +1107,7 @@ Sleep = Dormir Sleep until healed = Dormir jusqu'à guérison Moving = En mouvement Set up = Installer - # Requires translation! Escort formation = Formation d'escorte - # Requires translation! Stop Escort formation = Fin de l'escorte Paradrop = Parachutage Air Sweep = Balayage aérien @@ -2256,6 +2254,8 @@ during a Golden Age = durant un Âge d'Or during We Love The King Day = pendant la Fête du Roi while the empire is happy = quand l'empire est heureux when between [amount] and [amount2] Happiness = quand entre [amount] et [amount2] Bonheur + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = quand en dessous de [amount] Bonheur during the [era] = pendant [era] before the [era] = avant [era] @@ -6759,9 +6759,7 @@ UI Tips = Astuces d'interface Toggle notification list display = Afficher/Cacher la liste des notifications On the World screen, swipe the notification list to the right to temporarily hide it. Click the "Bell" button to display them again. = Sur l'écran Carte, balayez la liste des notifications vers la droite pour la cacher temporairement. Cliquez sur l'icône "Cloche" pour l'afficher de nouveau. The default state for the notification list can be set in Options > Display > UI - Notifications on world screen. = L'état par défaut de la liste des notifications peut être défini dans Options > Affichage > Interface - Affichage des notifications sur la carte. - # Requires translation! Entering a city screen quickly = Accéder à l'écran de ville - # Requires translation! You can Right-click or long press a city button on the World screen. The result is the same as tapping it twice - once to select and move the button, again to trigger a reaction: show the city screen (if the city is yours to inspect), or offer the foreign city info popup. = Un clic droit ou maintenir le bouton d'une ville sur l'écran Carte permet d'accéder rapidement à l'écran de cette ville. Le résultat est le même que deux clics, le premier pour sélectionner la ville et déplacer le bouton, le suivant pour accéder à l'écran de la ville (si elle appartient au joueur), ou bien afficher la fenêtre d'information d'une ville étrangère. Additional controls for the construction queue = Contrôles additionnels pour la file de construction Right-click or long press a construction item to open a popup menu with additional controls, allowing to manage production of the same item in all cities, by issuing the commands from the same City screen. = Effectuez un clic droit ou maintenez un objet de construction pour afficher des contrôles additionnels permettant de gérer la production d'un même objet dans toutes les villes, et ce, en émettant l'ordre depuis le même Écran de ville. diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 42dd81b0df..051e2fdac7 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2266,6 +2266,8 @@ during a Golden Age = während eines Goldenen Zeitalters during We Love The King Day = während 'Wir lieben den König'-Tag while the empire is happy = solange die Bevölkerung glücklich ist when between [amount] and [amount2] Happiness = wenn zwischen [amount] und [amount2] Zufriedenheit + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = wenn unterhalb [amount] Zufriedenheit during the [era] = während [era] before the [era] = vor [era] diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 2dcf9cbd95..4f80b9eeec 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -3822,6 +3822,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 99d0652e51..3b677db4de 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -2272,6 +2272,8 @@ during a Golden Age = az Aranykor időtartama alatt during We Love The King Day = a Szeretett Uralkodónk Napja idején while the empire is happy = amíg a birodalom boldog when between [amount] and [amount2] Happiness = [amount] és [amount2] boldogság között + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = [amount] boldogság alatt during the [era] = [era] idején before the [era] = [era] előtt diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index c4cc3c3808..86db66ed07 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1107,9 +1107,7 @@ Sleep = Istirahat Sleep until healed = Istirahat hingga pulih Moving = Bergerak Set up = Persiapkan - # Requires translation! Escort formation = Formasi Kawalan - # Requires translation! Stop Escort formation = Hentikan formasi Kawalan Paradrop = Terjun payung Air Sweep = Sweeping Udara @@ -2256,6 +2254,8 @@ during a Golden Age = di saat Masa Kejayaan during We Love The King Day = saat Hari Kami Mencintai Raja while the empire is happy = selama kekaisaran sedang bahagia when between [amount] and [amount2] Happiness = saat memiliki antara [amount] dan [amount2] Kebahagiaan + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = saat memiliki kurang dari [amount] Kebahagiaan during the [era] = selama [era] before the [era] = sebelum [era] @@ -6759,9 +6759,7 @@ UI Tips = Tip UI Toggle notification list display = Nyalakan/matikan tampilan daftar notifikasi On the World screen, swipe the notification list to the right to temporarily hide it. Click the "Bell" button to display them again. = Pada Layar Dunia, geser daftar notifikasi ke kanan untuk menyembunyikannya sementara. Klik tombol "Lonceng" untuk menampilkannya lagi. The default state for the notification list can be set in Options > Display > UI - Notifications on world screen. = Keadaan standar untuk daftar notifikasi bisa diatur di Pengaturan > Tampilan > UI - Notifikasi pada layar dunia. - # Requires translation! Entering a city screen quickly = Masuk layar kota secepatnya - # Requires translation! You can Right-click or long press a city button on the World screen. The result is the same as tapping it twice - once to select and move the button, again to trigger a reaction: show the city screen (if the city is yours to inspect), or offer the foreign city info popup. = Kamu bisa klik Kanan atau tekan lama tombol kota di layar Dunia. Hasilnya sama seperti mengetuknya dua kali - sekali untuk memilih atau memindahkan tombol, lagi untuk memicu reaksi: tunjukkan layar kota (jika kotanya adalah milikmu untuk diperiksa), atau menawarkan info popup kota asing. Additional controls for the construction queue = Kendali tambahan untuk antrean pembangunan Right-click or long press a construction item to open a popup menu with additional controls, allowing to manage production of the same item in all cities, by issuing the commands from the same City screen. = Klik kanan atau tekan suatu barang yang lama untuk membuka menu pop-up dengan kendali tambahan yang akan mengizinkan pengelolaan produksi barang-barang yang sama di semua kota, dengan menerbitkan perintah dari layar kota yang sama. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 90eca8a34b..eb8b732c73 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2254,6 +2254,8 @@ during a Golden Age = durante un'Età dell'Oro during We Love The King Day = durante la festa Viva il Re while the empire is happy = mentre l'impero è felice when between [amount] and [amount2] Happiness = se la Felicità è tra [amount] e [amount2] + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = quando la Felicità è sotto di [amount] during the [era] = durante l'[era] before the [era] = prima dell'[era] diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 27c8c90552..99eb3732d0 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -2384,6 +2384,8 @@ during a Golden Age = 黄金時代の間 during We Love The King Day = while the empire is happy = 国家が幸福である間 when between [amount] and [amount2] Happiness = 幸福度が[amount]から[amount2]までのとき + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = 幸福度が[amount]より低いとき during the [era] = [era]の間 before the [era] = [era]の前 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 81b2575267..90fd9354f6 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -2280,6 +2280,8 @@ during a Golden Age = 황금기 동안 during We Love The King Day = 국왕 경축일 동안 while the empire is happy = 행복 상태일 때 when between [amount] and [amount2] Happiness = 행복도 [amount] ~ [amount2] 사이일 때 + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = 행복도 [amount] 이하일 때 during the [era] = [era] 동안 before the [era] = [era] 전까지 diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index f40203b69d..f32eeed8ad 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -3955,6 +3955,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 164d889796..6fd9584715 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -2567,6 +2567,8 @@ during a Golden Age = Aukso amžiaus metu during We Love The King Day = švenčių metu while the empire is happy = kol imperija laiminga when between [amount] and [amount2] Happiness = kada laimingumas yra tarp [amount] iki [amount2] + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = kada mažiau [amount] laimingumo during the [era] = Kai era: [era] before the [era] = iki: [era] diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index d9d793b581..b278cd3f8b 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -3149,6 +3149,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 5b4bb200c5..8885c16790 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -3601,6 +3601,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 2ececed0d5..770f6fe59c 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -3172,6 +3172,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 2de0836b38..382e758d04 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2265,6 +2265,8 @@ during a Golden Age = podczas Złotej Ery during We Love The King Day = podczas Dnia Uwielbienia Króla while the empire is happy = jeśli Obywatele są ⌣Zadowoleni when between [amount] and [amount2] Happiness = kiedy Zadowolenie wynosi [amount] do [amount2] + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = kiedy Zadowolenie jest poniżej [amount] during the [era] = podczas [era] before the [era] = (przed: [era]) diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 482f5edbad..af4a9acf8c 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -2669,6 +2669,8 @@ while the empire is happy = enquanto o império estiver feliz # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 122d3690a8..0e1f8ba112 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -2535,6 +2535,8 @@ while the empire is happy = în timp ce imperiul este fericit # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = # Requires translation! during the [era] = diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 56980921b6..05ff05d173 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2284,6 +2284,8 @@ during a Golden Age = во время золотого века during We Love The King Day = во время Дня любви к отчизне while the empire is happy = когда цивилизация счастлива when between [amount] and [amount2] Happiness = когда счастье между [amount] и [amount2] + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = когда меньше [amount] счастья during the [era] = во время эпохи: [era] before the [era] = до эпохи: [era] diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties index 6b701c5011..92f48fd760 100644 --- a/android/assets/jsons/translations/Rusyn.properties +++ b/android/assets/jsons/translations/Rusyn.properties @@ -3542,6 +3542,8 @@ while the empire is happy = # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = during the [era] = у час [era] before the [era] = сперед [era] diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 0b0bd6bb63..21082a0134 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -2258,6 +2258,8 @@ during a Golden Age = 黄金时代期间 during We Love The King Day = “我们爱戴领袖日”期间 while the empire is happy = 处于快乐时 when between [amount] and [amount2] Happiness = 快乐在[amount]到[amount2]之间时 + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = 快乐低于[amount]时 during the [era] = 处于[era]时 before the [era] = 在[era]前 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 9658657485..5e740ce70f 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2265,6 +2265,8 @@ during a Golden Age = durante una Edad Dorada during We Love The King Day = durante el Día de Amamos al Rey while the empire is happy = mientras el imperio es feliz when between [amount] and [amount2] Happiness = cuando entre [amount] y [amount2] Felicidad + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = cuando por debajo de[amount] felicidad during the [era] = durante el [era] before the [era] = antes de [era] diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 0c8c8df3fe..68f490c770 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -2579,6 +2579,8 @@ during a Golden Age = under en Guldålder during We Love The King Day = while the empire is happy = medan riket är lyckligt when between [amount] and [amount2] Happiness = då mellan [amount] och [amount2] Lycka + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = då under [amount] Lycka during the [era] = under [era] before the [era] = innan [era] diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 7fc1ab334c..4d9efdf5aa 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -2381,6 +2381,8 @@ during a Golden Age = 黃金時代期間 during We Love The King Day = 在我們愛國王日時 while the empire is happy = 當帝國很高興時 when between [amount] and [amount2] Happiness = 當快樂介於[amount]到[amount2]之間時 + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = 當低於[amount]快樂時 during the [era] = 處於[era] before the [era] = 在[era]之前 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 9f43b15874..aa762fa324 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -2461,6 +2461,8 @@ while the empire is happy = imparatorluk mutluyken # Requires translation! when between [amount] and [amount2] Happiness = # Requires translation! +when above [amount] Happiness = + # Requires translation! when below [amount] Happiness = during the [era] = [era] çağındayken before the [era] = [era] çağından önce diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 98e77a8965..316c33bd37 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2307,6 +2307,8 @@ during a Golden Age = під час Золотої доби during We Love The King Day = під час Дня Любові до Короля while the empire is happy = поки імперія щаслива when between [amount] and [amount2] Happiness = коли більше [amount] та менше [amount2] ⌣Щастя + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = коли менше [amount] ⌣Щастя during the [era] = протягом [era] before the [era] = до [era] diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 6e4a48b7c2..12b19206dd 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -2564,6 +2564,8 @@ during a Golden Age = trong thời kỳ hoàng kim during We Love The King Day = trong Ngày Chúng ta Yêu Vua while the empire is happy = trong khi đế chế hạnh phúc when between [amount] and [amount2] Happiness = khi từ [amount] đến [amount2] Hạnh phúc + # Requires translation! +when above [amount] Happiness = when below [amount] Happiness = khi ở dưới [amount] Hạnh phúc during the [era] = trong [era] before the [era] = trước [era] diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 7c41ec1c93..777765cda4 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -3,7 +3,7 @@ Belarusian = 9 Bosnian = 3 Brazilian_Portuguese = 99 Bulgarian = 43 -Catalan = 98 +Catalan = 99 Czech = 79 Dutch = 97 English = 0 @@ -16,7 +16,7 @@ Hungarian = 78 Indonesian = 99 Italian = 99 Japanese = 84 -Korean = 96 +Korean = 95 Latin = 7 Lithuanian = 88 Malay = 25 diff --git a/changelog.md b/changelog.md index 0d74573367..ea1e67acd3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,30 +1,18 @@ ## 4.10.13 -Resolved - Add AI for land-based nukes - -Fixed game load, removed extraneous getBaseUnit() function - -changed requiredTech to revealedBy in tileResources json schema, added deposit amounts and improvedBy - -Added resourceType field to tileResources json schema - -json schema for tileResources +Add AI for land-based nuke units Keep opened mods open and at top of list when reloading mods in 'locate mod errors' tab -Resolves - above/below HP conditionals work outside of combat +above/below HP conditionals work outside of combat -Resolves - update uniques upon taking damage and other situations - -Move takeDamage function from MapUnitCombatant to MApUnit where it belongs - -'cached unique' documentation is within collapsible block +update uniques upon taking damage and other situations By SomeTroglodyte: -- New notifications bell icon with actual count -- Fix TabbedPager geometry - the cell for the close button needs to be ignored in the rest of the Table! +- New notifications bell icon with actual count +- Fix TabbedPager geometry - the cell for the close button needs to be ignored in the rest of the Table! -Added ConditionalAboveHappiness unique - By PLynx01 +Added ConditionalAboveHappiness unique - By PLynx01 ## 4.10.12 diff --git a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt index c187bf6bdb..c19df380ee 100644 --- a/core/src/com/unciv/models/ruleset/unique/Conditionals.kt +++ b/core/src/com/unciv/models/ruleset/unique/Conditionals.kt @@ -203,9 +203,9 @@ object Conditionals { UniqueType.ConditionalUnitWithoutPromotion -> relevantUnit?.promotions?.promotions?.contains(condition.params[0]) == false UniqueType.ConditionalAttacking -> state.combatAction == CombatAction.Attack UniqueType.ConditionalDefending -> state.combatAction == CombatAction.Defend - UniqueType.ConditionalAboveHP -> state.unit != null && state.unit.health > condition.params[0].toInt() + UniqueType.ConditionalAboveHP -> relevantUnit != null && relevantUnit!!.health > condition.params[0].toInt() || state.ourCombatant != null && state.ourCombatant.getHealth() > condition.params[0].toInt() - UniqueType.ConditionalBelowHP -> state.unit != null && state.unit.health < condition.params[0].toInt() + UniqueType.ConditionalBelowHP -> relevantUnit != null && relevantUnit!!.health < condition.params[0].toInt() ||state.ourCombatant != null && state.ourCombatant.getHealth() < condition.params[0].toInt() UniqueType.ConditionalHasNotUsedOtherActions -> state.unit == null || // So we get the action as a valid action in BaseUnit.hasUnique() diff --git a/docs/Modders/Mod-file-structure/2-Civilization-related-JSON-files.md b/docs/Modders/Mod-file-structure/2-Civilization-related-JSON-files.md index e768d4c4f6..68f4e5ad9e 100644 --- a/docs/Modders/Mod-file-structure/2-Civilization-related-JSON-files.md +++ b/docs/Modders/Mod-file-structure/2-Civilization-related-JSON-files.md @@ -8,11 +8,11 @@ This file contains the beliefs that can be chosen for religions in your mod. Each belief has the following structure: -| Attribute | Type | Default | Notes | -| --------- | ---- | ------- | ----- | -| name | String | Required | | -| type | Enum | Required | Type of belief. Value must be Pantheon, Founder, Follower or Enhancer | -| uniques | List of Strings | empty | List of [unique abilities](../uniques) this belief adds to cities following it | +| Attribute | Type | Default | Notes | +| --------- | ---- | ------- |-------------------------------------------------------------------------------| +| name | String | Required | | +| type | Enum | Required | Type of belief. Value must be Pantheon, Founder, Follower or Enhancer | +| uniques | List of Strings | empty | List of [unique abilities](../) this belief adds to cities following it | | civilopediaText | List | empty | See [civilopediaText chapter](5-Miscellaneous-JSON-files.md#civilopedia-text) | ## Buildings.json diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index 58b35bcce7..926f53406c 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -1910,6 +1910,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: Conditional +??? example "<when above [amount] Happiness>" + Example: "<when above [3] Happiness>" + + Applicable to: Conditional + ??? example "<when below [amount] Happiness>" Example: "<when below [3] Happiness>" diff --git a/fastlane/metadata/android/en-US/changelogs/972.txt b/fastlane/metadata/android/en-US/changelogs/972.txt index 33db6be2bb..bdc07dffa0 100644 --- a/fastlane/metadata/android/en-US/changelogs/972.txt +++ b/fastlane/metadata/android/en-US/changelogs/972.txt @@ -1,27 +1,13 @@ - - -Resolved - Add AI for land-based nukes - -Fixed game load, removed extraneous getBaseUnit() function - -changed requiredTech to revealedBy in tileResources json schema, added deposit amounts and improvedBy - -Added resourceType field to tileResources json schema - -json schema for tileResources +Add AI for land-based nuke units Keep opened mods open and at top of list when reloading mods in 'locate mod errors' tab -Resolves - above/below HP conditionals work outside of combat +above/below HP conditionals work outside of combat -Resolves - update uniques upon taking damage and other situations - -Move takeDamage function from MapUnitCombatant to MApUnit where it belongs - -'cached unique' documentation is within collapsible block +update uniques upon taking damage and other situations By SomeTroglodyte: -- New notifications bell icon with actual count -- Fix TabbedPager geometry - the cell for the close button needs to be ignored in the rest of the Table! +- New notifications bell icon with actual count +- Fix TabbedPager geometry - the cell for the close button needs to be ignored in the rest of the Table! -Added ConditionalAboveHappiness unique - By PLynx01 \ No newline at end of file +Added ConditionalAboveHappiness unique - By PLynx01 \ No newline at end of file