From 324239b3e6f11e6274b72ded74020b8d7f9d020e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 28 Oct 2018 15:06:55 +0200 Subject: [PATCH] Typo fix: dicipline -> discipline --- Credits.md | 2 +- .../PolicyIcons/{Dicipline.png => Discipline.png} | Bin android/assets/jsons/Policies.json | 8 ++++---- android/assets/jsons/Translations.json | 2 +- core/src/com/unciv/logic/battle/BattleDamage.kt | 4 ++-- .../unciv/logic/civilization/CivilizationInfo.kt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename android/Images/PolicyIcons/{Dicipline.png => Discipline.png} (100%) diff --git a/Credits.md b/Credits.md index c60c9022..09658c97 100644 --- a/Credits.md +++ b/Credits.md @@ -217,7 +217,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Sword](https://thenounproject.com/term/sword/5111/) By dsathiyaraj for Military Tradition * [Castle](https://thenounproject.com/term/castle/55045/) By Gabriele Malaspina for Military Caste * [Roman Armor](https://thenounproject.com/term/roman-armor/440138/) By Parkjisun for Professional Army -* [Shield](https://thenounproject.com/term/shield/874633/) By Kimmi Studio for Dicipline +* [Shield](https://thenounproject.com/term/shield/874633/) By Kimmi Studio for Discipline * [Spartan Helmet](https://thenounproject.com/term/spartan-helmet/1732615/) By Joni Ramadhan for Warrior Code ### Piety diff --git a/android/Images/PolicyIcons/Dicipline.png b/android/Images/PolicyIcons/Discipline.png similarity index 100% rename from android/Images/PolicyIcons/Dicipline.png rename to android/Images/PolicyIcons/Discipline.png diff --git a/android/assets/jsons/Policies.json b/android/assets/jsons/Policies.json index 53c6b40b..793d474a 100644 --- a/android/assets/jsons/Policies.json +++ b/android/assets/jsons/Policies.json @@ -98,14 +98,14 @@ column:2 }, { - name:"Dicipline", + name:"Discipline", description:"+15% combat strength for melee units which have another military unit in an adjacent tile", row:1, column:4 }, { name:"Military Tradition", - description:"Military units gain 50% more Experience from combat", // todo from here + description:"Military units gain 50% more Experience from combat", requires:["Warrior Code"], row:2, column:2 @@ -113,7 +113,7 @@ { name:"Military Caste", description:"Each city with a garrison increases happiness by 1 and culture by 2", - requires:["Dicipline"], + requires:["Discipline"], row:2, column:4 }, @@ -307,7 +307,7 @@ { name:"Autocracy", era:"Industrial", - description:"-33% unit upkeep costs", // todo! + description:"-33% unit upkeep costs", policies:[ { name:"Populism", diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index f6ab10ea..7f5bc71f 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -3231,7 +3231,7 @@ Spanish:"Chichén Itzá" } "Lighthouse":{} - "The Great Lighthouse"{} + "The Great Lighthouse":{} "Stable":{ Italian:"Scuderia" Russian:"Конюшня" diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index f8b2d70c..c11bbf6f 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -41,10 +41,10 @@ class BattleDamage{ if(combatant.getCivilization().policies.isAdopted("Populism")) modifiers["Populism"] = 0.25f - if(combatant.getCivilization().policies.isAdopted("Dicipline") && combatant.isMelee() + if(combatant.getCivilization().policies.isAdopted("Discipline") && combatant.isMelee() && combatant.getTile().neighbors.flatMap { it.getUnits() } .any { it.civInfo==combatant.getCivilization() && !it.baseUnit.unitType.isCivilian()}) - modifiers["Dicipline"] = 0.15f + modifiers["Discipline"] = 0.15f } if (combatant.getCivilization().policies.isAdopted("Honor") && enemy.getCivilization().isBarbarianCivilization()) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index cf12d029..b6acce13 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -12,7 +12,6 @@ import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.tech.TechEra import com.unciv.models.gamebasics.tile.ResourceType import com.unciv.models.gamebasics.tile.TileResource -import com.unciv.models.gamebasics.unit.UnitType import com.unciv.models.stats.Stats import com.unciv.ui.utils.getRandom import com.unciv.ui.utils.tr @@ -131,6 +130,7 @@ class CivilizationInfo { cost = cost.pow(1+gameProgress/3) // Why 3? To spread 1 to 1.33 if(!isPlayerCivilization()) cost *= gameInfo.getPlayerCivilization().getDifficulty().aiUnitMaintainanceModifier + if(policies.isAdopted("Autocracy")) cost = cost*0.66f return cost.toInt() }