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 @@
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
+
@@ -20,4 +21,5 @@
+
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 @@
-
-
-
-
-
-
-
-
+
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 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
-
-
- -
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
-
-
- -
-
-
-
-
-
-
-
-
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 @@
-
-
-
+
+
@@ -24,4 +23,4 @@
-
+
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 @@
+
@@ -7,3 +8,4 @@
+
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 @@
+
@@ -101,4 +102,4 @@
-
+
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 @@
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,3 +102,4 @@
+
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 @@
-
+
+
-
-
-
-
-
@@ -846,3 +842,4 @@
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
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 @@
+
ein Einbaum
@@ -106,3 +107,4 @@
trireme
+
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 @@
+
@@ -143,4 +144,4 @@
-
+
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 @@
+
@@ -35,3 +36,4 @@
+
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 @@
+
@@ -42,3 +43,4 @@
+
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 @@
+
@@ -31,3 +32,4 @@
+
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 @@
+
@@ -142,3 +143,4 @@
+
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 @@
+
@@ -32,3 +33,4 @@
+
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 @@
+
@@ -32,3 +33,4 @@
+
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 @@
-
-
-
-
-
-
-
-
+
+
@@ -656,3 +650,4 @@
+
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 @@
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
- -
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
- -
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
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 @@
-
+
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 @@
-
+
+
-
+
+
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 @@
+
+
+
+
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 @@
+
+
+
+
+
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 @@
+
+
-
+
+
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)