From c1a259ea7d99911251f7b4b9c79d6272e22c9815 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 12 Feb 2021 10:45:18 +0200
Subject: [PATCH] Another change towards unified mod management

---
 core/src/com/unciv/models/ruleset/Ruleset.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index 9d2febe918..ca412fbb74 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -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 getComplexRuleset(gameParameters: GameParameters): Ruleset {
+    fun getComplexRuleset(mods:LinkedHashSet<String>):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 })
             newRuleset.add(getBaseRuleset())
         for (mod in loadedMods.sortedByDescending { it.modOptions.isBaseRuleset }) {
@@ -370,6 +370,9 @@ object RulesetCache :HashMap<String,Ruleset>() {
 
         return newRuleset
     }
+
+    fun getComplexRuleset(gameParameters: GameParameters): Ruleset =
+            getComplexRuleset(gameParameters.mods)
 }
 
 class Specialist: NamedStats() {