diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 902ca3c17a..4d7c02cf01 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -201,8 +201,7 @@ object BattleDamage { private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): Counter { val modifiers = Counter() - for (unique in unit.unit.getMatchingUniques("+[]% combat bonus in []") // deprecated as of 3.14.1 - changed to "+[]% Strength in []" - + unit.unit.getMatchingUniques("+[]% Strength in []") + for (unique in unit.unit.getMatchingUniques("+[]% Strength in []") + unit.getCivInfo().getMatchingUniques("+[]% combat bonus for units fighting in []")) { val filter = unique.params[1] if (tile.matchesUniqueFilter(filter, unit.getCivInfo())) @@ -220,13 +219,6 @@ object BattleDamage { modifiers["Haka War Dance"] = -10 - // Deprecated as of 3.14.1 - changed to "+[15]% Strength in [Rough terrain]" - val isRoughTerrain = tile.isRoughTerrain() - for (BDM in getBattleDamageModifiersOfUnit(unit.unit)) { - val text = BDM.getText() - if (BDM.vs == "units in open terrain" && !isRoughTerrain) modifiers.add(text, (BDM.modificationAmount).toInt()) - if (BDM.vs == "units in rough terrain" && isRoughTerrain) modifiers.add(text, (BDM.modificationAmount).toInt()) - } return modifiers } diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index be4b42f815..bc2fdcd1f6 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -161,9 +161,6 @@ class CityStats { // This requires more... complex navigation of the local uniques to merge into "+[amount]% growth [cityFilter]" for (unique in cityInfo.civInfo.getMatchingUniques("+[]% growth in all cities")) bonus += unique.params[0].toFloat() - // Deprecated as of 3.12.13 -> moved to "+[amount]% growth [in capital]" - if (cityInfo.isCapital()) for (unique in cityInfo.civInfo.getMatchingUniques("+[]% growth in capital")) - bonus += unique.params[0].toFloat() // "+[amount]% growth [cityFilter]" for (unique in cityInfo.civInfo.getMatchingUniques("+[]% growth []")) @@ -201,12 +198,7 @@ class CityStats { newHappinessList["Population"] = -unhappinessFromCitizens * unhappinessModifier - var happinessFromPolicies = 0f - // Deprecated as of 3.12.13 - replaced by "[+1 Happiness] [in all cities connected to capital]" - if (civInfo.hasUnique("+1 happiness for every city connected to capital") - && cityInfo.isConnectedToCapital()) - happinessFromPolicies += 1f - happinessFromPolicies += getStatsFromUniques(civInfo.policies.policyUniques.getAllUniques()).happiness + var happinessFromPolicies = getStatsFromUniques(civInfo.policies.policyUniques.getAllUniques()).happiness newHappinessList["Policies"] = happinessFromPolicies @@ -258,13 +250,6 @@ class CityStats { val stats = Stats() for (unique in uniques.toList()) { // Should help mitigate getConstructionButtonDTOs concurrency problems. - - // Deprecated by 3.12.13 - replaced by "[stats] [cityFilter]" - if (unique.placeholderText == "[] in capital" && cityInfo.isCapital() - || unique.placeholderText == "[] in all cities" - || unique.placeholderText == "[] in all cities with a garrison" && cityInfo.getCenterTile().militaryUnit != null) - stats.add(unique.stats) - // "[stats] [cityFilter]" if (unique.placeholderText == "[] []" && cityInfo.matchesFilter(unique.params[1])) stats.add(unique.stats) @@ -274,18 +259,6 @@ class CityStats { val amountOfEffects = (cityInfo.population.population / unique.params[1].toInt()).toFloat() stats.add(unique.stats.times(amountOfEffects)) } - - // Deprecated by 3.12.13 - replaced by "[] per [] population [in all cities]" - if (unique.placeholderText == "[] per [] population in all cities") { - val amountOfEffects = (cityInfo.population.population / unique.params[1].toInt()).toFloat() - stats.add(unique.stats.times(amountOfEffects)) - } - - // Deprecated by 3.12.13 - replaced by "[+1 Gold, +1 Happiness] per [2] population [in capital]" - if (unique.text == "+1 gold and -1 unhappiness for every 2 citizens in capital" && cityInfo.isCapital()) { - stats.gold += (cityInfo.population.population / 2).toFloat() - stats.happiness += (cityInfo.population.population / 2).toFloat() - } } return stats diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index ba2a572b3e..f57f89fcae 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -201,10 +201,6 @@ class DiplomacyManager() { else -> 1f } - // Deprecated at 3.12.11 in favor of "City-State Influence degrades [50]% slower" - if (otherCiv().hasUnique("City-State Influence degrades at half rate")) - modifier *= .5f - for (unique in otherCiv().getMatchingUniques("City-State Influence degrades []% slower")) modifier *= (100f - unique.params[0].toInt()) / 100