AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made city-state bonuses immutable to avoid future problems a la #5050

Browse Source
This commit is contained in:
yairm210 2021-09-02 17:37:52 +03:00
parent d0dbb27e00
commit 15335f3f7c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View File

@ -109,8 +109,15 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
} else { } else {
// Deprecated, assume Civ V values for compatibility // Deprecated, assume Civ V values for compatibility
if (otherCiv.cityStateType == CityStateType.Cultured) { if (otherCiv.cityStateType == CityStateType.Cultured) {
cityStateBonus.culture = if(civInfo.getEraNumber() in 0..1) 3f else if (civInfo.getEraNumber() in 2..3) 6f else 13f cityStateBonus.culture =
if (otherCiv.getDiplomacyManager(civInfo.civName).relationshipLevel() == RelationshipLevel.Ally) when {
civInfo.getEraNumber() in 0..1 -> 3f
civInfo.getEraNumber() in 2..3 -> 6f
else -> 13f
}
if (otherCiv.getDiplomacyManager(civInfo.civName)
.relationshipLevel() == RelationshipLevel.Ally
)
cityStateBonus.culture *= 2f cityStateBonus.culture *= 2f
} }
} }

4
core/src/com/unciv/models/ruleset/Era.kt
View File

@ -20,8 +20,8 @@ class Era : INamed {
var settlerBuildings = ArrayList<String>() var settlerBuildings = ArrayList<String>()
var startingObsoleteWonders = ArrayList<String>() var startingObsoleteWonders = ArrayList<String>()
var baseUnitBuyCost = 200 var baseUnitBuyCost = 200
var friendBonus = HashMap<String, ArrayList<String>>() var friendBonus = HashMap<String, List<String>>()
var allyBonus = HashMap<String, ArrayList<String>>() var allyBonus = HashMap<String, List<String>>()
var iconRGB: List<Int>? = null var iconRGB: List<Int>? = null
fun getStartingUnits(): List<String> { fun getStartingUnits(): List<String> {