From 0d328ef99a40b4c6e6db60bbeaf8805bb9dde577 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 9 Jul 2021 11:01:25 +0300 Subject: [PATCH] Stuffed some +/- uniques into the square brackets --- android/assets/jsons/Civ V - Vanilla/Buildings.json | 4 ++-- android/assets/jsons/Civ V - Vanilla/Policies.json | 6 +++--- core/src/com/unciv/logic/city/CityStats.kt | 2 +- core/src/com/unciv/models/ruleset/tile/TileImprovement.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index a4a56f1957..9eaa534b0c 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -146,7 +146,7 @@ "culture": 1, "greatPersonPoints": {"production": 1}, "isWonder": true, - "uniques": ["-[25]% tile improvement construction time","[2] free [Worker] units appear"], + "uniques": ["[-25]% tile improvement construction time","[2] free [Worker] units appear"], "requiredTech": "Masonry", "quote": "'O, let not the pains of death which come upon thee enter into my body. I am the god Tem, and I am the foremost part of the sky, and the power which protecteth me is that which is with all the gods forever.' - The Book of the Dead, translated by Sir Ernest Alfred Wallis Budge" }, @@ -761,7 +761,7 @@ "culture": 1, "greatPersonPoints": {"science": 2}, "isWonder": true, - "uniques": ["Free [Great Scientist] appears","Science gained from research agreements +[50]%"], + "uniques": ["Free [Great Scientist] appears","Science gained from research agreements [+50]%"], "requiredTech": "Architecture", "quote": "'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.' - James Russell Lowell" }, diff --git a/android/assets/jsons/Civ V - Vanilla/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json index ab1601043b..de0bf19c30 100644 --- a/android/assets/jsons/Civ V - Vanilla/Policies.json +++ b/android/assets/jsons/Civ V - Vanilla/Policies.json @@ -55,7 +55,7 @@ }, { "name": "Citizenship", - "uniques": ["-[25]% tile improvement construction time", "Free [Worker] appears"], + "uniques": ["[-25]% tile improvement construction time", "Free [Worker] appears"], "row": 1, "column": 4 }, @@ -282,7 +282,7 @@ { "name": "Rationalism", "era": "Renaissance era", - "uniques": ["+[15]% [Science] while the empire is happy", "Incompatible with [Piety]"], + "uniques": ["[15]% [Science] while the empire is happy", "Incompatible with [Piety]"], "policies": [ { "name": "Secularism", @@ -313,7 +313,7 @@ }, { "name": "Scientific Revolution", - "uniques": ["Science gained from research agreements +[50]%"], + "uniques": ["Science gained from research agreements [+50]%"], "requires": ["Free Thought"], "row": 3, "column": 1 diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 99eae25b15..8a62fbf685 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -330,7 +330,7 @@ class CityStats { } if (cityInfo.civInfo.getHappiness() >= 0) { - for (unique in uniques.filter { it.placeholderText == "+[]% [] while the empire is happy"}) + 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 diff --git a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt index 1553964bfa..cb0bee157d 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt @@ -25,7 +25,7 @@ class TileImprovement : NamedStats(), ICivilopediaText { fun getTurnsToBuild(civInfo: CivilizationInfo): Int { var realTurnsToBuild = turnsToBuild.toFloat() * civInfo.gameInfo.gameParameters.gameSpeed.modifier - for (unique in civInfo.getMatchingUniques("-[]% tile improvement construction time")) { + for (unique in civInfo.getMatchingUniques("[]% tile improvement construction time")) { realTurnsToBuild *= 1 - unique.params[0].toFloat() / 100f } // Deprecated since 3.14.17