This commit is contained in:
Yair Morgenstern 2024-02-26 22:47:43 +02:00
parent f34948d0c2
commit 1101f42957
42 changed files with 98 additions and 55 deletions

View File

@ -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] =

View File

@ -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] =

View File

@ -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] =

View File

@ -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]

View File

@ -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] =

View File

@ -2254,6 +2254,8 @@ during a Golden Age = durant una edat dor
during We Love The King Day = durant el Dia del Rei
while the empire is happy = mentre limperi é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]

View File

@ -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]

View File

@ -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]

View File

@ -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] =

View File

@ -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]

View File

@ -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] =

View File

@ -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.

View File

@ -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]

View File

@ -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] =

View File

@ -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

View File

@ -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.

View File

@ -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]

View File

@ -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]の前

View File

@ -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] 전까지

View File

@ -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] =

View File

@ -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]

View File

@ -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] =

View File

@ -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] =

View File

@ -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] =

View File

@ -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])

View File

@ -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] =

View File

@ -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] =

View File

@ -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]

View File

@ -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]

View File

@ -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]前

View File

@ -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]

View File

@ -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]

View File

@ -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]之前

View File

@ -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

View File

@ -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]

View File

@ -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]

View File

@ -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

View File

@ -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!
Added ConditionalAboveHappiness unique - By PLynx01
Added ConditionalAboveHappiness unique - By PLynx01
## 4.10.12

View File

@ -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()

View File

@ -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

View File

@ -1910,6 +1910,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Conditional
??? example "&lt;when above [amount] Happiness&gt;"
Example: "&lt;when above [3] Happiness&gt;"
Applicable to: Conditional
??? example "&lt;when below [amount] Happiness&gt;"
Example: "&lt;when below [3] Happiness&gt;"

View File

@ -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!
Added ConditionalAboveHappiness unique - By PLynx01
Added ConditionalAboveHappiness unique - By PLynx01