From b0f3d30d797ddf0bf1b8336bc4bd1d1c4f58d6d8 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 8 May 2021 23:35:52 +0300 Subject: [PATCH] Fixed double consumption of resources for "Comsumes [amount] [resource]" unique --- android/gradle.properties | 2 -- core/src/com/unciv/logic/city/CityInfo.kt | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 android/gradle.properties diff --git a/android/gradle.properties b/android/gradle.properties deleted file mode 100644 index d015431a85..0000000000 --- a/android/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index e7894d64ac..e185e0094e 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -203,10 +203,6 @@ class CityInfo { val resource = getRuleset().tileResources[resourceName]!! cityResources.add(resource, -amount, "Buildings") } - for (unique in building.uniqueObjects.filter { it.placeholderText == "Consumes [] []" }) { - val resource = getRuleset().tileResources[unique.params[1]] - if (resource != null) cityResources.add(resource, -unique.params[0].toInt(), "Buildings") - } } for (unique in cityConstructions.builtBuildingUniqueMap.getUniques("Provides [] []")) { // E.G "Provides [1] [Iron]" val resource = getRuleset().tileResources[unique.params[1]]