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

Updated Liberty branch to G&K (#4115)

Browse Source 
* Updated Liberty branch to G&K, improved modularity of uniques

* Updated meritocracy to only affect non-occupied cities

* Implemented requsted changes
This commit is contained in:
Xander Lenstra
2021-06-13 07:06:35 +02:00
committed by GitHub
parent 583bca56b8
commit 60809db065
5 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,7 @@
"culture": 1,
"greatPersonPoints": {"production": 1},
"isWonder": true,
"uniques": ["Worker construction increased 25%","[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"
},

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

@ -48,21 +48,21 @@
"uniques": ["[+1 Culture] [in all cities]"],
"policies": [
{
"name": "Collective Rule",
"uniques": ["+[50]% Production when constructing [Settler] units [in capital]", "Free [Settler] appears"],
"name": "Republic",
"uniques": ["[+1 Production] [in all cities]", "+[5]% Production when constructing [Buildings]"],
"row": 1,
"column": 1
},
{
"name": "Citizenship",
"uniques": ["Tile improvement speed +25%", "Free [Worker] appears"],
"uniques": ["-[25]% tile improvement construction time", "Free [Worker] appears"],
"row": 1,
"column": 4
},
{
"name": "Republic",
"uniques": ["[+1 Production] [in all cities]", "+[5]% Production when constructing [Buildings]"],
"requires": ["Collective Rule"],
"name": "Collective Rule",
"uniques": ["+[50]% Production when constructing [Settler] units [in capital]", "Free [Settler] appears"],
"requires": ["Republic"],
"row": 2,
"column": 1
},
@ -75,7 +75,7 @@
},
{
"name": "Meritocracy",
"uniques": ["[+1 Happiness] [in all cities connected to capital]", "Unhappiness from population decreased by [5]%"],
"uniques": ["[+1 Happiness] [in all cities connected to capital]", "Unhappiness from population decreased by [5]% [in all non-occupied cities]"],
"requires": ["Citizenship"],
"row": 2,
"column": 5

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

@ -467,14 +467,15 @@ class CityInfo {
}
fun matchesFilter(filter: String): Boolean {
return when {
filter == "in this city" -> true
filter == "in all cities" -> true
filter == "in all coastal cities" && getCenterTile().isCoastalTile() -> true
filter == "in capital" && isCapital() -> true
filter == "in all cities with a world wonder" && cityConstructions.getBuiltBuildings().any { it.isWonder } -> true
filter == "in all cities connected to capital" -> isConnectedToCapital()
filter == "in all cities with a garrison" && getCenterTile().militaryUnit != null -> true
return when (filter) {
"in this city" -> true
"in all cities" -> true
"in all coastal cities" -> getCenterTile().isCoastalTile()
"in capital" -> isCapital()
"in all non-occupied cities" -> !cityStats.hasExtraAnnexUnhappiness() || isPuppet
"in all cities with a world wonder" -> cityConstructions.getBuiltBuildings().any { it.isWonder }
"in all cities connected to capital" -> isConnectedToCapital()
"in all cities with a garrison" -> getCenterTile().militaryUnit != null
else -> false
}
}

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

@ -195,6 +195,10 @@ class CityStats {
for (unique in civInfo.getMatchingUniques("Unhappiness from population decreased by []%"))
unhappinessFromCitizens *= (1 - unique.params[0].toFloat() / 100)
for (unique in civInfo.getMatchingUniques("Unhappiness from population decreased by []% []"))
if (cityInfo.matchesFilter(unique.params[1]))
unhappinessFromCitizens *= (1 - unique.params[0].toFloat() / 100)
newHappinessList["Population"] = -unhappinessFromCitizens * unhappinessModifier
@ -222,7 +226,7 @@ class CityStats {
}
private fun hasExtraAnnexUnhappiness(): Boolean {
fun hasExtraAnnexUnhappiness(): Boolean {
if (cityInfo.civInfo.civName == cityInfo.foundingCiv || cityInfo.foundingCiv == "" || cityInfo.isPuppet) return false
return !cityInfo.containsBuildingUnique("Remove extra unhappiness from annexed cities")
}

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

@ -28,11 +28,17 @@ class TileImprovement : NamedStats() {
fun getTurnsToBuild(civInfo: CivilizationInfo): Int {
var realTurnsToBuild = turnsToBuild.toFloat() * civInfo.gameInfo.gameParameters.gameSpeed.modifier
// todo UNIFY THESE
if (civInfo.hasUnique("Worker construction increased 25%"))
realTurnsToBuild *= 0.75f
if (civInfo.hasUnique("Tile improvement speed +25%"))
realTurnsToBuild *= 0.75f
for (unique in civInfo.getMatchingUniques("-[]% tile improvement construction time")) {
realTurnsToBuild *= 1 - unique.params[0].toFloat() / 100f
// Deprecated since 3.14.17
if (civInfo.hasUnique("Worker construction increased 25%"))
realTurnsToBuild *= 0.75f
if (civInfo.hasUnique("Tile improvement speed +25%"))
realTurnsToBuild *= 0.75f
//
}
// In some weird cases it was possible for something to take 0 turns, leading to it instead never finishing
if (realTurnsToBuild < 1) realTurnsToBuild = 1f
return realTurnsToBuild.roundToInt()
}