mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 00:39:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed double consumption of resources for "Comsumes [amount] [resource]" unique

Browse Source
This commit is contained in:
Yair Morgenstern
2021-05-08 23:35:52 +03:00
parent 60fb38dfc3
commit b0f3d30d79
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/gradle.properties
View File

@ -1,2 +0,0 @@
android.useAndroidX=true
android.enableJetifier=true

4
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -203,10 +203,6 @@ class CityInfo {
val resource = getRuleset().tileResources[resourceName]!! val resource = getRuleset().tileResources[resourceName]!!
cityResources.add(resource, -amount, "Buildings") 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]" for (unique in cityConstructions.builtBuildingUniqueMap.getUniques("Provides [] []")) { // E.G "Provides [1] [Iron]"
val resource = getRuleset().tileResources[unique.params[1]] val resource = getRuleset().tileResources[unique.params[1]]