From c40dd09e11540ebb6e45958b9b6b55d54d460d18 Mon Sep 17 00:00:00 2001
From: proteus-anguinus <github2015@rheinig.de>
Date: Wed, 25 Mar 2020 11:52:20 +0100
Subject: [PATCH] Complex ruleset merge order (#2240)

* .gitignore: mods SaveFiles transients

* Simple transposition prevents mod improvements from appearing below roads&removals
should also move modded nations to the top in new game player picker
---
 .gitignore                                   | 11 ++++-------
 core/src/com/unciv/models/ruleset/Ruleset.kt |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 537f08f0..acab8fce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,13 +101,6 @@ nb-configuration.xml
 /local.properties
 .gradle/
 gradle-app.setting
-/build/
-/android/build/
-/core/build/
-/desktop/build/
-/html/build/
-/ios/build/
-/ios-moe/build/
 
 ## OS Specific
 .DS_Store
@@ -139,3 +132,7 @@ desktop/packr/
 desktop/packrCache/
 deploy/
 android/release/
+
+android/assets/mods/
+android/assets/SaveFiles/
+android/assets/GameSettingsOld.json
diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index 8d2740d3..efff4653 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -171,12 +171,12 @@ object RulesetCache :HashMap<String,Ruleset>(){
 
     fun getComplexRuleset(mods:Collection<String>): Ruleset {
         val newRuleset = Ruleset()
-        newRuleset.add(getBaseRuleset())
         for(mod in mods)
             if(containsKey(mod)) {
                 newRuleset.add(this[mod]!!)
                 newRuleset.mods+=mod
             }
+        newRuleset.add(getBaseRuleset())
         return newRuleset
     }
 }
\ No newline at end of file