From 0f3fb48ebee43451e6186c532d1f78220bbfcbf4 Mon Sep 17 00:00:00 2001 From: Ouaz Date: Tue, 12 Jul 2022 03:44:29 +0200 Subject: [PATCH] Remove all in-game mentions of 1.5x unhappiness for puppeted cities (#7420) * Update Tutorials.json Remove mention in the "After conquering" tutorial of 1.5x unhappiness for puppeted cities (according 87aa5bc) * Update template.properties Remove mention when conquering a city of 1.5x unhappiness for puppeted cities (according 87aa5bc) * Remove mention of unhappiness for puppeted cities * Modify "After Conquering" tutorial Remove mention of unhappiness for puppeted cities --- android/assets/jsons/Tutorials.json | 2 +- android/assets/jsons/translations/template.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Tutorials.json b/android/assets/jsons/Tutorials.json index fe155a7527..2d8db3e4d3 100644 --- a/android/assets/jsons/Tutorials.json +++ b/android/assets/jsons/Tutorials.json @@ -108,7 +108,7 @@ "name": "After Conquering", "steps": [ "When conquering a city, you can choose to liberate, annex, puppet, or raze the city.", - "\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost, but its citizens will generate 1.5x the regular unhappiness.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion." + "\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion." ] }, { diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index c0517e4b40..f70784d55c 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -1232,7 +1232,7 @@ Annex = Annexed cities become part of your regular empire. = Their citizens generate 2x the unhappiness, unless you build a courthouse. = Puppet = -Puppeted cities do not increase your tech or policy cost, but their citizens generate 1.5x the regular unhappiness. = +Puppeted cities do not increase your tech or policy cost. = You have no control over the the production of puppeted cities. = Puppeted cities also generate 25% less Gold and Science. = A puppeted city can be annexed at any time. =