From 1ee6f5444a638892ad71eed602cc031335666a58 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Tue, 6 Feb 2018 21:28:48 +0100
Subject: [PATCH] finish XInclude removal project. reduce number of XML files
 for E3.

---
 conf/e2/config.json                 |   3 +-
 conf/e2/items.json                  |   7 +-
 conf/e3/config.json                 |  24 +++-
 conf/e3/items.json                  |  29 +++++
 conf/e3/locales.json                |  14 ++
 conf/e3/locales.xml                 |  12 --
 conf/e3/races.json                  |   9 ++
 conf/e3/rules.xml                   |  28 ----
 res/buildings/castle-2.xml          |   2 +
 res/core/spells.xml                 |   9 +-
 res/e3a/armor.xml                   |  91 +++++++++++--
 res/e3a/armor/chainmail.xml         |   9 --
 res/e3a/armor/laenmail.xml          |   9 --
 res/e3a/armor/laenshield.xml        |   9 --
 res/e3a/armor/plate.xml             |   9 --
 res/e3a/armor/rustychainmail.xml    |   9 --
 res/e3a/armor/rustyshield.xml       |   9 --
 res/e3a/armor/scale.xml             |  11 --
 res/e3a/armor/shield.xml            |   9 --
 res/e3a/armor/towershield.xml       |  13 --
 res/e3a/buildings.xml               |   7 +-
 res/e3a/equipment.xml               |   2 +
 res/e3a/familiars.xml               |   3 +-
 res/e3a/items.xml                   |  27 ++++
 res/e3a/races.xml                   |   9 +-
 res/e3a/resources.xml               |  17 ---
 res/e3a/resources/iron.xml          |   9 --
 res/e3a/resources/mallornseed.xml   |   4 -
 res/e3a/resources/seed.xml          |   4 -
 res/e3a/resources/stone.xml         |   8 --
 res/e3a/shipnames.xml               |   2 +
 res/e3a/ships.xml                   |   3 +-
 res/e3a/spellbooks/cerddor.xml      |   2 +
 res/e3a/spellbooks/common.xml       |   2 +
 res/e3a/spellbooks/draig.xml        |   2 +
 res/e3a/spellbooks/gray.xml         |   2 +
 res/e3a/spellbooks/gwyrrd.xml       |   2 +
 res/e3a/spellbooks/illaun.xml       |   2 +
 res/e3a/spells.xml                  |  11 +-
 res/e3a/strings.xml                 |   2 +
 res/e3a/weapons.xml                 | 191 ++++++++++++++++++++++++----
 res/e3a/weapons/axe.xml             |  13 --
 res/e3a/weapons/crossbow.xml        |  13 --
 res/e3a/weapons/greatbow.xml        |  21 ---
 res/e3a/weapons/greatsword.xml      |  15 ---
 res/e3a/weapons/halberd.xml         |  17 ---
 res/e3a/weapons/laensword.xml       |  15 ---
 res/e3a/weapons/lance.xml           |  12 --
 res/e3a/weapons/mallorncrossbow.xml |  13 --
 res/e3a/weapons/mallornlance.xml    |  12 --
 res/e3a/weapons/rep_crossbow.xml    |  15 ---
 res/e3a/weapons/rustygreatsword.xml |  15 ---
 res/e3a/weapons/rustyhalberd.xml    |  16 ---
 res/eressea/buildings.xml           |   2 +-
 res/eressea/races.xml               |   2 +-
 res/races/dragon.xml                |   5 +-
 res/races/goblin-3.xml              |   4 +
 res/races/wyrm.xml                  |   5 +
 res/races/youngdragon.xml           |   5 +-
 scripts/tests/e3/production.lua     |   1 +
 60 files changed, 407 insertions(+), 420 deletions(-)
 create mode 100644 conf/e3/items.json
 create mode 100644 conf/e3/locales.json
 delete mode 100644 conf/e3/locales.xml
 create mode 100644 conf/e3/races.json
 delete mode 100644 conf/e3/rules.xml
 delete mode 100644 res/e3a/armor/chainmail.xml
 delete mode 100644 res/e3a/armor/laenmail.xml
 delete mode 100644 res/e3a/armor/laenshield.xml
 delete mode 100644 res/e3a/armor/plate.xml
 delete mode 100644 res/e3a/armor/rustychainmail.xml
 delete mode 100644 res/e3a/armor/rustyshield.xml
 delete mode 100644 res/e3a/armor/scale.xml
 delete mode 100644 res/e3a/armor/shield.xml
 delete mode 100644 res/e3a/armor/towershield.xml
 delete mode 100644 res/e3a/resources.xml
 delete mode 100644 res/e3a/resources/iron.xml
 delete mode 100644 res/e3a/resources/mallornseed.xml
 delete mode 100644 res/e3a/resources/seed.xml
 delete mode 100644 res/e3a/resources/stone.xml
 delete mode 100644 res/e3a/weapons/axe.xml
 delete mode 100644 res/e3a/weapons/crossbow.xml
 delete mode 100644 res/e3a/weapons/greatbow.xml
 delete mode 100644 res/e3a/weapons/greatsword.xml
 delete mode 100644 res/e3a/weapons/halberd.xml
 delete mode 100644 res/e3a/weapons/laensword.xml
 delete mode 100644 res/e3a/weapons/lance.xml
 delete mode 100644 res/e3a/weapons/mallorncrossbow.xml
 delete mode 100644 res/e3a/weapons/mallornlance.xml
 delete mode 100644 res/e3a/weapons/rep_crossbow.xml
 delete mode 100644 res/e3a/weapons/rustygreatsword.xml
 delete mode 100644 res/e3a/weapons/rustyhalberd.xml

diff --git a/conf/e2/config.json b/conf/e2/config.json
index c2514706a..6450e9d54 100644
--- a/conf/e2/config.json
+++ b/conf/e2/config.json
@@ -3,12 +3,11 @@
         "config://conf/keywords.json",
         "config://conf/calendar.json",
         "config://conf/prefixes.json",
+        "config://conf/e2/locales.json",
         "config://conf/e2/terrains.json",
         "config://conf/e2/items.json",
-        "config://conf/e2/locales.json",
         "config://conf/e2/rules.xml",
         "config://res/core/ships.xml",
-        "config://res/core/spoils.xml",
         "config://res/core/common/buildings.xml",
         "config://res/eressea/buildings.xml",
         "config://res/buildings/castle.xml",
diff --git a/conf/e2/items.json b/conf/e2/items.json
index dc4664cdc..643248d32 100644
--- a/conf/e2/items.json
+++ b/conf/e2/items.json
@@ -1,6 +1,10 @@
 {
     "include": [
+        "config://res/core/spoils.xml",
+        "config://res/core/common/herbs.xml",
         "config://res/core/common/items.xml",
+        "config://res/core/common/luxuries.xml",
+        "config://res/core/common/potions.xml",
         "config://res/core/armor/chainmail.xml",
         "config://res/core/armor/laenmail.xml",
         "config://res/core/armor/laenshield.xml",
@@ -19,9 +23,6 @@
         "config://res/core/resources/seed.xml",
         "config://res/core/resources/peasant.xml",
         "config://res/core/resources/stone.xml",
-        "config://res/core/common/luxuries.xml",
-        "config://res/core/common/herbs.xml",
-        "config://res/core/common/potions.xml",
         "config://res/core/weapons/axe.xml",
         "config://res/core/weapons/bow.xml",
         "config://res/core/weapons/catapult.xml",
diff --git a/conf/e3/config.json b/conf/e3/config.json
index f3bddfdc0..528d0a7f2 100644
--- a/conf/e3/config.json
+++ b/conf/e3/config.json
@@ -1,9 +1,25 @@
 {
     "include": [
-        "keywords.json",
-        "calendar.json",
-        "prefixes.json",
-        "e3/terrains.json"
+        "config://conf/keywords.json",
+        "config://conf/calendar.json",
+        "config://conf/prefixes.json",
+        "config://conf/e3/locales.json",
+        "config://conf/e3/terrains.json",
+        "config://conf/e3/items.json",
+        "config://conf/e3/races.json",
+        "config://res/e3a/familiars.xml",
+        "config://res/e3a/equipment.xml",
+        "config://res/e3a/ships.xml",
+        "config://res/e3a/buildings.xml",
+        "config://res/e3a/spells.xml",
+        "config://res/e3a/spellbooks/gray.xml",
+        "config://res/e3a/spellbooks/gwyrrd.xml",
+        "config://res/e3a/spellbooks/draig.xml",
+        "config://res/e3a/spellbooks/illaun.xml",
+        "config://res/e3a/spellbooks/cerddor.xml",
+        "config://res/e3a/spellbooks/common.xml",
+        "config://res/core/common/buildings.xml",
+        "config://res/buildings/castle-2.xml"
     ],
     "disabled": [
         "herbalism",
diff --git a/conf/e3/items.json b/conf/e3/items.json
new file mode 100644
index 000000000..071bec4e6
--- /dev/null
+++ b/conf/e3/items.json
@@ -0,0 +1,29 @@
+{
+    "include": [
+        "config://res/core/spoils.xml",
+        "config://res/core/common/herbs.xml",
+        "config://res/core/common/items.xml",
+        "config://res/core/common/luxuries.xml",
+        "config://res/core/resources/cart.xml",
+        "config://res/core/resources/horse.xml",
+        "config://res/core/resources/hp.xml",
+        "config://res/core/resources/laen.xml",
+        "config://res/core/resources/log.xml",
+        "config://res/core/resources/mallorn.xml",
+        "config://res/core/resources/peasant.xml",
+        "config://res/core/weapons/bow.xml",
+        "config://res/core/weapons/catapult.xml",
+        "config://res/core/weapons/mallornbow.xml",
+        "config://res/core/weapons/mallornspear.xml",
+        "config://res/core/weapons/runesword.xml",
+        "config://res/core/weapons/rustyaxe.xml",
+        "config://res/core/weapons/rustysword.xml",
+        "config://res/core/weapons/spear.xml",
+        "config://res/core/weapons/sword.xml",
+        "config://res/core/weapons/firesword.xml",
+        "config://res/e3a/weapons.xml",
+        "config://res/e3a/armor.xml",
+        "config://res/e3a/items.xml",
+        "config://res/adamantium.xml"
+    ]
+}
diff --git a/conf/e3/locales.json b/conf/e3/locales.json
new file mode 100644
index 000000000..af43ccaed
--- /dev/null
+++ b/conf/e3/locales.json
@@ -0,0 +1,14 @@
+{
+    "include": [
+      "config://res/core/messages.xml",
+      "config://res/core/de/strings.xml",
+      "config://res/core/en/strings.xml",
+      "config://res/e3a/strings.xml",
+      "config://res/e3a/shipnames.xml",
+      "config://res/names-undead.xml",
+      "config://res/names-skeletons.xml",
+      "config://res/names-zombies.xml",
+      "config://res/names-ghouls.xml",
+      "config://res/names-dragons.xml"
+    ]
+}
diff --git a/conf/e3/locales.xml b/conf/e3/locales.xml
deleted file mode 100644
index bb7245fa3..000000000
--- a/conf/e3/locales.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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://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/races.json b/conf/e3/races.json
new file mode 100644
index 000000000..1ac473f49
--- /dev/null
+++ b/conf/e3/races.json
@@ -0,0 +1,9 @@
+{
+    "include": [
+        "config://res/races/goblin-3.xml",
+        "config://res/races/wyrm.xml",
+        "config://res/races/dragon.xml",
+        "config://res/races/youngdragon.xml",
+        "config://res/e3a/races.xml"
+    ]
+}
diff --git a/conf/e3/rules.xml b/conf/e3/rules.xml
deleted file mode 100644
index 7fbf7dc6e..000000000
--- a/conf/e3/rules.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config://core/common/items.xml"/>
-  <xi:include href="config://core/common/herbs.xml" />
-  <xi:include href="config://core/spoils.xml"/>
-  <xi:include href="config://core/common/buildings.xml"/>
-  <xi:include href="config://game/familiars.xml"/>
-
-  <xi:include href="config://default/adamantium.xml" />
-
-  <xi:include href="config://game/ships.xml"/>
-  <xi:include href="config://game/shipnames.xml"/>
-  <xi:include href="config://game/items.xml" />
-  <xi:include href="config://game/races.xml"/>
-  <xi:include href="config://game/buildings.xml"/>
-  <xi:include href="config://game/equipment.xml"/>
-  <xi:include href="config://game/spells.xml"/>
-  <xi:include href="config://game/luxuries.xml" />
-  <xi:include href="config://game/weapons.xml" />
-  <xi:include href="config://game/armor.xml" />
-  <xi:include href="config://game/resources.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/res/buildings/castle-2.xml b/res/buildings/castle-2.xml
index 8117524ff..a22cb50f3 100644
--- a/res/buildings/castle-2.xml
+++ b/res/buildings/castle-2.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <eressea>
+<buildings>
 <building name="castle" fort="yes" taxes="100">
   <construction skill="building" minskill="1" maxsize="10" name="site">
     <requirement type="stone" quantity="1"/>
@@ -20,4 +21,5 @@
     <requirement type="stone" quantity="1"/>
   </construction>
 </building>
+</buildings>
 </eressea>
diff --git a/res/core/spells.xml b/res/core/spells.xml
index 59d06a522..c4df3e429 100644
--- a/res/core/spells.xml
+++ b/res/core/spells.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0"?>
-<spells xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <xi:include href="spellbooks/gray.xml"/>
-  <xi:include href="spellbooks/gwyrrd.xml"/>
-  <xi:include href="spellbooks/draig.xml"/>
-  <xi:include href="spellbooks/illaun.xml"/>
-  <xi:include href="spellbooks/cerddor.xml"/>
-  <xi:include href="spellbooks/tybied.xml"/>
+<spells>
 
   <!-- shared spells -->
   <spell name="create_roi" ship="true" rank="5" index="130">
diff --git a/res/e3a/armor.xml b/res/e3a/armor.xml
index fe1d7fb45..d0d5138ef 100644
--- a/res/e3a/armor.xml
+++ b/res/e3a/armor.xml
@@ -1,12 +1,83 @@
 <?xml version="1.0"?>
-<resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="armor/chainmail.xml"/>
-  <xi:include href="armor/laenmail.xml"/>
-  <xi:include href="armor/laenshield.xml"/>
-  <xi:include href="armor/plate.xml"/>
-  <xi:include href="armor/rustychainmail.xml"/>
-  <xi:include href="armor/rustyshield.xml"/>
-  <xi:include href="armor/scale.xml"/>
-  <xi:include href="armor/shield.xml"/>
-  <xi:include href="armor/towershield.xml"/>
+<eressea>
+<resources>
+<resource name="towershield">
+  <modifier type="require" race="dwarf"/>
+  <modifier type="require" race="irongolem"/>
+  <item weight="200" score="60" allow="dwarf">
+    <construction skill="armorer" minskill="4">
+      <requirement type="iron" quantity="1"/>
+    </construction>
+    <armor ac="0" penalty="-0.15" projectile="0.25" magres="0.0" shield="yes">
+      <modifier type="canuse" function="mod_dwarves_only"/>
+    </armor>
+  </item>
+</resource>
+<resource name="shield">
+  <item weight="100" score="30">
+    <construction skill="armorer" minskill="2">
+      <requirement type="iron" quantity="1"/>
+    </construction>
+    <armor ac="0" penalty="-0.10" magres="0.0" shield="yes"/>
+  </item>
+</resource>
+<resource name="scale">
+  <modifier type="require" race="dwarf"/>
+  <modifier type="require" race="irongolem"/>
+  <item weight="300" score="150" allow="dwarf halfling">
+    <construction skill="armorer" minskill="5">
+      <requirement type="iron" quantity="2"/>
+    </construction>
+    <armor ac="3" penalty="0.10" projectile="0.05" magres="0.0"/>
+  </item>
+</resource>
+<resource name="rustyshield">
+  <item weight="100" score="10">
+    <construction skill="armorer" minskill="2">
+      <requirement type="iron" quantity="1"/>
+    </construction>
+    <armor ac="0" penalty="-0.05" magres="0.0" shield="yes"/>
+  </item>
+</resource>
+<resource name="rustychainmail">
+  <item weight="200" score="30">
+    <construction skill="armorer" minskill="3">
+      <requirement type="iron" quantity="3"/>
+    </construction>
+    <armor ac="1" penalty="0.20" magres="0.0"/>
+  </item>
+</resource>
+<resource name="plate">
+  <item weight="400" score="150" deny="goblin">
+    <construction skill="armorer" minskill="4">
+      <requirement type="iron" quantity="4"/>
+    </construction>
+    <armor ac="3" penalty="0.15" projectile="0.10" magres="0.0"/>
+  </item>
+</resource>
+<resource name="laenshield">
+  <item weight="0" score="1000">
+    <construction skill="armorer" minskill="7">
+      <requirement type="laen" quantity="1"/>
+    </construction>
+    <armor ac="1" penalty="-0.10" magres="0.3" laen="yes" shield="yes" />
+  </item>
+</resource>
+<resource name="laenmail">
+  <item weight="100" score="1000">
+    <construction skill="armorer" minskill="9">
+      <requirement type="laen" quantity="2"/>
+    </construction>
+    <armor ac="3" penalty="0.0" projectile="0.10" magres="0.3" laen="yes" />
+  </item>
+</resource>
+<resource name="chainmail">
+  <item weight="200" score="90">
+    <construction skill="armorer" minskill="3">
+      <requirement type="iron" quantity="2"/>
+    </construction>
+    <armor ac="2" penalty="0.10" projectile="0.0" magres="0.0"/>
+  </item>
+</resource>
 </resources>
+</eressea>
diff --git a/res/e3a/armor/chainmail.xml b/res/e3a/armor/chainmail.xml
deleted file mode 100644
index 509df07e6..000000000
--- a/res/e3a/armor/chainmail.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="chainmail">
-  <item weight="200" score="90">
-    <construction skill="armorer" minskill="3">
-      <requirement type="iron" quantity="2"/>
-    </construction>
-    <armor ac="2" penalty="0.10" projectile="0.0" magres="0.0"/>
-  </item>
-</resource>
diff --git a/res/e3a/armor/laenmail.xml b/res/e3a/armor/laenmail.xml
deleted file mode 100644
index f03add574..000000000
--- a/res/e3a/armor/laenmail.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="laenmail">
-  <item weight="100" score="1000">
-    <construction skill="armorer" minskill="9">
-      <requirement type="laen" quantity="2"/>
-    </construction>
-    <armor ac="3" penalty="0.0" projectile="0.10" magres="0.3" laen="yes" />
-  </item>
-</resource>
diff --git a/res/e3a/armor/laenshield.xml b/res/e3a/armor/laenshield.xml
deleted file mode 100644
index 8d003bccc..000000000
--- a/res/e3a/armor/laenshield.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="laenshield">
-  <item weight="0" score="1000">
-    <construction skill="armorer" minskill="7">
-      <requirement type="laen" quantity="1"/>
-    </construction>
-    <armor ac="1" penalty="-0.10" magres="0.3" laen="yes" shield="yes" />
-  </item>
-</resource>
diff --git a/res/e3a/armor/plate.xml b/res/e3a/armor/plate.xml
deleted file mode 100644
index 79391fbcb..000000000
--- a/res/e3a/armor/plate.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="plate">
-  <item weight="400" score="150" deny="goblin">
-    <construction skill="armorer" minskill="4">
-      <requirement type="iron" quantity="4"/>
-    </construction>
-    <armor ac="3" penalty="0.15" projectile="0.10" magres="0.0"/>
-  </item>
-</resource>
diff --git a/res/e3a/armor/rustychainmail.xml b/res/e3a/armor/rustychainmail.xml
deleted file mode 100644
index 361564c76..000000000
--- a/res/e3a/armor/rustychainmail.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="rustychainmail">
-  <item weight="200" score="30">
-    <construction skill="armorer" minskill="3">
-      <requirement type="iron" quantity="3"/>
-    </construction>
-    <armor ac="1" penalty="0.20" magres="0.0"/>
-  </item>
-</resource>
diff --git a/res/e3a/armor/rustyshield.xml b/res/e3a/armor/rustyshield.xml
deleted file mode 100644
index d9d8a54ef..000000000
--- a/res/e3a/armor/rustyshield.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="rustyshield">
-  <item weight="100" score="10">
-    <construction skill="armorer" minskill="2">
-      <requirement type="iron" quantity="1"/>
-    </construction>
-    <armor ac="0" penalty="-0.05" magres="0.0" shield="yes"/>
-  </item>
-</resource>
diff --git a/res/e3a/armor/scale.xml b/res/e3a/armor/scale.xml
deleted file mode 100644
index 4d3e38e8a..000000000
--- a/res/e3a/armor/scale.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<resource name="scale">
-  <modifier type="require" race="dwarf"/>
-  <modifier type="require" race="irongolem"/>
-  <item weight="300" score="150" allow="dwarf halfling">
-    <construction skill="armorer" minskill="5">
-      <requirement type="iron" quantity="2"/>
-    </construction>
-    <armor ac="3" penalty="0.10" projectile="0.05" magres="0.0"/>
-  </item>
-</resource>
diff --git a/res/e3a/armor/shield.xml b/res/e3a/armor/shield.xml
deleted file mode 100644
index 5770711e2..000000000
--- a/res/e3a/armor/shield.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="shield">
-  <item weight="100" score="30">
-    <construction skill="armorer" minskill="2">
-      <requirement type="iron" quantity="1"/>
-    </construction>
-    <armor ac="0" penalty="-0.10" magres="0.0" shield="yes"/>
-  </item>
-</resource>
diff --git a/res/e3a/armor/towershield.xml b/res/e3a/armor/towershield.xml
deleted file mode 100644
index aebbfc682..000000000
--- a/res/e3a/armor/towershield.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<resource name="towershield">
-  <modifier type="require" race="dwarf"/>
-  <modifier type="require" race="irongolem"/>
-  <item weight="200" score="60" allow="dwarf">
-    <construction skill="armorer" minskill="4">
-      <requirement type="iron" quantity="1"/>
-    </construction>
-    <armor ac="0" penalty="-0.15" projectile="0.25" magres="0.0" shield="yes">
-      <modifier type="canuse" function="mod_dwarves_only"/>
-    </armor>
-  </item>
-</resource>
diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml
index 069a24150..6d3db765e 100644
--- a/res/e3a/buildings.xml
+++ b/res/e3a/buildings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-<buildings xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <xi:include href="config://default/buildings/castle-2.xml" />
+<eressea>
+<buildings>
 
   <building name="watch" maxsize="10" fort="yes" taxes="200">
     <construction skill="building" minskill="1" maxsize="5" name="scaffolding">
@@ -24,4 +23,4 @@
   </building>
 
 </buildings>
-
+</eressea>
diff --git a/res/e3a/equipment.xml b/res/e3a/equipment.xml
index 62123766a..d8c529d8a 100644
--- a/res/e3a/equipment.xml
+++ b/res/e3a/equipment.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <equipment>
 
   <set name="spo_seaserpent">
@@ -7,3 +8,4 @@
   </set>
 
 </equipment>
+</eressea>
diff --git a/res/e3a/familiars.xml b/res/e3a/familiars.xml
index 4a9fad6c8..b30c733ed 100644
--- a/res/e3a/familiars.xml
+++ b/res/e3a/familiars.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <equipment>
 
   <!-- equipment given to familiars -->
@@ -101,4 +102,4 @@
   </set>
 
 </equipment>
-
+</eressea>
diff --git a/res/e3a/items.xml b/res/e3a/items.xml
index 0399043e5..1d403cfb4 100644
--- a/res/e3a/items.xml
+++ b/res/e3a/items.xml
@@ -1,6 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<eressea>
 <resources>
 
+<resource name="stone" limited="yes" material="yes">
+    <item weight="6000" score="10" big="yes">
+        <construction skill="quarrying" minskill="1"/>
+    </item>
+    <modifier building="quarry" type="skill" value="1"/>
+    <modifier building="quarry" type="material" value="0.5"/>
+</resource>
+
+<resource name="iron" limited="yes" material="yes">
+    <item weight="500" score="10">
+        <construction skill="mining" minskill="1"/>
+    </item>
+    <modifier building="smithy" type="save" value="2"/>
+    <modifier building="mine" type="skill" value="1"/>
+    <modifier building="mine" type="material" value="0.5"/>
+</resource>
+
+<resource name="seed">
+  <item weight="10" score="50"/>
+</resource>
+
+<resource name="mallornseed">
+  <item weight="10" score="100"/>
+</resource>
+
   <resource name="rpg_item_1"><item weight="10"/></resource>
   <resource name="rpg_item_2"><item weight="1"/></resource>
   <resource name="rpg_item_3"><item weight="100"/></resource>
@@ -76,3 +102,4 @@
   </resource>
 
 </resources>
+</eressea>
diff --git a/res/e3a/races.xml b/res/e3a/races.xml
index ce0ce336a..feefb0ded 100644
--- a/res/e3a/races.xml
+++ b/res/e3a/races.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" ?>
-<races xmlns:xi="http://www.w3.org/2001/XInclude">
+<eressea>
+<races>
 
   <!-- begin main races -->
 
-  <xi:include href="config://default/races/goblin-3.xml"/>
-  <xi:include href="config://default/races/wyrm.xml"/>
-  <xi:include href="config://default/races/dragon.xml"/>
-  <xi:include href="config://default/races/youngdragon.xml"/>
-  
   <race name="lynx" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" getitem="yes">
     <ai splitsize="99999"/>
     <skill name="crossbow" modifier="-99"/>
@@ -846,3 +842,4 @@
   </race>
 
 </races>
+</eressea>
diff --git a/res/e3a/resources.xml b/res/e3a/resources.xml
deleted file mode 100644
index 32a79d52e..000000000
--- a/res/e3a/resources.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!-- this file contains resources that can be mined in some way (anything with a resourcelimit) -->
-
-  <xi:include href="config://core/resources/cart.xml"/>
-  <xi:include href="config://core/resources/horse.xml"/>
-  <xi:include href="config://core/resources/hp.xml"/>
-  <xi:include href="config://core/resources/laen.xml"/>
-  <xi:include href="config://core/resources/log.xml"/>
-  <xi:include href="config://core/resources/mallorn.xml"/>
-  <xi:include href="config://core/resources/peasant.xml"/>
-  <xi:include href="resources/iron.xml"/>
-  <xi:include href="resources/mallornseed.xml"/>
-  <xi:include href="resources/seed.xml"/>
-  <xi:include href="resources/stone.xml"/>
-
-</resources>
diff --git a/res/e3a/resources/iron.xml b/res/e3a/resources/iron.xml
deleted file mode 100644
index 55f63ca67..000000000
--- a/res/e3a/resources/iron.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<resource name="iron" limited="yes" material="yes">
-    <item weight="500" score="10">
-        <construction skill="mining" minskill="1"/>
-    </item>
-    <modifier building="smithy" type="save" value="2"/>
-    <modifier building="mine" type="skill" value="1"/>
-    <modifier building="mine" type="material" value="0.5"/>
-</resource>
diff --git a/res/e3a/resources/mallornseed.xml b/res/e3a/resources/mallornseed.xml
deleted file mode 100644
index 576035b34..000000000
--- a/res/e3a/resources/mallornseed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<resource name="mallornseed">
-  <item weight="10" score="100"/>
-</resource>
diff --git a/res/e3a/resources/seed.xml b/res/e3a/resources/seed.xml
deleted file mode 100644
index 62c971540..000000000
--- a/res/e3a/resources/seed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<resource name="seed">
-  <item weight="10" score="50"/>
-</resource>
diff --git a/res/e3a/resources/stone.xml b/res/e3a/resources/stone.xml
deleted file mode 100644
index d8fd08573..000000000
--- a/res/e3a/resources/stone.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<resource name="stone" limited="yes" material="yes">
-    <item weight="6000" score="10" big="yes">
-        <construction skill="quarrying" minskill="1"/>
-    </item>
-    <modifier building="quarry" type="skill" value="1"/>
-    <modifier building="quarry" type="material" value="0.5"/>
-</resource>
diff --git a/res/e3a/shipnames.xml b/res/e3a/shipnames.xml
index 15e261ef0..6d5c46b05 100644
--- a/res/e3a/shipnames.xml
+++ b/res/e3a/shipnames.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<eressea>
 <strings>
   <string name="canoe_a">
     <text locale="de">ein Einbaum</text>
@@ -106,3 +107,4 @@
     <text locale="en">trireme</text>
   </string>
 </strings>
+</eressea>
diff --git a/res/e3a/ships.xml b/res/e3a/ships.xml
index 291900a3b..454c99169 100644
--- a/res/e3a/ships.xml
+++ b/res/e3a/ships.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <ships>
   <ship name="canoe" nocoast="true" range="3" fishing="20" storm="1.00" damage="1.00" cabins="2" cargo="2000" cptskill="1" minskill="1" sumskill="2" opensea="no">
     <coast terrain="plain"/>
@@ -143,4 +144,4 @@
   </ship>
 
 </ships>
-
+</eressea>
diff --git a/res/e3a/spellbooks/cerddor.xml b/res/e3a/spellbooks/cerddor.xml
index 9b6e4cd8e..9e1a3f835 100644
--- a/res/e3a/spellbooks/cerddor.xml
+++ b/res/e3a/spellbooks/cerddor.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<eressea>
 <spellbook name="cerddor">
   <entry spell="create_potion_p2" level="2" />
   <entry spell="create_potion_p0" level="3" />
@@ -35,3 +36,4 @@
     <entry spell="incite_riot" level="15" />
   <entry spell="summon_familiar" level="9" />
 </spellbook>
+</eressea>
diff --git a/res/e3a/spellbooks/common.xml b/res/e3a/spellbooks/common.xml
index 688a1b9ae..92f54e1d1 100644
--- a/res/e3a/spellbooks/common.xml
+++ b/res/e3a/spellbooks/common.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<eressea>
 <spellbook name="common">
     <entry spell="goodwinds" level="4" />
     <entry spell="create_trollbelt" level="9" />
@@ -42,3 +43,4 @@
     <entry spell="shockwave" level="5" />
     <entry spell="eternal_walls" level="7" />
 </spellbook>
+</eressea>
diff --git a/res/e3a/spellbooks/draig.xml b/res/e3a/spellbooks/draig.xml
index d97a695b3..a0da7b449 100644
--- a/res/e3a/spellbooks/draig.xml
+++ b/res/e3a/spellbooks/draig.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<eressea>
 <spellbook name="draig">
   <entry spell="create_potion_p2" level="2" />
   <entry spell="create_potion_p0" level="3" />
@@ -31,3 +32,4 @@
     <entry spell="unholypower" level="14" />
   <entry spell="summon_familiar" level="9" />
 </spellbook>
+</eressea>
diff --git a/res/e3a/spellbooks/gray.xml b/res/e3a/spellbooks/gray.xml
index 78645f907..a807963c2 100644
--- a/res/e3a/spellbooks/gray.xml
+++ b/res/e3a/spellbooks/gray.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<eressea>
 <spellbook name="gray">
     <entry spell="acidrain" level="8" />
     <entry spell="airship" level="6" />
@@ -142,3 +143,4 @@
     <entry spell="wolfhowl" level="7" />
     <entry spell="wyrm_transformation" level="1" />
 </spellbook>
+</eressea>
diff --git a/res/e3a/spellbooks/gwyrrd.xml b/res/e3a/spellbooks/gwyrrd.xml
index 452100ace..83fd4e99c 100644
--- a/res/e3a/spellbooks/gwyrrd.xml
+++ b/res/e3a/spellbooks/gwyrrd.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<eressea>
 <spellbook name="gwyrrd">
   <entry spell="create_potion_p2" level="2" />
   <entry spell="create_potion_p0" level="3" />
@@ -32,3 +33,4 @@
   <entry spell="rustweapon" level="3" />
   <entry spell="summon_familiar" level="9" />
 </spellbook>
+</eressea>
diff --git a/res/e3a/spellbooks/illaun.xml b/res/e3a/spellbooks/illaun.xml
index 6b89df8fa..02c9b34d8 100644
--- a/res/e3a/spellbooks/illaun.xml
+++ b/res/e3a/spellbooks/illaun.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<eressea>
 <spellbook name="illaun">
   <entry spell="create_potion_p2" level="2" />
   <entry spell="create_potion_p0" level="3" />
@@ -32,3 +33,4 @@
   <entry spell="create_dreameye" level="14" />
   <entry spell="summon_familiar" level="9" />
 </spellbook>
+</eressea>
diff --git a/res/e3a/spells.xml b/res/e3a/spells.xml
index 80d9e6260..25d123d43 100644
--- a/res/e3a/spells.xml
+++ b/res/e3a/spells.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
-<spells xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <xi:include href="spellbooks/common.xml"/>
-  <xi:include href="spellbooks/gray.xml"/>
-  <xi:include href="spellbooks/gwyrrd.xml"/>
-  <xi:include href="spellbooks/draig.xml"/>
-  <xi:include href="spellbooks/illaun.xml"/>
-  <xi:include href="spellbooks/cerddor.xml"/>
+<eressea>
+<spells>
 
   <!-- shared spells -->
   <spell name="create_roi" ship="true" rank="5" index="130">
@@ -656,3 +650,4 @@
   </spell>
   <!-- end gray spells -->
 </spells>
+</eressea>
diff --git a/res/e3a/strings.xml b/res/e3a/strings.xml
index 253501f9f..2dd79abb6 100644
--- a/res/e3a/strings.xml
+++ b/res/e3a/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<eressea>
 <strings>
   <!--
     _d: dativ (wir erklären allen /Trollen/ den Krieg)
@@ -290,3 +291,4 @@
   </namespace>
 
 </strings>
+</eressea>
diff --git a/res/e3a/weapons.xml b/res/e3a/weapons.xml
index fdc8f1f3a..5b57cbed0 100644
--- a/res/e3a/weapons.xml
+++ b/res/e3a/weapons.xml
@@ -1,25 +1,170 @@
 <?xml version="1.0"?>
-<resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="config://core/weapons/bow.xml"/>
-  <xi:include href="config://core/weapons/catapult.xml"/>
-  <xi:include href="config://core/weapons/mallornbow.xml"/>
-  <xi:include href="config://core/weapons/mallornspear.xml"/>
-  <xi:include href="config://core/weapons/runesword.xml"/>
-  <xi:include href="config://core/weapons/rustyaxe.xml"/>
-  <xi:include href="config://core/weapons/rustysword.xml"/>
-  <xi:include href="config://core/weapons/spear.xml"/>
-  <xi:include href="config://core/weapons/sword.xml"/>
-  <xi:include href="config://core/weapons/firesword.xml"/>
-  <xi:include href="config://game/weapons/rep_crossbow.xml"/>
-  <xi:include href="config://game/weapons/lance.xml"/>
-  <xi:include href="config://game/weapons/axe.xml"/>
-  <xi:include href="config://game/weapons/crossbow.xml"/>
-  <xi:include href="config://game/weapons/greatbow.xml"/>
-  <xi:include href="config://game/weapons/greatsword.xml"/>
-  <xi:include href="config://game/weapons/halberd.xml"/>
-  <xi:include href="config://game/weapons/laensword.xml"/>
-  <xi:include href="config://game/weapons/mallorncrossbow.xml"/>
-  <xi:include href="config://game/weapons/mallornlance.xml"/>
-  <xi:include href="config://game/weapons/rustygreatsword.xml"/>
-  <xi:include href="config://game/weapons/rustyhalberd.xml"/>
+<eressea>
+<resources>
+<resource name="rustygreatsword">
+<!-- changes to the regular weapon:
+  1. you cannt use this with cavalry
+-->
+  <item weight="200" score="20">
+    <construction skill="weaponsmithing" minskill="4">
+      <requirement type="iron" quantity="2"/>
+    </construction>
+    <weapon useshield="false" cut="true" skill="melee" offmod="-2" defmod="-3" horse="false">
+      <damage type="rider" value="2d8"/>
+      <damage type="footman" value="2d8"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="rustyhalberd">
+<!-- changes to the regular weapon:
+  1. you cannot use this with cavalry
+-->
+  <item weight="200" score="20" deny="goblin">
+    <construction skill="weaponsmithing" minskill="3">
+      <requirement type="iron" quantity="1"/>
+      <requirement type="log" quantity="1"/>
+    </construction>
+    <weapon useshield="false" cut="true" skill="polearm" offmod="-2" defmod="-1" horse="false">
+      <damage type="rider" value="2d6"/>
+      <damage type="footman" value="2d6"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="rep_crossbow">
+  <modifier type="require" race="dwarf"/>
+  <item weight="100" allow="dwarf halfling">
+    <construction skill="weaponsmithing" minskill="5">
+      <requirement type="log" quantity="1"/>
+      <requirement type="iron" quantity="1"/>
+    </construction>
+    <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="1">
+      <damage type="rider" value="3d4+5"/>
+      <damage type="footman" value="3d4+5"/>
+      <modifier type="missile_target" value="0"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="mallornlance">
+  <item weight="100" deny="goblin">
+    <construction skill="weaponsmithing" minskill="5">
+      <requirement type="mallorn" quantity="2"/>
+    </construction>
+    <weapon pierce="true" skill="polearm" offmod="0" defmod="0" magres="0.15">
+      <damage type="footman" value="1d5+2"/>
+      <damage type="rider" value="2d6+7"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="lance">
+  <item weight="200" deny="goblin">
+    <construction skill="weaponsmithing" minskill="2">
+      <requirement type="log" quantity="2"/>
+    </construction>
+    <weapon pierce="true" skill="polearm" offmod="0" defmod="-2">
+      <damage type="footman" value="1d5"/>
+      <damage type="rider" value="2d6+5"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="mallorncrossbow">
+  <item weight="100">
+    <construction skill="weaponsmithing" minskill="5">
+      <requirement type="mallorn" quantity="1"/>
+    </construction>
+    <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
+      <damage type="rider" value="3d4+6"/>
+      <damage type="footman" value="3d4+6"/>
+      <modifier type="missile_target" value="0"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="laensword">
+<!-- changes:
+     * has lower damage
+-->
+  <item weight="100" score="400">
+    <construction skill="weaponsmithing" minskill="8">
+      <requirement type="laen" quantity="1"/>
+    </construction>
+    <weapon cut="true" skill="melee" offmod="1" defmod="1" magres="0.30">
+      <damage type="rider" value="2d9+4"/>
+      <damage type="footman" value="2d9+4"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="halberd">
+<!-- changes to the regular weapon:
+  1. you cannt use this with cavalry
+-->
+  <item weight="200" deny="goblin">
+    <construction skill="weaponsmithing" minskill="3">
+      <requirement type="log" quantity="2"/>
+      <requirement type="iron" quantity="1"/>
+    </construction>
+    <weapon useshield="false" cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0" horse="false">
+      <damage type="rider" value="2d6+3"/>
+      <damage type="footman" value="2d6+3"/>
+      <modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="greatsword">
+<!-- changes to the regular weapon:
+  1. you cannt use this with cavalry
+-->
+  <item weight="200" score="30">
+    <construction skill="weaponsmithing" minskill="4">
+      <requirement type="iron" quantity="2"/>
+    </construction>
+    <weapon useshield="false" cut="true" skill="melee" offmod="-1" defmod="-2" horse="false">
+      <damage type="rider" value="2d8+3"/>
+      <damage type="footman" value="2d8+3"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="greatbow">
+<!-- changes:
+     * has a lua canuse function
+     * has lower damage
+-->
+  <modifier type="require" race="elf"/>
+  <item weight="100" allow="elf">
+    <construction skill="weaponsmithing" minskill="5">
+      <requirement type="mallorn" quantity="2"/>
+    </construction>
+    <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
+      <damage type="rider" value="2d4+5"/>
+      <damage type="footman" value="2d4+5"/>
+      <modifier type="missile_target" value="2"/>
+      <modifier type="damage" value="1">
+        <race name="elf"/>
+      </modifier>
+    </weapon>
+  </item>
+</resource>
+<resource name="crossbow">
+  <item weight="100">
+    <construction skill="weaponsmithing" minskill="3">
+      <requirement type="log" quantity="1"/>
+    </construction>
+    <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
+      <damage type="rider" value="3d4+5"/>
+      <damage type="footman" value="3d4+5"/>
+      <modifier type="missile_target" value="0"/>
+    </weapon>
+  </item>
+</resource>
+<resource name="axe">
+  <item weight="200" deny="goblin">
+    <construction skill="weaponsmithing" minskill="3">
+      <requirement type="log" quantity="1"/>
+      <requirement type="iron" quantity="1"/>
+    </construction>
+    <weapon cut="true" skill="melee" offmod="1" defmod="-2">
+      <damage type="rider" value="2d6+4"/>
+      <damage type="footman" value="2d6+4"/>
+    </weapon>
+  </item>
+</resource>
 </resources>
+</eressea>
diff --git a/res/e3a/weapons/axe.xml b/res/e3a/weapons/axe.xml
deleted file mode 100644
index 6066c4cfc..000000000
--- a/res/e3a/weapons/axe.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<resource name="axe">
-  <item weight="200" deny="goblin">
-    <construction skill="weaponsmithing" minskill="3">
-      <requirement type="log" quantity="1"/>
-      <requirement type="iron" quantity="1"/>
-    </construction>
-    <weapon cut="true" skill="melee" offmod="1" defmod="-2">
-      <damage type="rider" value="2d6+4"/>
-      <damage type="footman" value="2d6+4"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/crossbow.xml b/res/e3a/weapons/crossbow.xml
deleted file mode 100644
index 7b2ed743c..000000000
--- a/res/e3a/weapons/crossbow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<resource name="crossbow">
-  <item weight="100">
-    <construction skill="weaponsmithing" minskill="3">
-      <requirement type="log" quantity="1"/>
-    </construction>
-    <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
-      <damage type="rider" value="3d4+5"/>
-      <damage type="footman" value="3d4+5"/>
-      <modifier type="missile_target" value="0"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/greatbow.xml b/res/e3a/weapons/greatbow.xml
deleted file mode 100644
index 358a55f7d..000000000
--- a/res/e3a/weapons/greatbow.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!-- changes:
-     * has a lua canuse function
-     * has lower damage
--->
-<resource name="greatbow">
-  <modifier type="require" race="elf"/>
-  <item weight="100" allow="elf">
-    <construction skill="weaponsmithing" minskill="5">
-      <requirement type="mallorn" quantity="2"/>
-    </construction>
-    <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
-      <damage type="rider" value="2d4+5"/>
-      <damage type="footman" value="2d4+5"/>
-      <modifier type="missile_target" value="2"/>
-      <modifier type="damage" value="1">
-        <race name="elf"/>
-      </modifier>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/greatsword.xml b/res/e3a/weapons/greatsword.xml
deleted file mode 100644
index 5a199321d..000000000
--- a/res/e3a/weapons/greatsword.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!-- changes to the regular weapon:
-  1. you cannt use this with cavalry
--->
-<resource name="greatsword">
-  <item weight="200" score="30">
-    <construction skill="weaponsmithing" minskill="4">
-      <requirement type="iron" quantity="2"/>
-    </construction>
-    <weapon useshield="false" cut="true" skill="melee" offmod="-1" defmod="-2" horse="false">
-      <damage type="rider" value="2d8+3"/>
-      <damage type="footman" value="2d8+3"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/halberd.xml b/res/e3a/weapons/halberd.xml
deleted file mode 100644
index c22e020b4..000000000
--- a/res/e3a/weapons/halberd.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!-- changes to the regular weapon:
-  1. you cannt use this with cavalry
--->
-<resource name="halberd">
-  <item weight="200" deny="goblin">
-    <construction skill="weaponsmithing" minskill="3">
-      <requirement type="log" quantity="2"/>
-      <requirement type="iron" quantity="1"/>
-    </construction>
-    <weapon useshield="false" cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0" horse="false">
-      <damage type="rider" value="2d6+3"/>
-      <damage type="footman" value="2d6+3"/>
-      <modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/laensword.xml b/res/e3a/weapons/laensword.xml
deleted file mode 100644
index 50f824e8c..000000000
--- a/res/e3a/weapons/laensword.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!-- changes:
-     * has lower damage
--->
-<resource name="laensword">
-  <item weight="100" score="400">
-    <construction skill="weaponsmithing" minskill="8">
-      <requirement type="laen" quantity="1"/>
-    </construction>
-    <weapon cut="true" skill="melee" offmod="1" defmod="1" magres="0.30">
-      <damage type="rider" value="2d9+4"/>
-      <damage type="footman" value="2d9+4"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/lance.xml b/res/e3a/weapons/lance.xml
deleted file mode 100644
index 285862484..000000000
--- a/res/e3a/weapons/lance.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<resource name="lance">
-  <item weight="200" deny="goblin">
-    <construction skill="weaponsmithing" minskill="2">
-      <requirement type="log" quantity="2"/>
-    </construction>
-    <weapon pierce="true" skill="polearm" offmod="0" defmod="-2">
-      <damage type="footman" value="1d5"/>
-      <damage type="rider" value="2d6+5"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/mallorncrossbow.xml b/res/e3a/weapons/mallorncrossbow.xml
deleted file mode 100644
index 86991bc10..000000000
--- a/res/e3a/weapons/mallorncrossbow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<resource name="mallorncrossbow">
-  <item weight="100">
-    <construction skill="weaponsmithing" minskill="5">
-      <requirement type="mallorn" quantity="1"/>
-    </construction>
-    <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
-      <damage type="rider" value="3d4+6"/>
-      <damage type="footman" value="3d4+6"/>
-      <modifier type="missile_target" value="0"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/mallornlance.xml b/res/e3a/weapons/mallornlance.xml
deleted file mode 100644
index 0c50d125a..000000000
--- a/res/e3a/weapons/mallornlance.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<resource name="mallornlance">
-  <item weight="100" deny="goblin">
-    <construction skill="weaponsmithing" minskill="5">
-      <requirement type="mallorn" quantity="2"/>
-    </construction>
-    <weapon pierce="true" skill="polearm" offmod="0" defmod="0" magres="0.15">
-      <damage type="footman" value="1d5+2"/>
-      <damage type="rider" value="2d6+7"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/rep_crossbow.xml b/res/e3a/weapons/rep_crossbow.xml
deleted file mode 100644
index ffa1c0455..000000000
--- a/res/e3a/weapons/rep_crossbow.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<resource name="rep_crossbow">
-  <modifier type="require" race="dwarf"/>
-  <item weight="100" allow="dwarf halfling">
-    <construction skill="weaponsmithing" minskill="5">
-      <requirement type="log" quantity="1"/>
-      <requirement type="iron" quantity="1"/>
-    </construction>
-    <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="1">
-      <damage type="rider" value="3d4+5"/>
-      <damage type="footman" value="3d4+5"/>
-      <modifier type="missile_target" value="0"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/rustygreatsword.xml b/res/e3a/weapons/rustygreatsword.xml
deleted file mode 100644
index 607f16a6a..000000000
--- a/res/e3a/weapons/rustygreatsword.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!-- changes to the regular weapon:
-  1. you cannt use this with cavalry
--->
-<resource name="rustygreatsword">
-  <item weight="200" score="20">
-    <construction skill="weaponsmithing" minskill="4">
-      <requirement type="iron" quantity="2"/>
-    </construction>
-    <weapon useshield="false" cut="true" skill="melee" offmod="-2" defmod="-3" horse="false">
-      <damage type="rider" value="2d8"/>
-      <damage type="footman" value="2d8"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/e3a/weapons/rustyhalberd.xml b/res/e3a/weapons/rustyhalberd.xml
deleted file mode 100644
index a53aec515..000000000
--- a/res/e3a/weapons/rustyhalberd.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!-- changes to the regular weapon:
-  1. you cannot use this with cavalry
--->
-<resource name="rustyhalberd">
-  <item weight="200" score="20" deny="goblin">
-    <construction skill="weaponsmithing" minskill="3">
-      <requirement type="iron" quantity="1"/>
-      <requirement type="log" quantity="1"/>
-    </construction>
-    <weapon useshield="false" cut="true" skill="polearm" offmod="-2" defmod="-1" horse="false">
-      <damage type="rider" value="2d6"/>
-      <damage type="footman" value="2d6"/>
-    </weapon>
-  </item>
-</resource>
diff --git a/res/eressea/buildings.xml b/res/eressea/buildings.xml
index b3ab4b6c0..d239907f1 100644
--- a/res/eressea/buildings.xml
+++ b/res/eressea/buildings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <eressea>
-<buildings xmlns:xi="http://www.w3.org/2001/XInclude">
+<buildings>
   <building name="temple" maxsize="50" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" auraregen="1.00" />
   <building name="portal" maxsize="2" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="pavilion" maxsize="2" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index 654a859bd..21ff5b028 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <eressea>
-<races xmlns:xi="http://www.w3.org/2001/XInclude">
+<races>
 
   <race name="snowman" magres="80" maxaura="0.000000"
         regaura="0.000000" weight="500" capacity="200" equipment="no"
diff --git a/res/races/dragon.xml b/res/races/dragon.xml
index f42037312..7e0da2056 100644
--- a/res/races/dragon.xml
+++ b/res/races/dragon.xml
@@ -1,3 +1,5 @@
+<eressea>
+<races>
 <race name="dragon" magres="70" maxaura="1.0" regaura="2.000000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac=
 "6" damage="2d30" unarmedattack="0" unarmeddefense="0"
 attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes"
@@ -12,4 +14,5 @@ dragon="yes">
   <attack type="4" damage="3d30"/>
   <attack type="6" spell="icy_dragonbreath" level="6" />
 </race>
-
+</races>
+</eressea>
diff --git a/res/races/goblin-3.xml b/res/races/goblin-3.xml
index a65d4c99a..636f8cc29 100644
--- a/res/races/goblin-3.xml
+++ b/res/races/goblin-3.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" ?>
+<eressea>
+<races>
 <race name="goblin" magres="-5" maxaura="1.0"
 recruitcost="60" maintenance="6" weight="600" capacity="440"
 speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0"
@@ -22,3 +24,5 @@ getitem="yes" equipment="yes" healing="2.0">
   <familiar race="rat" default="yes"/>
   <familiar race="imp"/>
 </race>
+</races>
+</eressea>
diff --git a/res/races/wyrm.xml b/res/races/wyrm.xml
index dab1a9e1f..df2008a80 100644
--- a/res/races/wyrm.xml
+++ b/res/races/wyrm.xml
@@ -1,3 +1,6 @@
+<?xml version="1.0" ?>
+<eressea>
+<races>
 <race name="wyrm" magres="90" maxaura="1.0" regaura="3.000000"
 weight="18000" capacity="1000000" speed="1.0" hp="2700" ac="8"
 damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10"
@@ -12,3 +15,5 @@ teach="no" getitem="yes" resistbash="yes" dragon="yes" income="5000">
   <attack type="4" damage="5d30"/>
   <attack type="6" spell="powerful_dragonbreath" level="12" />
 </race>
+</races>
+</eressea>
diff --git a/res/races/youngdragon.xml b/res/races/youngdragon.xml
index df10a44e9..d8b3d366f 100644
--- a/res/races/youngdragon.xml
+++ b/res/races/youngdragon.xml
@@ -1,3 +1,5 @@
+<eressea>
+<races>
 <race name="youngdragon" magres="50" maxaura="1.0" regaura="1.0"
 weight="8000" capacity="10000" speed="1.0" hp="300" ac="4"
 damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4"
@@ -12,4 +14,5 @@ teach="no" getitem="yes" resistbash="yes" dragon="yes" income="150">
   <attack type="4" damage="1d30"/>
   <attack type="6" spell="fiery_dragonbreath" level="3" />
 </race>
-
+</races>
+</eressea>
diff --git a/scripts/tests/e3/production.lua b/scripts/tests/e3/production.lua
index 3469b06c4..be63158cf 100644
--- a/scripts/tests/e3/production.lua
+++ b/scripts/tests/e3/production.lua
@@ -53,6 +53,7 @@ function test_dwarf_no_mining_bonus()
     local r = region.create(0, 0, 'mountain')
     local f = create_faction('dwarf')
     local u = unit.create(f, r, 1)
+    u.name = 'Xolgrim'
 
     turn_begin()
     r:set_resource('iron', 100)