From e3e08732db13741c40b63ff42dfec6d5e89a3a40 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 14 Jul 2021 22:51:33 +0300 Subject: [PATCH] Deprecations --- core/src/com/unciv/logic/battle/Battle.kt | 3 --- core/src/com/unciv/logic/city/CityStats.kt | 5 ----- 2 files changed, 8 deletions(-) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index a26ba34f35..0067ab1c8e 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -468,9 +468,6 @@ object Battle { val strength = when { (attacker.unit.hasUnique("Nuclear weapon of Strength []")) -> attacker.unit.getMatchingUniques("Nuclear weapon of Strength []").first().params[0].toInt() - // Deprecated since 3.15.3 - (attacker.unit.hasUnique("Nuclear weapon")) -> 1 - // else -> return } diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 19f9d718a3..0345639b75 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -342,11 +342,6 @@ class CityStats { if (cityInfo.civInfo.getHappiness() >= 0) { for (unique in uniques.filter { it.placeholderText == "[]% [] while the empire is happy"}) stats.add(Stat.valueOf(unique.params[1]), unique.params[0].toFloat()) - - // Deprecated since 3.15.0 - for (unique in uniques.filter { it.placeholderText == "+15% science while the empire is happy"}) - stats.science += 15f - // } return stats