From be14394529305cfeeab26e6b06f1621094cedff4 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 19 Feb 2017 16:33:24 +0100
Subject: [PATCH] load locales and rules separately (xml prep work)

---
 conf/e2/locales.xml               |  1 +
 conf/e2/{config.xml => rules.xml} | 13 -------------
 conf/e3/locales.xml               | 13 +++++++++++++
 conf/e3/{config.xml => rules.xml} |  5 -----
 scripts/eressea/xmlconf.lua       |  3 ++-
 5 files changed, 16 insertions(+), 19 deletions(-)
 rename conf/e2/{config.xml => rules.xml} (75%)
 create mode 100644 conf/e3/locales.xml
 rename conf/e3/{config.xml => rules.xml} (84%)

diff --git a/conf/e2/locales.xml b/conf/e2/locales.xml
index f71525343..7a31bbc17 100644
--- a/conf/e2/locales.xml
+++ b/conf/e2/locales.xml
@@ -3,6 +3,7 @@
   <xi:include href="config://core/messages.xml"/>
   <xi:include href="config://core/de/strings.xml"/>
   <xi:include href="config://core/en/strings.xml"/>
+  <xi:include href="config://game/strings.xml"/>
   <xi:include href="config://game/spellinfo.xml" />
   <xi:include href="config://default/names-undead.xml"/>
   <xi:include href="config://default/names-skeletons.xml"/>
diff --git a/conf/e2/config.xml b/conf/e2/rules.xml
similarity index 75%
rename from conf/e2/config.xml
rename to conf/e2/rules.xml
index 56c622d04..8d0b01b27 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/rules.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0"?>
 <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config://core/messages.xml"/>
-
-  <!-- Localization -->
-  <xi:include href="config://core/de/strings.xml"/>
-  <xi:include href="config://core/en/strings.xml"/>
-  <xi:include href="config://game/spellinfo.xml" />
 
   <xi:include href="config://core/common/items.xml" />
   <xi:include href="config://core/common/armor.xml" />
@@ -26,7 +20,6 @@
   <xi:include href="config://game/equipment.xml"/>
   <xi:include href="config://game/items.xml"/>
   <xi:include href="config://game/spells.xml"/>
-  <xi:include href="config://game/strings.xml"/>
   <xi:include href="config://default/adamantium.xml"/>
   <equipment>
     <set name="autoseed_unit">
@@ -46,10 +39,4 @@
       <item name="adamantium" amount="1"/>
     </set>
   </equipment>
-
-  <xi:include href="config://default/names-undead.xml"/>
-  <xi:include href="config://default/names-skeletons.xml"/>
-  <xi:include href="config://default/names-zombies.xml"/>
-  <xi:include href="config://default/names-ghouls.xml"/>
-  <xi:include href="config://default/names-dragons.xml"/>
 </eressea>
diff --git a/conf/e3/locales.xml b/conf/e3/locales.xml
new file mode 100644
index 000000000..2d94bf202
--- /dev/null
+++ b/conf/e3/locales.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="config://core/messages.xml"/>
+  <xi:include href="config://core/de/strings.xml"/>
+  <xi:include href="config://core/en/strings.xml"/>
+  <xi:include href="config://game/strings.xml"/>
+  <xi:include href="config://game/messages.xml"/>
+  <xi:include href="config://default/names-undead.xml"/>
+  <xi:include href="config://default/names-skeletons.xml"/>
+  <xi:include href="config://default/names-zombies.xml"/>
+  <xi:include href="config://default/names-ghouls.xml"/>
+  <xi:include href="config://default/names-dragons.xml"/>
+</eressea>
diff --git a/conf/e3/config.xml b/conf/e3/rules.xml
similarity index 84%
rename from conf/e3/config.xml
rename to conf/e3/rules.xml
index ac05d5a5a..421b54d7a 100644
--- a/conf/e3/config.xml
+++ b/conf/e3/rules.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0"?>
 <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config://core/messages.xml"/>
-  <xi:include href="config://core/de/strings.xml"/>
-  <xi:include href="config://core/en/strings.xml"/>
   <xi:include href="config://core/common/items.xml"/>
   <xi:include href="config://core/common/herbs.xml" />
   <xi:include href="config://core/spoils.xml"/>
@@ -15,8 +12,6 @@
   <xi:include href="config://game/shipnames.xml"/>
   <xi:include href="config://core/calendar.xml"/>
   <xi:include href="config://game/items.xml" />
-  <xi:include href="config://game/strings.xml"/>
-  <xi:include href="config://game/messages.xml"/>
   <xi:include href="config://game/races.xml"/>
   <xi:include href="config://game/buildings.xml"/>
   <xi:include href="config://game/equipment.xml"/>
diff --git a/scripts/eressea/xmlconf.lua b/scripts/eressea/xmlconf.lua
index 584f8d3e2..84f29eceb 100644
--- a/scripts/eressea/xmlconf.lua
+++ b/scripts/eressea/xmlconf.lua
@@ -4,7 +4,8 @@ if config.install then
 end
 if config.rules then
     local rules = config.rules .. '/'
-    assert(0 == read_xml(confdir .. rules .. 'config.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
     assert(0 == eressea.config.read(rules .. 'config.json', confdir), "could not read JSON data")
+    assert(0 == read_xml(confdir .. rules .. 'rules.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
+    assert(0 == read_xml(confdir .. rules .. 'locales.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
 end
 eressea.game.reset()