From d3ba68f7d330cc159e016ffcd52ce3d2179383bf Mon Sep 17 00:00:00 2001 From: 9kgsofrice <65415105+9kgsofrice@users.noreply.github.com> Date: Wed, 9 Dec 2020 21:02:46 +0000 Subject: [PATCH] resources can be added by tile improvement with unique "Provides [] []" (#3406) * resources can be added by tile improvement with unique "Provides [] []" * to minimise indentation * to minimise indentation * changed null check * flip if --- core/src/com/unciv/logic/city/CityInfo.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 68f74d8dec..e634f25aab 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -180,6 +180,15 @@ class CityInfo { val amount = getTileResourceAmount(tileInfo) * civInfo.getResourceModifier(resource) if (amount > 0) cityResources.add(resource, amount, "Tiles") } + for (tileInfo in getTiles()) { + if (tileInfo.improvement== null) continue + val tileImprovement = tileInfo.getTileImprovement() + for (unique in tileImprovement!!.uniqueObjects) + if (unique.placeholderText == "Provides [] []") { + val resource = getRuleset().tileResources[unique.params[1]] ?: continue + cityResources.add(resource, unique.params[0].toInt() * civInfo.getResourceModifier(resource), "Tiles") + } + } for (building in cityConstructions.getBuiltBuildings().filter { it.requiredResource != null }) { val resource = getRuleset().tileResources[building.requiredResource]!!