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

Another change towards unified mod management

Browse Source
This commit is contained in:
Yair Morgenstern
2021-02-12 10:45:18 +02:00
parent a9fe8c42d8
commit c1a259ea7d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,9 +354,9 @@ object RulesetCache :HashMap<String,Ruleset>() {
fun getBaseRuleset() = this[BaseRuleset.Civ_V_Vanilla.fullName]!!.clone() // safeguard, o no-one edits the base ruleset by mistake fun getBaseRuleset() = this[BaseRuleset.Civ_V_Vanilla.fullName]!!.clone() // safeguard, o no-one edits the base ruleset by mistake
fun getComplexRuleset(gameParameters: GameParameters): Ruleset { fun getComplexRuleset(mods:LinkedHashSet<String>):Ruleset{
val newRuleset = Ruleset() val newRuleset = Ruleset()
val loadedMods = gameParameters.mods.filter { containsKey(it) }.map { this[it]!! } val loadedMods = mods.filter { containsKey(it) }.map { this[it]!! }
if (loadedMods.none { it.modOptions.isBaseRuleset }) if (loadedMods.none { it.modOptions.isBaseRuleset })
newRuleset.add(getBaseRuleset()) newRuleset.add(getBaseRuleset())
for (mod in loadedMods.sortedByDescending { it.modOptions.isBaseRuleset }) { for (mod in loadedMods.sortedByDescending { it.modOptions.isBaseRuleset }) {
@ -370,6 +370,9 @@ object RulesetCache :HashMap<String,Ruleset>() {
return newRuleset return newRuleset
} }
fun getComplexRuleset(gameParameters: GameParameters): Ruleset =
getComplexRuleset(gameParameters.mods)
} }
class Specialist: NamedStats() { class Specialist: NamedStats() {