diff --git a/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt index e40df99a46..383b7b5e13 100644 --- a/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt @@ -111,15 +111,6 @@ object CivilianUnitAutomation { return } - // This has to come after the individual abilities for the great people that can also place - // instant improvements (e.g. great scientist). - if (unit.hasUnique(UniqueType.ConstructImprovementInstantly)) { - // catch great prophet for civs who can't found/enhance/spread religion - // includes great people plus moddable units - val improvementCanBePlacedEventually = - SpecificUnitAutomation.automateImprovementPlacer(unit) - } - if (unit.hasUnique(UniqueType.GainFreeBuildings)) { val unique = unit.getMatchingUniques(UniqueType.GainFreeBuildings).first() val buildingName = unique.params[0] diff --git a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt index b1ea0ee4a2..5ea74e30a1 100644 --- a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt @@ -148,7 +148,7 @@ class PolicyManager : IsPartOfGameInfoSerialization { for (policy in policiesToRemove) { policyCostInput-- - policyMap.put(policy, getPolicyCultureCost(policyCostInput)) + policyMap[policy] = (getPolicyCultureCost(policyCostInput) * refundPercentage/100f).roundToInt() } return policyMap.toMap() diff --git a/core/src/com/unciv/ui/objectdescriptions/DescriptionHelpers.kt b/core/src/com/unciv/ui/objectdescriptions/DescriptionHelpers.kt index 5ff3f27315..b9e2bdb182 100644 --- a/core/src/com/unciv/ui/objectdescriptions/DescriptionHelpers.kt +++ b/core/src/com/unciv/ui/objectdescriptions/DescriptionHelpers.kt @@ -48,7 +48,7 @@ fun IHasUniques.uniquesToCivilopediaTextLines( // (the other constructor guesses the first object by name in the Unique parameters). yield( if (colorConsumesResources && unique.type == UniqueType.ConsumesResources) - FormattedLine(unique.text, link = "Resources/${unique.params[1]}", color = "#F42") + FormattedLine(unique.getDisplayText(), link = "Resources/${unique.params[1]}", color = "#F42") else FormattedLine(unique) ) }