diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt index 5c5e8f716b..15c4aa8a27 100644 --- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt +++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt @@ -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 } diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt index c5bc155c8b..033e88bed5 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt @@ -271,7 +271,8 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr GameBasics.Translations.getLanguages().map { Language(it) }.sortedByDescending { it.percentComplete } .forEach { languageArray.add(it) } 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() languageSelectBox.addListener(object : ChangeListener() {