From f66930ed68c7b4666a7c5e9e4f1d5f6030c7419c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 13 Mar 2022 22:57:55 +0200 Subject: [PATCH] 3.19.17 --- .../translations/Brazilian_Portuguese.properties | 2 ++ .../jsons/translations/Bulgarian.properties | 2 ++ .../assets/jsons/translations/Czech.properties | 2 ++ .../assets/jsons/translations/Dutch.properties | 2 ++ .../assets/jsons/translations/English.properties | 2 ++ .../assets/jsons/translations/Filipino.properties | 2 ++ .../assets/jsons/translations/Finnish.properties | 2 ++ .../assets/jsons/translations/French.properties | 3 ++- .../assets/jsons/translations/Greek.properties | 2 ++ .../jsons/translations/Hungarian.properties | 2 ++ .../jsons/translations/Indonesian.properties | 2 ++ .../assets/jsons/translations/Italian.properties | 2 ++ .../assets/jsons/translations/Japanese.properties | 2 ++ .../assets/jsons/translations/Korean.properties | 2 ++ .../jsons/translations/Lithuanian.properties | 2 ++ .../assets/jsons/translations/Malay.properties | 2 ++ .../Persian_(Pinglish-DIN).properties | 2 ++ .../translations/Persian_(Pinglish-UN).properties | 2 ++ .../assets/jsons/translations/Polish.properties | 2 ++ .../jsons/translations/Portuguese.properties | 2 ++ .../assets/jsons/translations/Romanian.properties | 2 ++ .../assets/jsons/translations/Russian.properties | 2 ++ .../translations/Simplified_Chinese.properties | 3 +++ .../assets/jsons/translations/Spanish.properties | 3 ++- .../assets/jsons/translations/Swedish.properties | 2 ++ .../translations/Traditional_Chinese.properties | 2 ++ .../assets/jsons/translations/Turkish.properties | 2 ++ .../jsons/translations/Ukrainian.properties | 2 ++ changelog.md | 11 +++-------- docs/Modders/uniques.md | 15 ++++++++++++++- 30 files changed, 74 insertions(+), 11 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 087c7de737..20add6d4c2 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1359,6 +1359,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 38b369f7f3..3eab31688b 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -1546,6 +1546,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index ef71bd429e..62717d21fc 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -1192,6 +1192,8 @@ Pressure = Tlak # Religion overview screen Religion Name: = Jméno náboženství: + # Requires translation! +Pantheon Name: = Founding Civ: = Zakládající civilizace: Holy City: = Svaté město: Cities following this religion: = Města následující toto náboženství: diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index e1cc6793cf..0b4b782467 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1203,6 +1203,8 @@ Pressure = druk # Religion overview screen Religion Name: = Religie naam: + # Requires translation! +Pantheon Name: = Founding Civ: = Gesticht door: Holy City: = Heilige stad: Cities following this religion: = Steden met deze religie: diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index a28bc7dc82..efa634a402 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -2243,6 +2243,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index b174953db3..51414296a8 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -2115,6 +2115,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index f866e9b227..01852fe996 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -1477,6 +1477,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 15f927830c..928c9ab5fe 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1190,6 +1190,8 @@ Pressure = Emprise # Religion overview screen Religion Name: = Nom de la religion : + # Requires translation! +Pantheon Name: = Founding Civ: = Civ. fondatrice : Holy City: = Ville sainte : Cities following this religion: = Villes pratiquant cette religion : @@ -4027,7 +4029,6 @@ Pictish Courage = Courage Picte Home Sweet Home = Chaleur du Foyer [amount]% Strength decreasing with distance from the capital = [amount]% Puissance, diminuant avec la distance à la capitale - # Requires translation! [unit] ability = Compétence [unit] Heals [amount] damage if it kills a unit = Se soigne de [amount] dégâts s'il tue une unité diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 0feb9ef38f..01f1c1a25f 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -1875,6 +1875,8 @@ Pressure = Πίεση # Religion overview screen Religion Name: = Όνομα θρησκείας + # Requires translation! +Pantheon Name: = Founding Civ: = Ιδρυτής Holy City: = Ιερή πόλη # Requires translation! diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index c59d43987e..294412a76f 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -1512,6 +1512,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index cecab15fb1..9037ebbf09 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1190,6 +1190,8 @@ Pressure = Tekanan # Religion overview screen Religion Name: = Nama Agama: + # Requires translation! +Pantheon Name: = Founding Civ: = Peradaban Pendiri: Holy City: = Kota Suci: Cities following this religion: = Kota-kota pengikut agama ini: diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index b8e223eb91..f3ba106c47 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1193,6 +1193,8 @@ Pressure = Pressione # Religion overview screen Religion Name: = Nome religione + # Requires translation! +Pantheon Name: = Founding Civ: = Civiltà fondatrice Holy City: = Città santa Cities following this religion: = Città che seguono questa religione diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index dfd2368bb4..38ff2a92b3 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -1239,6 +1239,8 @@ Pressure = # Religion overview screen Religion Name: = 宗教名: + # Requires translation! +Pantheon Name: = Founding Civ: = 創設文明: Holy City: = 聖地: Cities following this religion: = この宗教が主流の都市 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 75d6fe5f0e..7e4f64c60a 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -1213,6 +1213,8 @@ Pressure = 압력 # Religion overview screen Religion Name: = 종교 이름: + # Requires translation! +Pantheon Name: = Founding Civ: = 창시자: Holy City: = 성도: Cities following this religion: = 믿는 도시: diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index fcf3689625..c0cf341466 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1589,6 +1589,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 7e9154e4e2..51634a3def 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1398,6 +1398,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index b64ddb9948..08371b89cb 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -1589,6 +1589,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index b07488b3be..8ebc287a38 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -1586,6 +1586,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index da4cda066b..8fa382fe7b 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1241,6 +1241,8 @@ Pressure = Presja # Religion overview screen Religion Name: = Nazwa Religii: + # Requires translation! +Pantheon Name: = Founding Civ: = Założona przez: Holy City: = Święte Miasto: Cities following this religion: = Miasta wyznające tę religię: diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index e46d206149..c07675d2fe 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1348,6 +1348,8 @@ Pressure = Pressão # Religion overview screen Religion Name: = Nome da Religião + # Requires translation! +Pantheon Name: = Founding Civ: = Civ fundador: # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 766a3e3757..69616d4a94 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1453,6 +1453,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 76353fd4e8..22bf74b75c 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -1197,6 +1197,8 @@ Pressure = Давление # Religion overview screen Religion Name: = Название религии: + # Requires translation! +Pantheon Name: = Founding Civ: = Основано цивилизацией: Holy City: = Священный город: Cities following this religion: = Городов, исповедующих эту религию: diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 2b2e784466..a95575a435 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -1203,6 +1203,8 @@ Pressure = 宗教压力 # Religion overview screen Religion Name: = 宗教名称: + # Requires translation! +Pantheon Name: = Founding Civ: = 建立的文明: Holy City: = 圣城： Cities following this religion: = 追随此教的城市 @@ -5358,6 +5360,7 @@ This means exploration and trade is important to grow your cities! = 这意味 #################### Lines from Unique Types ####################### + Nullifies [stat] [cityFilter] = 消除[cityFilter]的[stat] # Requires translation! Nullifies Growth [cityFilter] = diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 0f184717cd..68bd04f1a0 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -1190,6 +1190,8 @@ Pressure = Presión # Religion overview screen Religion Name: = Nombre de Religión: + # Requires translation! +Pantheon Name: = Founding Civ: = Civ Fundadora Holy City: = Ciudad Santa: Cities following this religion: = Ciudades siguiendo esta religión @@ -4025,7 +4027,6 @@ Pictish Courage = Coraje Picto Home Sweet Home = Hogar dulce hogar [amount]% Strength decreasing with distance from the capital = [amount]% La fuerza disminuye con la distancia de la capital - # Requires translation! [unit] ability = Habilidad de [unit] Heals [amount] damage if it kills a unit = Se cura [amount] de daño si mata a una unidad diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index d2d5232b8f..e674e380a9 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -1217,6 +1217,8 @@ Pressure = Tryck # Religion overview screen Religion Name: = Religion Namn: + # Requires translation! +Pantheon Name: = Founding Civ: = Grundande Civilisation: Holy City: = Helig Stad: Cities following this religion: = Städer som följer denna religion: diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index e9d7404fcb..4541376f41 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -1511,6 +1511,8 @@ Pressure = # Requires translation! Religion Name: = # Requires translation! +Pantheon Name: = + # Requires translation! Founding Civ: = # Requires translation! Holy City: = diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 8e3d4659ab..5ac5a0059c 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -1336,6 +1336,8 @@ Pressure = Baskı # Religion overview screen Religion Name: = Din Adı: + # Requires translation! +Pantheon Name: = Founding Civ: = Kurucu Medeniyet: Holy City: = Mukaddes Şehri: Cities following this religion: = Bu dini benimsemiş şehirler: diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index edeab67757..4025310c6c 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -1245,6 +1245,8 @@ Pressure = Тиск # Religion overview screen Religion Name: = Назва релігії: + # Requires translation! +Pantheon Name: = Founding Civ: = Заснована цивілізацією: Holy City: = Св'яте місто: Cities following this religion: = Міста, що сповідують цю релігію: diff --git a/changelog.md b/changelog.md index 014f4f5743..8e68687109 100644 --- a/changelog.md +++ b/changelog.md @@ -1,17 +1,12 @@ ## 3.19.17 -Resolved - now shows conditionals precluding construction of units - -More unique cleanup - -Unique deprecation +Better displaying of units that cannot be built By SomeTroglodyte: - Support more freely modded Worker-like units -- Religion overview improved +- Religion overview improved - Mod checker minor improvements -- Fix 1 Spectator N AI games in seemingly endless loop -- Add Filipino.png since the Translation file is already there +- Fixed Spectator & AI games in seemingly endless loop Multiplayer code cleanup - By GGGuenni diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index aebe1e3f05..2a388351b2 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -569,7 +569,7 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl ??? example "[amount]% tile improvement construction time" Example: "[20]% tile improvement construction time" - Applicable to: Global + Applicable to: Global, Unit ??? example "[amount]% Gold from Great Merchant trade missions" Example: "[20]% Gold from Great Merchant trade missions" @@ -869,6 +869,19 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: Building +??? example "Can only be built [cityFilter]" + Example: "Can only be built [in all cities]" + + Applicable to: Building + +??? example "Must have an owned [tileFilter] within [amount] tiles" + Example: "Must have an owned [Farm] within [20] tiles" + + Applicable to: Building + +??? example "Enables nuclear weapon" + Applicable to: Building + ??? example "Must be on [terrainFilter]" Example: "Must be on [Forest]"