From 0c89986af4a00ebb112fac64af559f3e080c5cf8 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 25 Jan 2021 20:47:50 +0200 Subject: [PATCH] Resolved #3436 - parametrized "+[]% [] in all cities" --- android/assets/jsons/Civ V - Vanilla/Buildings.json | 2 +- core/src/com/unciv/logic/city/CityStats.kt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index 1e18a15ea4..16bfcce3cf 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -599,7 +599,7 @@ "culture": 1, "isWonder": true, "greatPersonPoints": {"culture": 2}, - "uniques": ["Culture in all cities increased by 25%"], + "uniques": ["+[25]% [Culture] in all cities"], "requiredTech": "Acoustics", "quote": "'I live and love in God's peculiar light.' - Michelangelo Buonarroti" }, diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 0b751f6c95..6fd96f9d5e 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -331,6 +331,10 @@ class CityStats { stats.production += unique.params[0].toInt() } + // For instance "+[50]% [Production] + for (unique in uniques.filter { it.placeholderText == "+[]% [] in all cities"}) + stats.add(Stat.valueOf(unique.params[1]), unique.params[0].toFloat()) + for (unique in uniques.filter { it.placeholderText == "+[]% Production when constructing []" }) { if (constructionMatchesFilter(currentConstruction, unique.params[1]))