mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-09 23:39:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Remove all in-game mentions of 1.5x unhappiness for puppeted cities (#7420)

Browse Source 
* 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
This commit is contained in:
Ouaz
2022-07-12 03:44:29 +02:00
committed by GitHub
parent d14ec04ef8
commit 0f3fb48ebe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Tutorials.json
View File

@ -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."
]
},
{

2
android/assets/jsons/translations/template.properties
View File

@ -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. =