Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]"

2025-02-25 22:18:50 +07:00 · 2021-04-13 22:04:00 +03:00 · 2021-04-13 22:04:00 +03:00 · 0440a70a9c
commit 0440a70a9c
parent b7d6bacc5b
29 changed files with 30 additions and 30 deletions
--- a/android/assets/jsons/Civ
+++ b/android/assets/jsons/Civ
@ -597,7 +597,7 @@
 		"outerColor": [139,32,23],
 		"innerColor": [134,238,214],
 		"uniqueName": "Sacrificial Captives",
-		"uniques": ["Earn [100]% of [Military] opponent's [Strength] as [Culture] for kills"],
+		"uniques": ["Earn [100]% of killed [Military] unit's [Strength] as [Culture]"],
 		"cities": ["Tenochtitlan","Teotihuacan","Tlatelolco","Texcoco","Tlaxcala","Calixtlahuaca","Xochicalco","Tlacopan",
 			"Atzcapotzalco","Tzintzuntzan","Malinalco","Tula","Tamuin","Teayo","Cempoala","Chalco","Tlalmanalco",
 			"Ixtapaluca","Huexotla","Tepexpan","Tepetlaoxtoc","Chiconautla","Zitlaltepec","Coyotepec","Tequixquiac",
--- a/android/assets/jsons/Civ
+++ b/android/assets/jsons/Civ
@ -89,7 +89,7 @@
 	{
 		"name": "Honor",
 		"era": "Ancient era",
-		"uniques": ["+25% bonus vs Barbarians", "Earn [100]% of [Barbarian] opponent's [Strength] as [Culture] for kills",
+		"uniques": ["+25% bonus vs Barbarians", "Earn [100]% of killed [Barbarian] unit's [Strength] as [Culture]",
 			"Notified of new Barbarian encampments"],
 		"policies": [
 			{
@ -127,7 +127,7 @@
 			},
 			{
 				"name": "Honor Complete",
-				"uniques": ["Earn [10]% of [Military] opponent's [Cost] as [Gold] for kills"],
+				"uniques": ["Earn [10]% of killed [Military] unit's [Cost] as [Gold]"],
 			}
 		]
 	},{
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@ -2966,7 +2966,7 @@ Accept this agreement or suffer the consequences. = Aceite este acordo ou sofra
 Welcome, friend. = Bem vindo, amigo.
 Sacrificial Captives = Prisioneiros sacrificiais
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 Tenochtitlan = Tenochtitlán
 Teotihuacan = Teotihuacan
 Tlatelolco = Tlatelolco
--- a/android/assets/jsons/translations/Bulgarian.properties
+++ b/android/assets/jsons/translations/Bulgarian.properties
@ -3724,7 +3724,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@ -2394,7 +2394,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = Co to
 Accept this agreement or suffer the consequences. = Přijměte tuto dohodu nebo ponesete následky. 
 Welcome, friend. = Vítej, příteli.
 Sacrificial Captives = Obětování zajatců
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Získá [amount]% [param] protivníkovy [param2] jako [stat] za zabití
+Earn [amount]% of killed [param] unit's [param2] as [stat] = Získá [amount]% [param] protivníkovy [param2] jako [stat] za zabití
 Tenochtitlan = Tenochtitlán
 Teotihuacan = Teotihuacán
 Tlatelolco = Tlatelolco
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@ -3435,7 +3435,7 @@ Welcome, friend. = Welkom, vriend.
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@ -4518,7 +4518,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@ -2880,7 +2880,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@ -2396,7 +2396,7 @@ Accept this agreement or suffer the consequences. = Acceptez cet accord ou vous
 Welcome, friend. = Bienvenue mon ami.
 Sacrificial Captives = Captifs sacrificiels
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@ -2394,7 +2394,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = Was se
 Accept this agreement or suffer the consequences. = Akzeptiert diese Vereinbarung oder erleidet die Konsequenzen.
 Welcome, friend. = Willkommen, Freund.
 Sacrificial Captives = Geopferte Gefangene
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Erhalte [amount]% von [param] des Gegners [param2] als [stat] für Siege
+Earn [amount]% of killed [param] unit's [param2] as [stat] = Erhalte [amount]% von [param] des Gegners [param2] als [stat] für Siege
 Tenochtitlan = Tenochtitlan
 Teotihuacan = Teotihuacan
 Tlatelolco = Tlatelolco
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@ -2893,7 +2893,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 Tenochtitlan = Tenocstitlan
 Teotihuacan = Teotihuacan
 Tlatelolco = Tlatelolco
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@ -2394,7 +2394,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = Apa ya
 Accept this agreement or suffer the consequences. = Terimalah persetujuan ini atau lihatlah akibatnya.
 Welcome, friend. = Selamat datang, teman.
 Sacrificial Captives = Tawanan Pengorbanan
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Mendapat [amount]% dari [param2] [param] musuh dalam bentuk [stat] untuk setiap unit yang dihabisi
+Earn [amount]% of killed [param] unit's [param2] as [stat] = Mendapat [amount]% dari [param2] [param] musuh dalam bentuk [stat] untuk setiap unit yang dihabisi
 Tenochtitlan = Tenochtitlan
 Teotihuacan = Teotihuacan
 Tlatelolco = Tlatelolco
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@ -2394,7 +2394,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = Alt! C
 Accept this agreement or suffer the consequences. = Accetta questo scambio, o pagane le conseguenze.
 Welcome, friend. = Benvenuto, amico.
 Sacrificial Captives = Vittime sacrificali
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Ottieni [stat] pari al [amount]% della [param2] di ogni unità [param] uccisa.
+Earn [amount]% of killed [param] unit's [param2] as [stat] = Ottieni [stat] pari al [amount]% della [param2] di ogni unità [param] uccisa.
 Tenochtitlan = Tenochtitlan
 Teotihuacan = Teotihuacan
 Tlatelolco = Tlatelolco
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@ -2422,7 +2422,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = 我の
 Accept this agreement or suffer the consequences. = この提案をの、後々に苦しむぞ
 Welcome, friend. = ようこそ、我が友よ
 Sacrificial Captives = 捕虜の生贄
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 敵の[param]を倒すごとに敵[param2][amount]%分の[stat]で得る
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 敵の[param]を倒すごとに敵[param2][amount]%分の[stat]で得る
 Tenochtitlan = テノチティタラン
 Teotihuacan = テオティワカン
 Tlatelolco = トラテロルコ
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@ -2425,7 +2425,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = 내
 Accept this agreement or suffer the consequences. = 이 제안을 받지 않으면 나중이 두려울 것이다.
 Welcome, friend. = 환영한다, 친구여.
 Sacrificial Captives = 포로 공양
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 적 [param] 유닛을 죽일 때마다 [param2]의 [amount]% 에 해당하는 [stat]를 받음
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 적 [param] 유닛을 죽일 때마다 [param2]의 [amount]% 에 해당하는 [stat]를 받음
 Tenochtitlan = 테노치티틀란
 Teotihuacan = 테오티우아칸
 Tlatelolco = 틀라텔롤코
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@ -3818,7 +3818,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@ -4275,7 +4275,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@ -3750,7 +3750,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@ -3747,7 +3747,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@ -2467,7 +2467,7 @@ Welcome, friend. = Witaj, przyjacielu.
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@ -3534,7 +3534,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@ -3694,7 +3694,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@ -2426,7 +2426,7 @@ Accept this agreement or suffer the consequences. = Прими это согла
 Welcome, friend. = Добро пожаловать, мой друг.
 Sacrificial Captives = Жертвоприношения
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 Tenochtitlan = Теночтитлана
 Teotihuacan = Теотихуакан
 Tlatelolco = Тлателолко
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@ -2397,7 +2397,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = 将跳
 Accept this agreement or suffer the consequences. = 接受这个协议否则后果自负。
 Welcome, friend. = 欢迎您，我最尊贵的朋友！
 Sacrificial Captives = 人牲献祭
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 击杀敌方[param]单位后可获得[stat]（ ≈ 已击杀单位的[param2] × [amount]%）
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 击杀敌方[param]单位后可获得[stat]（ ≈ 已击杀单位的[param2] × [amount]%）
 Tenochtitlan = 特诺奇提特兰
 Teotihuacan = 特奥蒂瓦坎
 Tlatelolco = 特拉特洛尔科
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@ -2394,7 +2394,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = ¿Qué
 Accept this agreement or suffer the consequences. = Acepta este acuerdo o sufre las consecuencias.
 Welcome, friend. = Bienvenido, amigo.
 Sacrificial Captives = Cautivos de sacrificio
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Gana [amount]% de [param] oponente [param2] como [stat] por muertes
+Earn [amount]% of killed [param] unit's [param2] as [stat] = Gana [amount]% de [param] oponente [param2] como [stat] por muertes
 Tenochtitlan = Tenochtitlan
 Teotihuacan = Teotihuacan
 Tlatelolco = Tlatelolco
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@ -2397,7 +2397,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = 將跳
 Accept this agreement or suffer the consequences. = 接受這個協議否則後果自負。
 Welcome, friend. = 歡迎您，我最尊貴的朋友！
 Sacrificial Captives = 人牲獻祭
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 擊殺敵方[param]單位後可獲得[stat]（ ≈ 已击杀单位的[param2] × [amount]%）
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 擊殺敵方[param]單位後可獲得[stat]（ ≈ 已击杀单位的[param2] × [amount]%）
 Tenochtitlan = 特諾奇提特蘭
 Teotihuacan = 特奧蒂瓦坎
 Tlatelolco = 特拉特洛爾科
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@ -2769,7 +2769,7 @@ Welcome, friend. =
 # Requires translation!
 Sacrificial Captives = 
 # Requires translation!
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 
+Earn [amount]% of killed [param] unit's [param2] as [stat] = 
 # Requires translation!
 Tenochtitlan = 
 # Requires translation!
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@ -2400,7 +2400,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = Що
 Accept this agreement or suffer the consequences. = Прийміть цю угоду або зазнайте наслідків.
 Welcome, friend. = Ласково прошу, друже.
 Sacrificial Captives = Жертвоприношення полонених
-Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Заробити [amount]% від [param] ворожих [param2] як [stat] за вбивство
+Earn [amount]% of killed [param] unit's [param2] as [stat] = Заробити [amount]% від [param] ворожих [param2] як [stat] за вбивство
 Tenochtitlan = Теночтітлан
 Teotihuacan = Теотіуакан
 Tlatelolco = Тлалелолько
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@ -96,7 +96,7 @@ object Battle {
    private fun tryEarnFromKilling(civUnit: ICombatant, defeatedUnit: MapUnitCombatant) {
        val unitStr = max(defeatedUnit.unit.baseUnit.strength, defeatedUnit.unit.baseUnit.rangedStrength)
        val unitCost = defeatedUnit.unit.baseUnit.cost
-        val bonusUniquePlaceholderText = "Earn []% of [] opponent's [] as [] for kills"
+        val bonusUniquePlaceholderText = "Earn []% of killed [] unit's [] as []"

        var goldReward = 0
        var cultureReward = 0