AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stuffed some +/- uniques into the square brackets

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-09 11:01:25 +03:00
parent abd877dd1b
commit 0d328ef99a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/assets/jsons/Civ V - Vanilla/Buildings.json
View File

@ -146,7 +146,7 @@
"culture": 1, "culture": 1,
"greatPersonPoints": {"production": 1}, "greatPersonPoints": {"production": 1},
"isWonder": true, "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", "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" "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, "culture": 1,
"greatPersonPoints": {"science": 2}, "greatPersonPoints": {"science": 2},
"isWonder": true, "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", "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" "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"
}, },

6
android/assets/jsons/Civ V - Vanilla/Policies.json
View File

@ -55,7 +55,7 @@
}, },
{ {
"name": "Citizenship", "name": "Citizenship",
"uniques": ["-[25]% tile improvement construction time", "Free [Worker] appears"], "uniques": ["[-25]% tile improvement construction time", "Free [Worker] appears"],
"row": 1, "row": 1,
"column": 4 "column": 4
}, },
@ -282,7 +282,7 @@
{ {
"name": "Rationalism", "name": "Rationalism",
"era": "Renaissance era", "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": [ "policies": [
{ {
"name": "Secularism", "name": "Secularism",
@ -313,7 +313,7 @@
}, },
{ {
"name": "Scientific Revolution", "name": "Scientific Revolution",
"uniques": ["Science gained from research agreements +[50]%"], "uniques": ["Science gained from research agreements [+50]%"],
"requires": ["Free Thought"], "requires": ["Free Thought"],
"row": 3, "row": 3,
"column": 1 "column": 1

2
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -330,7 +330,7 @@ class CityStats {
} }
if (cityInfo.civInfo.getHappiness() >= 0) { 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()) stats.add(Stat.valueOf(unique.params[1]), unique.params[0].toFloat())
// Deprecated since 3.15.0 // Deprecated since 3.15.0

2
core/src/com/unciv/models/ruleset/tile/TileImprovement.kt
View File

@ -25,7 +25,7 @@ class TileImprovement : NamedStats(), ICivilopediaText {
fun getTurnsToBuild(civInfo: CivilizationInfo): Int { fun getTurnsToBuild(civInfo: CivilizationInfo): Int {
var realTurnsToBuild = turnsToBuild.toFloat() * civInfo.gameInfo.gameParameters.gameSpeed.modifier 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 realTurnsToBuild *= 1 - unique.params[0].toFloat() / 100f
} }
// Deprecated since 3.14.17 // Deprecated since 3.14.17