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

Transportation upkeep no longer disappears after adopting Trade Unions - kudos ..,,,!

Browse Source
This commit is contained in:
Yair Morgenstern 2019-10-05 20:46:10 +03:00
parent 67916f9be2
commit b9f79376ce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,8 @@ class CivInfoStats(val civInfo: CivilizationInfo){
} }
} }
} }
if (civInfo.policies.isAdopted("Trade Unions")) transportationUpkeep *= (2 / 3f).toInt() if (civInfo.policies.isAdopted("Trade Unions"))
transportationUpkeep = (transportationUpkeep * 2 / 3f).toInt()
return transportationUpkeep return transportationUpkeep
} }

3
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
View File

@ -271,7 +271,8 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr
GameBasics.Translations.getLanguages().map { Language(it) }.sortedByDescending { it.percentComplete } GameBasics.Translations.getLanguages().map { Language(it) }.sortedByDescending { it.percentComplete }
.forEach { languageArray.add(it) } .forEach { languageArray.add(it) }
languageSelectBox.items = languageArray languageSelectBox.items = languageArray
languageSelectBox.selected = languageArray.first { it.language == UnCivGame.Current.settings.language } val matchingLanguage = languageArray.firstOrNull { it.language == UnCivGame.Current.settings.language }
languageSelectBox.selected = if (matchingLanguage != null) matchingLanguage else languageArray.first()
innerTable.add(languageSelectBox).pad(10f).row() innerTable.add(languageSelectBox).pad(10f).row()
languageSelectBox.addListener(object : ChangeListener() { languageSelectBox.addListener(object : ChangeListener() {