From 8689fe0ffa9320cb75d28c053a343b20d09077ca Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 23 Dec 2020 21:28:59 +0200 Subject: [PATCH] Clarified Protectionism effect --- android/assets/jsons/Civ V - Vanilla/Policies.json | 2 +- .../assets/jsons/translations/Brazilian_Portuguese.properties | 2 +- android/assets/jsons/translations/Czech.properties | 2 +- android/assets/jsons/translations/Dutch.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/Hungarian.properties | 2 +- android/assets/jsons/translations/Indonesian.properties | 2 +- android/assets/jsons/translations/Italian.properties | 2 +- android/assets/jsons/translations/Japanese.properties | 2 +- android/assets/jsons/translations/Korean.properties | 2 +- android/assets/jsons/translations/Lithuanian.properties | 2 +- android/assets/jsons/translations/Malay.properties | 2 +- .../assets/jsons/translations/Persian_(Pinglish-DIN).properties | 2 +- .../assets/jsons/translations/Persian_(Pinglish-UN).properties | 2 +- android/assets/jsons/translations/Polish.properties | 2 +- android/assets/jsons/translations/Portuguese.properties | 2 +- android/assets/jsons/translations/Romanian.properties | 2 +- android/assets/jsons/translations/Russian.properties | 2 +- android/assets/jsons/translations/Simplified_Chinese.properties | 2 +- android/assets/jsons/translations/Spanish.properties | 2 +- android/assets/jsons/translations/Thai.properties | 2 +- .../assets/jsons/translations/Traditional_Chinese.properties | 2 +- android/assets/jsons/translations/Turkish.properties | 2 +- android/assets/jsons/translations/Ukrainian.properties | 2 +- core/src/com/unciv/logic/civilization/CivInfoStats.kt | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/android/assets/jsons/Civ V - Vanilla/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json index 34da0bc0d7..a7a65a5af4 100644 --- a/android/assets/jsons/Civ V - Vanilla/Policies.json +++ b/android/assets/jsons/Civ V - Vanilla/Policies.json @@ -245,7 +245,7 @@ }, { "name": "Protectionism", - "uniques": ["+1 happiness from each luxury resource"], + "uniques": ["+1 happiness from each type of luxury resource"], "requires": ["Entrepreneurship","Patronage"], "row": 3, "column": 3 diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index a8074b811b..fe82de783f 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -3345,7 +3345,7 @@ Entrepreneurship = Empreendimento Patronage = Patrocínio Cost of purchasing [stat] buildings reduced by [amount]% = Custo para a compra de construções de [stat] reduzido em [amount]% Protectionism = Protecionismo -+1 happiness from each luxury resource = +1 Felicidade por cade recurso de luxo ++1 happiness from each type of luxury resource = +1 Felicidade por cade recurso de luxo Commerce Complete = Comércio Completo Double gold from Great Merchant trade missions = Dobro de ouro obtido nas missões de comércio de Grandes Comerciantes Medieval era = Idade Média diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index ae2ddd29b4..cc6cc31a80 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -3466,7 +3466,7 @@ Entrepreneurship = Podníkání Patronage = Patronát Cost of purchasing [stat] buildings reduced by [amount]% = Cena za nákup [stat] budov se sníží o [amount]% Protectionism = Protekcionismus -+1 happiness from each luxury resource = +1 spokojenost za každou luxusní surovinu ++1 happiness from each type of luxury resource = +1 spokojenost za každou luxusní surovinu Commerce Complete = Kompletní Kupectví Double gold from Great Merchant trade missions = Dvojnásobek zlata z obchodních míst Velkých Obchodníků Medieval era = Středověká éra diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 587b53c67b..736a815cf3 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -4689,7 +4689,7 @@ Cost of purchasing [stat] buildings reduced by [amount]% = # Requires translation! Protectionism = # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = # Requires translation! Commerce Complete = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 461825d8e9..46b07e36ed 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -5085,7 +5085,7 @@ Cost of purchasing [stat] buildings reduced by [amount]% = # Requires translation! Protectionism = # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = # Requires translation! Commerce Complete = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index b8bbd6d4f2..66a4e1589f 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -3408,7 +3408,7 @@ Cost of purchasing [stat] buildings reduced by [amount]% = # Requires translation! Protectionism = # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = # Requires translation! Commerce Complete = Double gold from Great Merchant trade missions = Tuplasti Kultaa Merkittävän Kauppiaan Kauppamatkasta diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 96f2a3b3d8..73bb136444 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2907,7 +2907,7 @@ Patronage = Patronat # Requires translation! Cost of purchasing [stat] buildings reduced by [amount]% = Protectionism = Protectionnisme -+1 happiness from each luxury resource = +1 Bonheur pour chaque ressource de luxe ++1 happiness from each type of luxury resource = +1 Bonheur pour chaque ressource de luxe Commerce Complete = Commerce complet # Requires translation! Double gold from Great Merchant trade missions = diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 6758635962..1577f508b1 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2704,7 +2704,7 @@ Entrepreneurship = Unternehmertum Patronage = Mäzenatentum Cost of purchasing [stat] buildings reduced by [amount]% = Kaufpreis von "[stat]"-Gebäuden um [amount]% reduziert Protectionism = Protektionismus -+1 happiness from each luxury resource = +1 Zufriedenheit für jede Luxusresource ++1 happiness from each type of luxury resource = +1 Zufriedenheit für jede Luxusresource Commerce Complete = Kommerz vollständig Double gold from Great Merchant trade missions = Doppeltes Gold von Handelsmissionen Großer Händler Medieval era = Mittelalter diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index dea339a208..28105963b3 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -3310,7 +3310,7 @@ Patronage = Védnökség Cost of purchasing [stat] buildings reduced by [amount]% = Protectionism = Protekcionizmus # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = Commerce Complete = Kereskedelem befejezve # Requires translation! Double gold from Great Merchant trade missions = diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 5df7202f00..bdf346209e 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2697,7 +2697,7 @@ Entrepreneurship = Kewirausahaan Patronage = Patronasi Cost of purchasing [stat] buildings reduced by [amount]% = Biaya membeli bangunan [stat] berkurang [amount]% Protectionism = Proteksionisme -+1 happiness from each luxury resource = +1 kebahagiaan dari setiap sumber daya mewah ++1 happiness from each type of luxury resource = +1 kebahagiaan dari setiap sumber daya mewah Commerce Complete = Perniagaan Lengkap Double gold from Great Merchant trade missions = 2x lipat emas dari misi perdagangan Pedagang Hebat Medieval era = Era Pertengahan diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index ddd749adec..8e6193ca7c 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2697,7 +2697,7 @@ Entrepreneurship = Imprenditorialità Patronage = Mecenatismo Cost of purchasing [stat] buildings reduced by [amount]% = -[amount]% costi per l'acquisto di strutture di tipo [stat] Protectionism = Protezionismo -+1 happiness from each luxury resource = +1 Felicità per ogni risorsa di lusso ++1 happiness from each type of luxury resource = +1 Felicità per ogni risorsa di lusso Commerce Complete = Commercio Completo Double gold from Great Merchant trade missions = Le missioni commerciali dei Grandi Commercianti fruttano il doppio in Oro Medieval era = Medievale diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 0daf54b296..434ea9e697 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -2697,7 +2697,7 @@ Entrepreneurship = 企業家精神 Patronage = 文化後援 Cost of purchasing [stat] buildings reduced by [amount]% = [stat]の建物の購入コストを[amount]%削減 Protectionism = 保護貿易主義 -+1 happiness from each luxury resource = 各種高級資源から得られる幸福度が1つ増加する ++1 happiness from each type of luxury resource = 各種高級資源から得られる幸福度が1つ増加する Commerce Complete = 商業コンプリート Double gold from Great Merchant trade missions = 大商人の貿易ミッションから報酬を2倍にする Medieval era = 中世 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 396329ecd0..8ebd766b79 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -2702,7 +2702,7 @@ Entrepreneurship = 기업가 정신 Patronage = 후원 Cost of purchasing [stat] buildings reduced by [amount]% = [stat] 건물을 구매할 때 드는 금 -[amount]% Protectionism = 보호무역주의 -+1 happiness from each luxury resource = 사치 자원 개당 행복 +1 ++1 happiness from each type of luxury resource = 사치 자원 개당 행복 +1 Commerce Complete = 상업 정책 완성 Double gold from Great Merchant trade missions = 위대한 상인의 무역 임무에서 얻는 금 2배 Medieval era = 중세 시대 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d4c2f74a6c..71bb05a0b7 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -4380,7 +4380,7 @@ Cost of purchasing [stat] buildings reduced by [amount]% = # Requires translation! Protectionism = # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = # Requires translation! Commerce Complete = # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index dc6de48d39..289df78959 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -4871,7 +4871,7 @@ Cost of purchasing [stat] buildings reduced by [amount]% = # Requires translation! Protectionism = # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = # Requires translation! Commerce Complete = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 7cf66b9995..090442c277 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -4311,7 +4311,7 @@ Cost of purchasing [stat] buildings reduced by [amount]% = # Requires translation! Protectionism = # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = # Requires translation! Commerce Complete = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index cc36a36e5f..fc503dcb67 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -4308,7 +4308,7 @@ Cost of purchasing [stat] buildings reduced by [amount]% = # Requires translation! Protectionism = # Requires translation! -+1 happiness from each luxury resource = ++1 happiness from each type of luxury resource = # Requires translation! Commerce Complete = # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index bc33f91b25..011a9a1bb7 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2781,7 +2781,7 @@ Entrepreneurship = Przedsiębiorczość Patronage = Patronat Cost of purchasing [stat] buildings reduced by [amount]% = Koszt zakupu budynków [stat] zredukowany o [amount]% Protectionism = Protekcjonizm -+1 happiness from each luxury resource = +1 do zadowolenia za każdy surowiec luksusowy ++1 happiness from each type of luxury resource = +1 do zadowolenia za każdy surowiec luksusowy Commerce Complete = Ukończony Handel Double gold from Great Merchant trade missions = Podwójne złoto z misji Wielkiego Kupca Medieval era = Średniowiecze diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 1640078f2d..0e915bdb10 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -4151,7 +4151,7 @@ Patronage = Patrocínio # Requires translation! Cost of purchasing [stat] buildings reduced by [amount]% = Protectionism = Protecionismo -+1 happiness from each luxury resource = +1 Felicidade por cade recurso de luxo ++1 happiness from each type of luxury resource = +1 Felicidade por cade recurso de luxo Commerce Complete = Comércio Completo # Requires translation! Double gold from Great Merchant trade missions = diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 08c60c40f4..93584e0dae 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -4212,7 +4212,7 @@ Patronage = Clientelă # Requires translation! Cost of purchasing [stat] buildings reduced by [amount]% = Protectionism = Protecționism -+1 happiness from each luxury resource = +1 fericire din fiecare resursă de lux ++1 happiness from each type of luxury resource = +1 fericire din fiecare resursă de lux Commerce Complete = Comerț realizat # Requires translation! Double gold from Great Merchant trade missions = diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 0c02fffa98..17f8550ed2 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2706,7 +2706,7 @@ Entrepreneurship = Предпринимательство Patronage = Меценатство Cost of purchasing [stat] buildings reduced by [amount]% = -[amount]% к стоимости покупок зданий типа [stat] в городах Protectionism = Протекционизм -+1 happiness from each luxury resource = +1 Счастье от каждого редкого ресурса ++1 happiness from each type of luxury resource = +1 Счастье от каждого редкого ресурса Commerce Complete = Коммерция завершена Double gold from Great Merchant trade missions = Золото, полученное от сделок Великого торговца, удваивается Medieval era = Средневековье diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 205b7dedb5..7c579e4132 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -2710,7 +2710,7 @@ Entrepreneurship = 创业精神 Patronage = 赞助政策 Cost of purchasing [stat] buildings reduced by [amount]% = 购买[stat]建筑时的金钱花费-[amount]% Protectionism = 贸易保护 -+1 happiness from each luxury resource = 每种奢侈资源额外+1快乐 ++1 happiness from each type of luxury resource = 每种奢侈资源额外+1快乐 Commerce Complete = 完整的商业政策 Double gold from Great Merchant trade missions = 大商业家拓展贸易获得的金钱加倍 Medieval era = 中古时代 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 7985dfc2d5..1cdc4c787e 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2701,7 +2701,7 @@ Entrepreneurship = Emprendimiento Patronage = Mecenazgo Cost of purchasing [stat] buildings reduced by [amount]% = El costo de comprar edificios de [stat] se redujo en un [amount]% Protectionism = Proteccionismo -+1 happiness from each luxury resource = +1 felicidad por cada recurso de lujo ++1 happiness from each type of luxury resource = +1 felicidad por cada recurso de lujo Commerce Complete = Comercio Completo Double gold from Great Merchant trade missions = Doble oro de las misiones comerciales del Gran Comerciante Medieval era = Edad Medieval diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index a5034c5a85..67067ae324 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -920,7 +920,7 @@ Great Merchants are earned 25% faster, +1 Science from every Mint, Market, Bank Patronage = การอุดหนุน Cost of purchasing culture buildings reduced by 50% = ค่าใช้จ่ายในการซื้อสิ่งปลูกสร้างทางวัฒนธรรมลงลด 50% Protectionism = มาตรการคุ้มครอง -+1 happiness from each luxury resource = +1 ความสุขต่อทรัพยากรพรั่งพรู ++1 happiness from each type of luxury resource = +1 ความสุขต่อทรัพยากรพรั่งพรู Commerce Complete = การพาณิชย์สมบูรณ์ +1 gold from every trading post, double gold from Great Merchant trade missions = +1 ทองจากทุกๆ จุดค้าขาย, เพิ่มทอง 2 เท่าจากภารกิจการค้าของพ่อค้าผู้ยิ่งใหญ่ diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index a170b2d50d..b1bc6db03a 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -2820,7 +2820,7 @@ Entrepreneurship = 創業精神 Patronage = 贊助政策 Cost of purchasing [stat] buildings reduced by [amount]% = 購買[stat]建築時的金錢花費-[amount]% Protectionism = 貿易保護 -+1 happiness from each luxury resource = 每種奢侈資源額外+1快樂 ++1 happiness from each type of luxury resource = 每種奢侈資源額外+1快樂 Commerce Complete = 完整的商業政策 Double gold from Great Merchant trade missions = 大商業家拓展貿易獲得的金錢加倍 Medieval era = 中古時代 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 1516302d49..4d4dc25c9f 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -3447,7 +3447,7 @@ Patronage = Patronaj # Requires translation! Cost of purchasing [stat] buildings reduced by [amount]% = Protectionism = Korumacılık -+1 happiness from each luxury resource = Her lüks kaynağından +1 mutluluk ++1 happiness from each type of luxury resource = Her lüks kaynağından +1 mutluluk Commerce Complete = Ticaret Tamamlandı # Requires translation! Double gold from Great Merchant trade missions = diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 08bc93e2de..ea228656cc 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2718,7 +2718,7 @@ Entrepreneurship = Підприємництво Patronage = Меценатство Cost of purchasing [stat] buildings reduced by [amount]% = Вартість придбання будівель типу «[stat]» зменшено на [amount]% Protectionism = Протекціонізм -+1 happiness from each luxury resource = +1 щастя за кожен ресурс розкоші ++1 happiness from each type of luxury resource = +1 щастя за кожен ресурс розкоші Commerce Complete = Торгівля завершена Double gold from Great Merchant trade missions = Подвоює золото від торгових місій Великого купця Medieval era = Середньовіччя diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt index 19ed8f8cc6..4249ea0112 100644 --- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt +++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt @@ -138,7 +138,7 @@ class CivInfoStats(val civInfo: CivilizationInfo){ // TODO - happinessPerUnique should be difficulty-dependent, 5 on Settler and Chieftian and 4 on other difficulties (should be parameter, not in code) var happinessPerUniqueLuxury = 4f + civInfo.getDifficulty().extraHappinessPerLuxury - for(unique in civInfo.getMatchingUniques("+1 happiness from each luxury resource")) + for(unique in civInfo.getMatchingUniques("+1 happiness from each type of luxury resource")) happinessPerUniqueLuxury += 1 statMap["Luxury resources"]= civInfo.getCivResources().map { it.resource } .count { it.resourceType === ResourceType.Luxury } * happinessPerUniqueLuxury