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

Fix missing icons and translations in civilopedia accessed from main menu (#6922)

Browse Source 
* Fix blank icons

* Apply translations to civilopedia + use complex ruleset

* Unused import

* Typo

* Simplify definition
This commit is contained in:
OptimizedForDensity
2022-05-25 12:31:12 -04:00
committed by GitHub
parent 156db1f5f7
commit fe0ec08e61
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/MainMenuScreen.kt
View File

@ -18,6 +18,7 @@ import com.unciv.models.ruleset.RulesetCache
import com.unciv.ui.multiplayer.MultiplayerScreen import com.unciv.ui.multiplayer.MultiplayerScreen
import com.unciv.ui.mapeditor.* import com.unciv.ui.mapeditor.*
import com.unciv.models.metadata.GameSetupInfo import com.unciv.models.metadata.GameSetupInfo
import com.unciv.models.ruleset.Ruleset
import com.unciv.ui.civilopedia.CivilopediaScreen import com.unciv.ui.civilopedia.CivilopediaScreen
import com.unciv.ui.crashhandling.launchCrashHandling import com.unciv.ui.crashhandling.launchCrashHandling
import com.unciv.ui.crashhandling.postCrashHandlingRunnable import com.unciv.ui.crashhandling.postCrashHandlingRunnable
@ -238,9 +239,13 @@ class MainMenuScreen: BaseScreen() {
} }
private fun openCivilopedia() { private fun openCivilopedia() {
val ruleset =RulesetCache[game.settings.lastGameSetup?.gameParameters?.baseRuleset] val rulesetParameters = game.settings.lastGameSetup?.gameParameters
?: RulesetCache[BaseRuleset.Civ_V_GnK.fullName] val ruleset = if (rulesetParameters == null)
?: return RulesetCache[BaseRuleset.Civ_V_GnK.fullName] ?: return
else RulesetCache.getComplexRuleset(rulesetParameters)
UncivGame.Current.translations.translationActiveMods = ruleset.mods
ImageGetter.setNewRuleset(ruleset)
setSkin()
game.setScreen(CivilopediaScreen(ruleset, this)) game.setScreen(CivilopediaScreen(ruleset, this))
} }