From 47db4dce31e3beee2d28582b9c436da787f22675 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 1 Oct 2019 22:05:38 +0300 Subject: [PATCH] Fixed Coastal Raider image Puppet cities no longer increase policy costs --- .../{Coastal_Raider.png => Coastal Raider.png} | Bin .../com/unciv/logic/civilization/PolicyManager.kt | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename android/Images/UnitPromotionIcons/{Coastal_Raider.png => Coastal Raider.png} (100%) diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider.png b/android/Images/UnitPromotionIcons/Coastal Raider.png similarity index 100% rename from android/Images/UnitPromotionIcons/Coastal_Raider.png rename to android/Images/UnitPromotionIcons/Coastal Raider.png diff --git a/core/src/com/unciv/logic/civilization/PolicyManager.kt b/core/src/com/unciv/logic/civilization/PolicyManager.kt index b3a6dece99..b0c8d5ca4e 100644 --- a/core/src/com/unciv/logic/civilization/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/PolicyManager.kt @@ -25,14 +25,14 @@ class PolicyManager { // round down to nearest 5 fun getCultureNeededForNextPolicy(): Int { var policyCultureCost = 25 + (numberOfAdoptedPolicies * 6).toDouble().pow(1.7) - var cityModifier = 0.3 * (civInfo.cities.size - 1) + var cityModifier = 0.3 * (civInfo.cities.count { !it.isPuppet } - 1) if (isAdopted("Representation")) cityModifier *= (2 / 3f).toDouble() if (isAdopted("Piety Complete")) policyCultureCost *= 0.9 if (civInfo.containsBuildingUnique("Culture cost of adopting new Policies reduced by 10%")) policyCultureCost *= 0.9 if (civInfo.isPlayerCivilization()) - policyCultureCost *= civInfo.getDifficulty().policyCostModifier + policyCultureCost *= civInfo.getDifficulty().policyCostModifier policyCultureCost *= civInfo.gameInfo.gameParameters.gameSpeed.getModifier() val cost: Int = (policyCultureCost * (1 + cityModifier)).roundToInt() return cost - (cost % 5)