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

Fixed tests which broke due to console checking being dependant on UncivGame.Current

Browse Source
This commit is contained in:
Yair Morgenstern
2020-07-04 23:57:45 +03:00
parent d7cc0868fb
commit c94079c0a7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -183,11 +183,11 @@ class Ruleset {
* save all of the loaded rulesets somewhere for later use * save all of the loaded rulesets somewhere for later use
* */ * */
object RulesetCache :HashMap<String,Ruleset>() { object RulesetCache :HashMap<String,Ruleset>() {
fun loadRulesets() { fun loadRulesets(consoleMode:Boolean=false) {
for(ruleset in BaseRuleset.values()){ for (ruleset in BaseRuleset.values()) {
val fileName = "jsons/${ruleset.fullName}" val fileName = "jsons/${ruleset.fullName}"
val fileHandle = if(UncivGame.Current.consoleMode) FileHandle(fileName) val fileHandle = if (consoleMode) FileHandle(fileName)
else Gdx.files.internal(fileName) else Gdx.files.internal(fileName)
this[ruleset.fullName] = Ruleset().apply { load(fileHandle) } this[ruleset.fullName] = Ruleset().apply { load(fileHandle) }
} }

2
desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt
View File

@ -39,7 +39,7 @@ internal object ConsoleLauncher {
UncivGame.Current.simulateMaxTurns = 1000 UncivGame.Current.simulateMaxTurns = 1000
UncivGame.Current.simulateUntilWin = true UncivGame.Current.simulateUntilWin = true
RulesetCache.loadRulesets() RulesetCache.loadRulesets(true)
val gameParameters = getGameParameters("China", "Greece") val gameParameters = getGameParameters("China", "Greece")
val mapParameters = getMapParameters() val mapParameters = getMapParameters()