From c12afb4131367577316180c06d46dee8da572620 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 3 Dec 2020 23:29:36 +0200 Subject: [PATCH] "have signed the peace treaty" -> "have signed a peace treaty" --- .../translations/Brazilian_Portuguese.properties | 2 +- android/assets/jsons/translations/Czech.properties | 2 +- android/assets/jsons/translations/English.properties | 2 +- android/assets/jsons/translations/Finnish.properties | 2 +- android/assets/jsons/translations/French.properties | 2 +- android/assets/jsons/translations/German.properties | 2 +- android/assets/jsons/translations/Italian.properties | 2 +- .../assets/jsons/translations/Japanese.properties | 2 +- android/assets/jsons/translations/Korean.properties | 2 +- .../assets/jsons/translations/Lithuanian.properties | 2 +- .../translations/Persian_(Pinglish-UN).properties | 2 +- android/assets/jsons/translations/Polish.properties | 2 +- .../assets/jsons/translations/Portuguese.properties | 2 +- .../assets/jsons/translations/Romanian.properties | 2 +- android/assets/jsons/translations/Russian.properties | 2 +- .../jsons/translations/Simplified_Chinese.properties | 2 +- android/assets/jsons/translations/Spanish.properties | 2 +- .../translations/Traditional_Chinese.properties | 2 +- android/assets/jsons/translations/Turkish.properties | 2 +- .../assets/jsons/translations/Ukrainian.properties | 2 +- .../assets/jsons/translations/Vietnamese.properties | 2 +- .../assets/jsons/translations/template.properties | 2 +- core/src/com/unciv/logic/city/CityConstructions.kt | 5 ++--- core/src/com/unciv/logic/city/CityStats.kt | 12 ++++++------ .../logic/civilization/diplomacy/DiplomacyManager.kt | 2 +- 25 files changed, 31 insertions(+), 32 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 59c23ffe01..1f2d451120 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Condenar ([numberOfTurns] turnos) We will remember this. = Nós iremos lembrar disto. [civName] has declared war on [targetCivName]! = [civName] declarou guerra contra [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] e [targetCivName] assinaram um Tratado de Paz! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] e [targetCivName] assinaram um Tratado de Paz! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] assinaram a Declaração de Amizade! [civName] has denounced [targetCivName]! = [civName] condenou [targetCivName]! diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 7df7a36979..fb61f1b37f 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Odsoudit ([numberOfTurns] kol) We will remember this. = To vám nikdy nezapomeneme. [civName] has declared war on [targetCivName]! = Civilizace [civName] vyhlásila válku civilizaci [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = Civilizace [civName] and [targetCivName] podepsaly Mírovou Dohodu! +[civName] and [targetCivName] have signed a Peace Treaty! = Civilizace [civName] and [targetCivName] podepsaly Mírovou Dohodu! [civName] and [targetCivName] have signed the Declaration of Friendship! = Civilizace [civName] a [targetCivName] podepsaly Vyhlášení přátelství! [civName] has denounced [targetCivName]! = Civilizace [civName] odsoudila civilizaci [targetCivName]! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 5ae439e248..57b180d6c2 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -147,7 +147,7 @@ We will remember this. = # Requires translation! [civName] has declared war on [targetCivName]! = # Requires translation! -[civName] and [targetCivName] have signed the Peace Treaty! = +[civName] and [targetCivName] have signed a Peace Treaty! = # Requires translation! [civName] and [targetCivName] have signed the Declaration of Friendship! = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index ff5b636d76..68d0009c67 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -83,7 +83,7 @@ Denounce ([numberOfTurns] turns) = Tuomitse ([numberOfTurns] vuoroksi) We will remember this. = Tulemme muistamaan tämän. [civName] has declared war on [targetCivName]! = [civName] on julistanut sodan sivilisaatiota [targetCivName] vastaan! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] ja [targetCivName] ovat solmineet Rauhan! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] ja [targetCivName] ovat solmineet Rauhan! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] ja [targetCivName] ovat tehneet Ystävyydenjulistuksen! [civName] has denounced [targetCivName]! = [civName] on tuominnut sivilisaation [targetCivName] diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index bde6636eb7..6cd4c0bc53 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -81,7 +81,7 @@ Denounce ([numberOfTurns] turns) = Dénoncer ([numberOfTurns] tours) We will remember this. = Nous nous en souviendrons. [civName] has declared war on [targetCivName]! = [civName] a déclaré la guerre à la civilisation [targetCivName] ! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] et [targetCivName] ont signé un traité de paix ! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] et [targetCivName] ont signé un traité de paix ! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] et [targetCivName] ont signé une déclaration d'amitié ! [civName] has denounced [targetCivName]! = [civName] a dénoncé la civilisation [targetCivName] ! diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 062b3da9ec..0c09b11c94 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Anprangern ([numberOfTurns] Runden) We will remember this. = Das werden wir nie vergessen! [civName] has declared war on [targetCivName]! = [civName] hat Krieg gegen [targetCivName] erklärt! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] und [targetCivName] haben den Friedensvertrag unterschrieben! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] und [targetCivName] haben den Friedensvertrag unterschrieben! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] und [targetCivName] haben die Freundschaftserklärung unterzeichnet! [civName] has denounced [targetCivName]! = [civName] hat [targetCivName] angeprangert! diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 71452de0df..e795906ae6 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Denuncia ([numberOfTurns] turni) We will remember this. = Non credere che ce lo scorderemo! [civName] has declared war on [targetCivName]! = [civName] ha dichiarato guerra a [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] ha siglato una pace con [targetCivName]! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] ha siglato una pace con [targetCivName]! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] hanno stretto una Dichiarazione d'Amicizia! [civName] has denounced [targetCivName]! = [civName] ha denunciato [targetCivName]! diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 2e063ad683..64be998d74 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = 非難([numberOfTurns]ターン) We will remember this. = 覚えてろ！ [civName] has declared war on [targetCivName]! = [civName]は[targetCivName]に宣戦布告しました！ -[civName] and [targetCivName] have signed the Peace Treaty! = [civName]と[targetCivName] は平和条約に署名しました +[civName] and [targetCivName] have signed a Peace Treaty! = [civName]と[targetCivName] は平和条約に署名しました [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] と[targetCivName] は友好宣言に署名しました [civName] has denounced [targetCivName]! = [civName]は[targetCivName]を非難しました！ diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 87e0a25fe3..78401ec14b 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = 비난 ([numberOfTurns] 턴 동안) We will remember this. = 우리는 이 일을 기억할 것입니다. [civName] has declared war on [targetCivName]! = [civName]이(가) [targetCivName]에게 전쟁을 선포했습니다! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName]와(과) [targetCivName]이(가) 평화조약을 체결했습니다! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName]와(과) [targetCivName]이(가) 평화조약을 체결했습니다! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName]와(과) [targetCivName]이(가) 동맹 관계를 맺었습니다! [civName] has denounced [targetCivName]! = [civName]이(가) [targetCivName]을(를) 공개적으로 비난했습니다! diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d61416bab5..c359ccc8fa 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -86,7 +86,7 @@ Denounce ([numberOfTurns] turns) = Denonsuoti ([numberOfTurns] virsta) We will remember this. = Mes tai atsiminsime. [civName] has declared war on [targetCivName]! = [civName] paskelbė karą [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] ir [targetCivName] pasirašė Taikos sutartį! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] ir [targetCivName] pasirašė Taikos sutartį! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] ir [targetCivName] pasirašė draugystės deklaraciją! [civName] has denounced [targetCivName]! = [civName] pasmerkė [targetCivName]! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index d0e6000a95..1143d5629a 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -80,7 +80,7 @@ Denounce ([numberOfTurns] turns) = Dar jaame’e ye jahaani mahkoom kardan ([num We will remember this. = Maa inraa be yaad khaahim daasht. [civName] has declared war on [targetCivName]! = [civName] be [targetCivName] e’elaam jang karde ast! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] va [targetCivName] baa ham Mo’aahede ye Solh bastand! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] va [targetCivName] baa ham Mo’aahede ye Solh bastand! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] va [targetCivName] baa ham peymaan doosti bastand! [civName] has denounced [targetCivName]! = [civName], [targetCivName] raa mahkoom karde ast! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index dc516b4aeb..413d20e6d2 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -80,7 +80,7 @@ Denounce ([numberOfTurns] turns) = Potępienie ([numberOfTurns] tur) We will remember this. = Zapamiętamy to. [civName] has declared war on [targetCivName]! = Cywilizacja [civName] wypowiedziała wojnę cywilizacji [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] oraz [targetCivName] podpisały Traktat Pokojowy! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] oraz [targetCivName] podpisały Traktat Pokojowy! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] oraz [targetCivName] podpisały Deklarację Przyjaźni! [civName] has denounced [targetCivName]! = Cywilizacja [civName] potępiła cywilizację [targetCivName]! diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index df4d77880a..f6ba06311c 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -84,7 +84,7 @@ Denounce ([numberOfTurns] turns) = Condenar ([numberOfTurns] turnos) We will remember this. = Nós nos lembraremos disso. [civName] has declared war on [targetCivName]! = [civName] declarou guerra contra [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] e [targetCivName] assinaram um Tratado de Paz! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] e [targetCivName] assinaram um Tratado de Paz! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] assinaram a Declaração de Amizade! [civName] has denounced [targetCivName]! = [civName] condenou [targetCivName]! diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 3e0cbe8201..41c448d6cb 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -84,7 +84,7 @@ Denounce ([numberOfTurns] turns) = Denunță ([numberOfTurns] ture) We will remember this. = O să ținem minte asta. [civName] has declared war on [targetCivName]! = [civName] a declarat război împotriva [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] împreună cu [targetCivName] au semnat tratatul de pace! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] împreună cu [targetCivName] au semnat tratatul de pace! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] împreună cu [targetCivName] au semnat declarația de prietenie! [civName] has denounced [targetCivName]! = [civName] a denunțat [targetCivName]! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 381175ff41..4a6a2a9138 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Осуждение ([numberOfTurns] ходо We will remember this. = Мы это запомним. [civName] has declared war on [targetCivName]! = [civName] объявляет войну державе [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] и [targetCivName] подписали мирное соглашение! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] и [targetCivName] подписали мирное соглашение! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] и [targetCivName] подписали декларацию дружбы! [civName] has denounced [targetCivName]! = [civName] осуждает державу [targetCivName]! diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index c721e47230..404558ce4a 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = 谴责([numberOfTurns]回合) We will remember this. = 这种侮辱我们绝不会忘记。请好自为之！ [civName] has declared war on [targetCivName]! = [civName]向[targetCivName]宣战！ -[civName] and [targetCivName] have signed the Peace Treaty! = [civName]和[targetCivName]签署了和平条约！ +[civName] and [targetCivName] have signed a Peace Treaty! = [civName]和[targetCivName]签署了和平条约！ [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName]和[targetCivName]签署了友谊宣言！ [civName] has denounced [targetCivName]! = [civName]谴责了[targetCivName]！ diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index e9220be3ab..0f6a347680 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Denunciar ([numberOfTurns] turnos)] We will remember this. = ¡Recordaremos esto! [civName] has declared war on [targetCivName]! = ¡[civName] ha declarado la guerra a [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = ¡[civName] y [targetCivName] han firmado un tratado de paz! +[civName] and [targetCivName] have signed a Peace Treaty! = ¡[civName] y [targetCivName] han firmado un tratado de paz! [civName] and [targetCivName] have signed the Declaration of Friendship! = ¡[civName] y [targetCivName] han firmado una declaración de amistad! [civName] has denounced [targetCivName]! = ¡[civName] ha denunciado a [targetCivName]! diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index c287f163a7..d93fcff841 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -83,7 +83,7 @@ Denounce ([numberOfTurns] turns) = 譴責([numberOfTurns]回合) We will remember this. = 這種侮辱我們絕不會忘記。請好自為之！ [civName] has declared war on [targetCivName]! = [civName]向[targetCivName]宣戰！ -[civName] and [targetCivName] have signed the Peace Treaty! = [civName]和[targetCivName]簽署了和平條約！ +[civName] and [targetCivName] have signed a Peace Treaty! = [civName]和[targetCivName]簽署了和平條約！ [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName]和[targetCivName]簽署了友誼宣言！ [civName] has denounced [targetCivName]! = [civName]譴責了[targetCivName]！ diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 3ef3127e77..d8e7781272 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -83,7 +83,7 @@ Denounce ([numberOfTurns] turns) = ([numberOfTurns] tur) boyunca kına We will remember this. = Bunu hatırlayacağız. [civName] has declared war on [targetCivName]! = [civName] [targetCivName] medeniyetine savaş ilan etti! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] ve [targetCivName] Barış Antlaşması'nı imzaladı! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] ve [targetCivName] Barış Antlaşması'nı imzaladı! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] ve [targetCivName] Dostluk Bildirgesi'ni imzaladı! [civName] has denounced [targetCivName]! = [civName] [targetCivName] medeniyetini kınadı! diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 23b68d104f..f06f1b25e5 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Засудження (ходів: [numberOfTu We will remember this. = Ми пам’ятатимемо це. [civName] has declared war on [targetCivName]! = [civName] оголосила війну [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] і [targetCivName] підписали Мирний договір! +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] і [targetCivName] підписали Мирний договір! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] і [targetCivName] підписали Декларацію про дружбу! [civName] has denounced [targetCivName]! = [civName] засуджує дії нації «[targetCivName]»! diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 132e9b8227..9428e53af2 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = Tố cáo ([numberOfTurns] lượt) We will remember this. = Chúng tôi sẽ ghi nhớ điều này. [civName] has declared war on [targetCivName]! = [civName] đã tuyên bố chiến tranh với [targetCivName]! -[civName] and [targetCivName] have signed the Peace Treaty! = [civName] và +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] và [targetCivName] đã kí hiệp ước hòa bình! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] và [targetCivName] đã tuyên bố tình hữu nghị! diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 4c49a39291..3d3ffb27d6 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -79,7 +79,7 @@ Denounce ([numberOfTurns] turns) = We will remember this. = [civName] has declared war on [targetCivName]! = -[civName] and [targetCivName] have signed the Peace Treaty! = +[civName] and [targetCivName] have signed a Peace Treaty! = [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] has denounced [targetCivName]! = diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index aba5c9dbd9..a71fbbe5ea 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -1,7 +1,6 @@ package com.unciv.logic.city import com.badlogic.gdx.graphics.Color -import com.unciv.Constants import com.unciv.logic.automation.ConstructionAutomation import com.unciv.logic.civilization.AlertType import com.unciv.logic.civilization.PopupAlert @@ -71,8 +70,8 @@ class CityConstructions { stats.add(building.getStats(cityInfo.civInfo)) for (unique in builtBuildingUniqueMap.getAllUniques()) when (unique.placeholderText) { - "[] Per [] Population in this city" -> stats.add(unique.stats!!.times(cityInfo.population.population / unique.params[1].toFloat())) - "[] once [] is discovered" -> if (cityInfo.civInfo.tech.isResearched(unique.params[1])) stats.add(unique.stats!!) + "[] Per [] Population in this city" -> stats.add(unique.stats.times(cityInfo.population.population / unique.params[1].toFloat())) + "[] once [] is discovered" -> if (cityInfo.civInfo.tech.isResearched(unique.params[1])) stats.add(unique.stats) } // This is to be deprecated and converted to "[stats] Per [N] Population in this city" - keeping it here to that mods with this can still work for now diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index f09a1794c2..e95c5feb9e 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -50,7 +50,7 @@ class CityStats { val civInfo = cityInfo.civInfo stats.gold = civInfo.getCapital().population.population * 0.15f + cityInfo.population.population * 1.1f - 1 // Calculated by http://civilization.wikia.com/wiki/Trade_route_(Civ5) for (unique in civInfo.getMatchingUniques("[] from each Trade Route")) - stats.add(unique.stats!!) + stats.add(unique.stats) if (civInfo.hasUnique("Gold from all trade routes +25%")) stats.gold *= 1.25f // Machu Pichu speciality } return stats @@ -215,7 +215,7 @@ class CityStats { if (cityInfo.getCenterTile().militaryUnit != null) for (unique in civInfo.getMatchingUniques("[] in all cities with a garrison")) - happinessFromPolicies += unique.stats!!.happiness + happinessFromPolicies += unique.stats.happiness newHappinessList["Policies"] = happinessFromPolicies @@ -247,7 +247,7 @@ class CityStats { else stats.add(stat, 2f) // science and gold specialists for(unique in cityInfo.civInfo.getMatchingUniques("[] from every specialist")) - stats.add(unique.stats!!) + stats.add(unique.stats) return stats } @@ -257,7 +257,7 @@ class CityStats { if (specialist == null) return Stats() val stats = specialist.clone() for (unique in cityInfo.civInfo.getMatchingUniques("[] from every specialist")) - stats.add(unique.stats!!) + stats.add(unique.stats) return stats } @@ -275,10 +275,10 @@ class CityStats { if ((unique.placeholderText == "[] in capital" && cityInfo.isCapital()) || unique.placeholderText == "[] in all cities" || (unique.placeholderText == "[] in all cities with a garrison" && cityInfo.getCenterTile().militaryUnit != null)) - stats.add(unique.stats!!) + stats.add(unique.stats) if (unique.placeholderText == "[] per [] population in all cities") { val amountOfEffects = (cityInfo.population.population / unique.params[1].toInt()).toFloat() - stats.add(unique.stats!!.times(amountOfEffects)) + stats.add(unique.stats.times(amountOfEffects)) } if (unique.text == "+1 gold and -1 unhappiness for every 2 citizens in capital" && cityInfo.isCapital()) { stats.gold += (cityInfo.population.population / 2).toFloat() diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 1d4a429451..03db306b31 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -528,7 +528,7 @@ class DiplomacyManager() { for (civ in getCommonKnownCivs()) { civ.addNotification( - "[${civInfo.civName}] and [${otherCiv().civName}] have signed the Peace Treaty!", + "[${civInfo.civName}] and [${otherCiv().civName}] have signed a Peace Treaty!", null, Color.WHITE )