AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

correct spelling of "Fascism" policy (#1432)

Browse Source
This commit is contained in:
Sam Rogers 2019-12-08 17:40:48 +01:00 committed by Yair Morgenstern
parent df27cb3bdd
commit cdcd7cf116
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/game.atlas
View File

@ -2621,7 +2621,7 @@ PolicyIcons/Entrepreneurship
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
PolicyIcons/Facism PolicyIcons/Fascism
rotate: false rotate: false
xy: 1501, 460 xy: 1501, 460
size: 50, 50 size: 50, 50

4
android/assets/jsons/Policies.json
View File

@ -407,7 +407,7 @@
column:5 column:5
}, },
{ {
name:"Facism", name:"Fascism",
description:"Quantity of strategic resources produced by the empire increased by 100%", description:"Quantity of strategic resources produced by the empire increased by 100%",
requires:["Populism","Militarism"], requires:["Populism","Militarism"],
row:2, row:2,
@ -423,7 +423,7 @@
{ {
name:"Total War", name:"Total War",
description:"+15% production when building military units and new military units start with 15 Experience", description:"+15% production when building military units and new military units start with 15 Experience",
requires:["Police State","Facism"], requires:["Police State","Fascism"],
row:3, row:3,
column:4 column:4
}, },

2
android/assets/jsons/Translations/Policies.json
View File

@ -1709,7 +1709,7 @@
Korean:"유닛을 금으로 구매하는 비용 -33%" Korean:"유닛을 금으로 구매하는 비용 -33%"
} }
"Facism":{ "Fascism":{
Spanish:"Facismo" Spanish:"Facismo"
Italian:"Fascismo" Italian:"Fascismo"
Romanian:"Fascism" Romanian:"Fascism"

2
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -171,7 +171,7 @@ class CityInfo {
var amountToAdd = 1 var amountToAdd = 1
if(resource.resourceType == ResourceType.Strategic){ if(resource.resourceType == ResourceType.Strategic){
amountToAdd = 2 amountToAdd = 2
if(civInfo.policies.isAdopted("Facism")) amountToAdd*=2 if(civInfo.policies.isAdopted("Fascism")) amountToAdd*=2
if(civInfo.nation.unique=="Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity" if(civInfo.nation.unique=="Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity"
&& resource.name in listOf("Horses","Iron","Uranium")) && resource.name in listOf("Horses","Iron","Uranium"))
amountToAdd *= 2 amountToAdd *= 2

2
docs/Credits.md
View File

@ -325,7 +325,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [War](https://thenounproject.com/term/war/1643541/) By Abdul Karim for Total War * [War](https://thenounproject.com/term/war/1643541/) By Abdul Karim for Total War
* [Military Grade](https://thenounproject.com/term/military-grade/578687/) By Ben Davis for Militarism * [Military Grade](https://thenounproject.com/term/military-grade/578687/) By Ben Davis for Militarism
* [Military Medal](https://thenounproject.com/term/military-medal/396457/) By iconsphere for Facism * [Military Medal](https://thenounproject.com/term/military-medal/396457/) By iconsphere for Fascism
* [Newspaper](https://thenounproject.com/term/newspaper/1207487/) By Trishul for Populism * [Newspaper](https://thenounproject.com/term/newspaper/1207487/) By Trishul for Populism
* [Riot Police](https://thenounproject.com/term/riot-police/43117/) By Dan Hetteix for Police State * [Riot Police](https://thenounproject.com/term/riot-police/43117/) By Dan Hetteix for Police State