mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-19 12:18:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicated city-state bonus bug (#5042)

Browse Source 
* fix city-state bug

* pt 2
This commit is contained in:
SimonCeder
2021-08-31 21:18:58 +02:00
committed by GitHub
parent 248145cf8f
commit cd7bd8fcfd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -1160,11 +1160,11 @@ class CivilizationInfo {
if (!isCityState())
return false
val eraInfo = getEraObject()
val bonuses = if (eraInfo == null) null
val allyBonuses = if (eraInfo == null) null
else eraInfo.allyBonus[cityStateType.name]
if (bonuses != null) {
if (allyBonuses != null) {
// Defined city states in json
bonuses.addAll(eraInfo!!.friendBonus[cityStateType.name]!!)
val bonuses = allyBonuses + eraInfo!!.friendBonus[cityStateType.name]!!
for (bonus in bonuses) {
if (statType == Stat.Happiness && bonus.getPlaceholderText() == "Provides [] Happiness")
return true