From c2fdcb7849c0a89db27ab9445e670901787bca90 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 24 Apr 2020 14:03:41 +0300
Subject: [PATCH] Prepping for multiple rulesets - current ruleset is now is
 Vanilla folder

---
 android/assets/jsons/{ => Civ V - Vanilla}/Buildings.json      | 0
 android/assets/jsons/{ => Civ V - Vanilla}/Difficulties.json   | 0
 .../assets/jsons/{ => Civ V - Vanilla}/GreatPeopleNames.json   | 0
 android/assets/jsons/{ => Civ V - Vanilla}/Nations.json        | 0
 android/assets/jsons/{ => Civ V - Vanilla}/Policies.json       | 0
 android/assets/jsons/{ => Civ V - Vanilla}/Techs.json          | 0
 android/assets/jsons/{ => Civ V - Vanilla}/Terrains.json       | 0
 .../assets/jsons/{ => Civ V - Vanilla}/TileImprovements.json   | 0
 android/assets/jsons/{ => Civ V - Vanilla}/TileResources.json  | 0
 android/assets/jsons/{ => Civ V - Vanilla}/UnitPromotions.json | 0
 android/assets/jsons/{ => Civ V - Vanilla}/Units.json          | 0
 core/src/com/unciv/models/ruleset/Ruleset.kt                   | 3 ++-
 12 files changed, 2 insertions(+), 1 deletion(-)
 rename android/assets/jsons/{ => Civ V - Vanilla}/Buildings.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/Difficulties.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/GreatPeopleNames.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/Nations.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/Policies.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/Techs.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/Terrains.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/TileImprovements.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/TileResources.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/UnitPromotions.json (100%)
 rename android/assets/jsons/{ => Civ V - Vanilla}/Units.json (100%)

diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json
similarity index 100%
rename from android/assets/jsons/Buildings.json
rename to android/assets/jsons/Civ V - Vanilla/Buildings.json
diff --git a/android/assets/jsons/Difficulties.json b/android/assets/jsons/Civ V - Vanilla/Difficulties.json
similarity index 100%
rename from android/assets/jsons/Difficulties.json
rename to android/assets/jsons/Civ V - Vanilla/Difficulties.json
diff --git a/android/assets/jsons/GreatPeopleNames.json b/android/assets/jsons/Civ V - Vanilla/GreatPeopleNames.json
similarity index 100%
rename from android/assets/jsons/GreatPeopleNames.json
rename to android/assets/jsons/Civ V - Vanilla/GreatPeopleNames.json
diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Civ V - Vanilla/Nations.json
similarity index 100%
rename from android/assets/jsons/Nations.json
rename to android/assets/jsons/Civ V - Vanilla/Nations.json
diff --git a/android/assets/jsons/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json
similarity index 100%
rename from android/assets/jsons/Policies.json
rename to android/assets/jsons/Civ V - Vanilla/Policies.json
diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Civ V - Vanilla/Techs.json
similarity index 100%
rename from android/assets/jsons/Techs.json
rename to android/assets/jsons/Civ V - Vanilla/Techs.json
diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Civ V - Vanilla/Terrains.json
similarity index 100%
rename from android/assets/jsons/Terrains.json
rename to android/assets/jsons/Civ V - Vanilla/Terrains.json
diff --git a/android/assets/jsons/TileImprovements.json b/android/assets/jsons/Civ V - Vanilla/TileImprovements.json
similarity index 100%
rename from android/assets/jsons/TileImprovements.json
rename to android/assets/jsons/Civ V - Vanilla/TileImprovements.json
diff --git a/android/assets/jsons/TileResources.json b/android/assets/jsons/Civ V - Vanilla/TileResources.json
similarity index 100%
rename from android/assets/jsons/TileResources.json
rename to android/assets/jsons/Civ V - Vanilla/TileResources.json
diff --git a/android/assets/jsons/UnitPromotions.json b/android/assets/jsons/Civ V - Vanilla/UnitPromotions.json
similarity index 100%
rename from android/assets/jsons/UnitPromotions.json
rename to android/assets/jsons/Civ V - Vanilla/UnitPromotions.json
diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json
similarity index 100%
rename from android/assets/jsons/Units.json
rename to android/assets/jsons/Civ V - Vanilla/Units.json
diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index f22098e1fe..0a976820e1 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -179,8 +179,9 @@ class Ruleset {
  * save all of the loaded rulesets somewhere for later use
  *  */
 object RulesetCache :HashMap<String,Ruleset>() {
+    val vanillaRuleset = "Civ V - Vanilla"
     fun loadRulesets() {
-        this[""] = Ruleset().apply { load(Gdx.files.internal("jsons")) }
+        this[""] = Ruleset().apply { load(Gdx.files.internal("jsons/$vanillaRuleset")) }
 
         for (modFolder in Gdx.files.local("mods").list()) {
             if (modFolder.name().startsWith('.')) continue