diff --git a/src/basic/res/catalog.xml b/src/basic/res/catalog-basic.xml
similarity index 100%
rename from src/basic/res/catalog.xml
rename to src/basic/res/catalog-basic.xml
diff --git a/src/basic/res/config.xml b/src/basic/res/config-basic.xml
similarity index 100%
rename from src/basic/res/config.xml
rename to src/basic/res/config-basic.xml
diff --git a/src/doc/bugs.txt b/src/eressea/doc/bugs.txt
similarity index 100%
rename from src/doc/bugs.txt
rename to src/eressea/doc/bugs.txt
diff --git a/src/res/changes.txt b/src/eressea/doc/changes.txt
similarity index 100%
rename from src/res/changes.txt
rename to src/eressea/doc/changes.txt
diff --git a/src/doc/coding.txt b/src/eressea/doc/coding.txt
similarity index 100%
rename from src/doc/coding.txt
rename to src/eressea/doc/coding.txt
diff --git a/src/doc/directories.txt b/src/eressea/doc/directories.txt
similarity index 100%
rename from src/doc/directories.txt
rename to src/eressea/doc/directories.txt
diff --git a/src/doc/new-source.gif b/src/eressea/doc/new-source.gif
similarity index 100%
rename from src/doc/new-source.gif
rename to src/eressea/doc/new-source.gif
diff --git a/src/doc/spells_uebersicht.txt b/src/eressea/doc/spells_uebersicht.txt
similarity index 100%
rename from src/doc/spells_uebersicht.txt
rename to src/eressea/doc/spells_uebersicht.txt
diff --git a/src/doc/synonyme-rassen b/src/eressea/doc/synonyme-rassen
similarity index 100%
rename from src/doc/synonyme-rassen
rename to src/eressea/doc/synonyme-rassen
diff --git a/src/doc/todo.txt b/src/eressea/doc/todo.txt
similarity index 100%
rename from src/doc/todo.txt
rename to src/eressea/doc/todo.txt
diff --git a/src/doc/triggers.txt b/src/eressea/doc/triggers.txt
similarity index 100%
rename from src/doc/triggers.txt
rename to src/eressea/doc/triggers.txt
diff --git a/src/res/buildings/castle-2.xml b/src/eressea/res/buildings/castle-2.xml
similarity index 100%
rename from src/res/buildings/castle-2.xml
rename to src/eressea/res/buildings/castle-2.xml
diff --git a/src/eressea/res/catalog.xml b/src/eressea/res/catalog-eressea.xml
similarity index 100%
rename from src/eressea/res/catalog.xml
rename to src/eressea/res/catalog-eressea.xml
diff --git a/src/res/e3a.xml b/src/eressea/res/config-e3a.xml
similarity index 100%
rename from src/res/e3a.xml
rename to src/eressea/res/config-e3a.xml
diff --git a/src/eressea/res/config.xml b/src/eressea/res/config-eressea.xml
similarity index 98%
rename from src/eressea/res/config.xml
rename to src/eressea/res/config-eressea.xml
index 6860333be..673329eac 100644
--- a/src/eressea/res/config.xml
+++ b/src/eressea/res/config-eressea.xml
@@ -15,7 +15,8 @@
-
+
+
diff --git a/src/res/directions.xml b/src/eressea/res/directions.xml
similarity index 100%
rename from src/res/directions.xml
rename to src/eressea/res/directions.xml
diff --git a/src/res/e3a/armor.xml b/src/eressea/res/e3a/armor.xml
similarity index 100%
rename from src/res/e3a/armor.xml
rename to src/eressea/res/e3a/armor.xml
diff --git a/src/res/e3a/buildings.xml b/src/eressea/res/e3a/buildings.xml
similarity index 100%
rename from src/res/e3a/buildings.xml
rename to src/eressea/res/e3a/buildings.xml
diff --git a/src/res/e3a/calendar.xml b/src/eressea/res/e3a/calendar.xml
similarity index 100%
rename from src/res/e3a/calendar.xml
rename to src/eressea/res/e3a/calendar.xml
diff --git a/src/res/e3a/equipment.xml b/src/eressea/res/e3a/equipment.xml
similarity index 100%
rename from src/res/e3a/equipment.xml
rename to src/eressea/res/e3a/equipment.xml
diff --git a/src/res/e3a/items.xml b/src/eressea/res/e3a/items.xml
similarity index 100%
rename from src/res/e3a/items.xml
rename to src/eressea/res/e3a/items.xml
diff --git a/src/res/e3a/luxuries.xml b/src/eressea/res/e3a/luxuries.xml
similarity index 100%
rename from src/res/e3a/luxuries.xml
rename to src/eressea/res/e3a/luxuries.xml
diff --git a/src/res/e3a/messages.xml b/src/eressea/res/e3a/messages.xml
similarity index 100%
rename from src/res/e3a/messages.xml
rename to src/eressea/res/e3a/messages.xml
diff --git a/src/res/e3a/races.xml b/src/eressea/res/e3a/races.xml
similarity index 100%
rename from src/res/e3a/races.xml
rename to src/eressea/res/e3a/races.xml
diff --git a/src/res/e3a/resources.xml b/src/eressea/res/e3a/resources.xml
similarity index 100%
rename from src/res/e3a/resources.xml
rename to src/eressea/res/e3a/resources.xml
diff --git a/src/res/e3a/shipnames.xml b/src/eressea/res/e3a/shipnames.xml
similarity index 100%
rename from src/res/e3a/shipnames.xml
rename to src/eressea/res/e3a/shipnames.xml
diff --git a/src/res/e3a/ships.xml b/src/eressea/res/e3a/ships.xml
similarity index 100%
rename from src/res/e3a/ships.xml
rename to src/eressea/res/e3a/ships.xml
diff --git a/src/res/e3a/spells.xml b/src/eressea/res/e3a/spells.xml
similarity index 100%
rename from src/res/e3a/spells.xml
rename to src/eressea/res/e3a/spells.xml
diff --git a/src/res/e3a/strings.xml b/src/eressea/res/e3a/strings.xml
similarity index 100%
rename from src/res/e3a/strings.xml
rename to src/eressea/res/e3a/strings.xml
diff --git a/src/res/e3a/terrains.xml b/src/eressea/res/e3a/terrains.xml
similarity index 100%
rename from src/res/e3a/terrains.xml
rename to src/eressea/res/e3a/terrains.xml
diff --git a/src/res/e3a/weapons.xml b/src/eressea/res/e3a/weapons.xml
similarity index 100%
rename from src/res/e3a/weapons.xml
rename to src/eressea/res/e3a/weapons.xml
diff --git a/src/eressea/res/eressea/races.xml b/src/eressea/res/eressea/races.xml
new file mode 100644
index 000000000..1c5179973
--- /dev/null
+++ b/src/eressea/res/eressea/races.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/src/res/names-dragons.xml b/src/eressea/res/names-dragons.xml
similarity index 100%
rename from src/res/names-dragons.xml
rename to src/eressea/res/names-dragons.xml
diff --git a/src/res/names-ghouls.xml b/src/eressea/res/names-ghouls.xml
similarity index 100%
rename from src/res/names-ghouls.xml
rename to src/eressea/res/names-ghouls.xml
diff --git a/src/res/names-skeletons.xml b/src/eressea/res/names-skeletons.xml
similarity index 100%
rename from src/res/names-skeletons.xml
rename to src/eressea/res/names-skeletons.xml
diff --git a/src/res/names-undead.xml b/src/eressea/res/names-undead.xml
similarity index 100%
rename from src/res/names-undead.xml
rename to src/eressea/res/names-undead.xml
diff --git a/src/res/names-zombies.xml b/src/eressea/res/names-zombies.xml
similarity index 100%
rename from src/res/names-zombies.xml
rename to src/eressea/res/names-zombies.xml
diff --git a/src/eressea/res/races.xml b/src/eressea/res/races.xml
index 1c5179973..8309b6e37 100644
--- a/src/eressea/res/races.xml
+++ b/src/eressea/res/races.xml
@@ -1,11 +1,1382 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/res/races/dragon.xml b/src/eressea/res/races/dragon.xml
similarity index 100%
rename from src/res/races/dragon.xml
rename to src/eressea/res/races/dragon.xml
diff --git a/src/res/races/goblin-2.xml b/src/eressea/res/races/goblin-2.xml
similarity index 100%
rename from src/res/races/goblin-2.xml
rename to src/eressea/res/races/goblin-2.xml
diff --git a/src/res/races/goblin-3.xml b/src/eressea/res/races/goblin-3.xml
similarity index 100%
rename from src/res/races/goblin-3.xml
rename to src/eressea/res/races/goblin-3.xml
diff --git a/src/res/races/wyrm.xml b/src/eressea/res/races/wyrm.xml
similarity index 100%
rename from src/res/races/wyrm.xml
rename to src/eressea/res/races/wyrm.xml
diff --git a/src/res/races/youngdragon.xml b/src/eressea/res/races/youngdragon.xml
similarity index 100%
rename from src/res/races/youngdragon.xml
rename to src/eressea/res/races/youngdragon.xml
diff --git a/src/res/eressea.xml b/src/res/eressea.xml
deleted file mode 100644
index c20be8026..000000000
--- a/src/res/eressea.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- eressea-server@eressea.de
- eressea-server@eressea.de
-
-
- Bitte denke daran, deine Befehle mit dem Betreff
- ERESSEA BEFEHLE an eressea-server@eressea.de zu senden.
- Remember to send your orders to
- eressea-server@eressea.de with the subject ERESSEA ORDERS.
-
-
- ERESSEA BEFEHLE
- ERESSEA ORDERS
-
-
-
diff --git a/src/res/races.xml b/src/res/races.xml
deleted file mode 100644
index 8309b6e37..000000000
--- a/src/res/races.xml
+++ /dev/null
@@ -1,1382 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/res/tutorial.xml b/src/res/tutorial.xml
deleted file mode 100644
index a94fbb72f..000000000
--- a/src/res/tutorial.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- tutorial@eressea.de
- tutorial@eressea.de
-
-
- Remember to send your orders to tutorial@eressea.de with the subject ERESSEA ORDERS.
- Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an tutorial@eressea.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports.
-
-
- ERESSEA BEFEHLE
- ERESSEA ORDERS
-
-
-
-
diff --git a/src/res/tutorial/de/welcome.txt b/src/res/tutorial/de/welcome.txt
deleted file mode 100644
index 8a84715c3..000000000
--- a/src/res/tutorial/de/welcome.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Willkommen beim Eressea-Testspiel.
-
-Vorweg: Dieses ist NICHT deine zukünftige Eressea-Partei. Es ist ein
-Tutorial. Um sicherzustellen, das neue Spieler in Eressea ein gewisses
-Grundverständnis der Anleitung mitbringen, und nicht nach wochenlanger
-Wartezeit über einen einfachen Fehler stolpern, schicken wir jeden neuen
-Spieler in eine Probepartie, die 5 Runden dauert. Du kannst also mit dieser
-Partei tun was Du möchtest, und etwas herumexperimentieren, ohne das das auf
-Deine spätere Partei Auswirkungen hat. Einzig, das Du die 5 Runden
-überlebst, verlangen wir von Dir.
-
-Folgende Unterschiede gibt es zwischen diesem Testspiel und dem richtigen
-Eressea:
-
-* Email-Adresse für Züge
-Testspiel: tutorial@eressea.de
-Eressea: eressea-server@eressea.de
-
-* Zugabgaberhytmus:
-Testspiel: 3x die Woche, Montag, Mittwoch und Samstag um 09:00 Uhr morgens
-Eressea: 1x die Woche, Sonntags um 9:00 Uhr
-
-* Spieldauer:
-Testspiel: 5 Züge Minimum, Partei wird nach 10 Zügen gelöscht.
-Eressea: unbegrenzt
-
-
-Ein paar Tipps für den Anfang:
-
-Eressea ist ein komplexes Spiel mit einer Menge Regeln. Je besser Du sie
-verstehst, desto besser wirst Du das Spiel spielen können. Nimm Dir die
-Zeit, die Anleitung ausführlich zu lesen. Du findest sie unter
-http://wiki.eressea.de/de/. Wenn Du allgemeine Fragen hast, kannst Du auch
-auf unserem Forum vorbeischauen, das du auf
-http://www.pbem-spiele.de/forum/viewforum.php?f=16 findest.
-
-Eressea ist ein textuelles Spiel. Laß Dich nicht davon einschüchtern, das Du
-Befehle lernen mußt - so viele sind es nicht, und die meisten sind sehr
-intuitiv. Vieles in Eressea passiert in deiner Phantasie, und das
-spannendste am Spiel sind die anderen Spieler und die Diplomatie mit ihnen.
-
-Die beiden anderen Dateien in dieser Mail enthalten den Report in zwei
-verschiedenen Formaten. Die Datei mit der Endung .nr ist eine normale
-Textdatei, und sie enthält deinen ersten Report in menschenlesbarer Form. Du
-kannst sie mit jedem Texteditor (zum Beispiel Notepad) lesen. Die zweite
-Datei mit der Endung .cr enthält den Report in einer Form, die von
-Eressea-Software gelesen werden kann, wie zum Beispiel Magellan, das Du
-unter http://magellan.log-out.net/ findest. Ob Du lieber mit der
-Textversion oder mit einem Programm spielst, ist Dir überlassen.
-
-Viel Spaß mit Eressea wünscht Dir auf jeden Fall
-das Eressea-Team.
diff --git a/src/res/tutorial/en/welcome.txt b/src/res/tutorial/en/welcome.txt
deleted file mode 100644
index 620ac0bd2..000000000
--- a/src/res/tutorial/en/welcome.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Welcome to the Eressea Tutorial game.
-
-The report in this mail is NOT for your future Eressea faction. It is the
-faction you will play during a quick five-turn tutorial, to make sure you
-understand the basic rules, and to give you a chance to get acquainted with
-the game before the real fun starts. If you manage to survive these 5 turns
-and send in orders for your faction, you will be joining the real Eressea
-game shortly.
-
-The tutorial differs from Eressea in a few very important points:
-
-* Email-Address to send your turns to:
-Tutorial: tutorial@eressea.de
-Eressea: eressea-server@eressea.de
-
-* Frequency:
-Tutorial: 3x per Week, Monday, Wednesday and Saturday before 9 am CET.
-Eressea: 1x per Week, Sunday before 9 am CET.
-
-* Duration:
-Tutorial: 5 turns required. Faction is deleted after 10 turns.
-Eressea: open-ended
-
-
-Eressea is a complex game with a lot of rules. Unlike other games, you will
-not get very far if you haven't read the rules. Really. So if you haven't
-done it yet, head over to http://eressea.upb.de/rules/en/ and read them. If
-you want to talk to some other Eressea playes, visit our forums at
-http://eressea.upb.de/forum/
-
-Eressea is a text-based game. In these days when all games are 3D, a game
-that relies mostly on text may seem like an anachronism, but most of the
-game hapens in your head and in that of your opponents - and of course, in
-the diplomatic emails between you and your future neighbours.
-
-The two other files in this email contain your report. The file with the .nr
-extendion is a normal textfile, in human-readable form. You can read it with
-any text editor, for example Notepad. The english in there is not always good,
-because the translation of the human-readable report is currently a work in
-progress. That's why we recommend using the file with the .cr extension
-instead. It is a format that is understood by most Eressea-tools, notably
-the very good Magellan client. It is available at
-http://magellan.log-out.net/.
-
-If you have any questions that the documentation does not answer, you can
-send them to eressea-help@eressea.kn-bremen.de, and get an answer from a
-human being. Please try to find an answer in the rules first - helping new
-players takes a lot of time and energy, and we would like to limit this to
-the really tough questions. It's not meant as a way for you to get around
-reading the rules.
-
-Enjoy your time on Eressea, and good luck with the first turns,
-your Eressea-Team.
diff --git a/src/res/tutorial/strings.xml b/src/res/tutorial/strings.xml
deleted file mode 100644
index c40a6b7a1..000000000
--- a/src/res/tutorial/strings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- Die ersten beiden Züge mußt du abgeben, sonst wird deine Partei sofort wieder gelöscht, um Karteileichen zu vermeiden.
- If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of zombie players in Eressea.
-
-
- Mit der ersten Auswertung bekommst du einen Computerreport, den du mit vielen der Tools auf http://eressea-pbem.de/download.html benutzen kannst. Wenn du ihn weiterhin bekommen willst, gib einer deiner Einheiten den Befehl OPTION COMPUTER.
- With the first two turns, you will get a computer report (CR). It can be used with many of the tools on http://eressea-pbem.de/download.html. If you want to continue getting it after the second turn, please make one of your units give the order OPTION COMPUTER.
-
-
- ARBEITE
- WORK
-
-
diff --git a/src/scripts/setup.lua b/src/scripts/setup.lua
index 1d1bbe652..e4bfb726b 100644
--- a/src/scripts/setup.lua
+++ b/src/scripts/setup.lua
@@ -1,7 +1,8 @@
local srcpath = config.source_dir
-local paths = { 'lunit/?.lua','external/lunit/?.lua','scripts/?.lua';'scripts/?' }
+local respath = srcpath .. '/' .. config.game .. '/res/'
+local paths = { config.game..'/scripts/?.lua';'lunit/?.lua','external/lunit/?.lua','scripts/?.lua';'scripts/?' }
-tests = {'common', config.game}
+tests = {'common'}
for idx, test in pairs(tests) do
tests[idx] = srcpath .. '/scripts/tests/' .. test .. '.lua'
end
@@ -10,6 +11,6 @@ for idx, path in pairs(paths) do
package.path = srcpath .. '/' .. path .. ';' .. package.path
end
-read_xml(srcpath .. '/res/' .. config.game .. '.xml')
+read_xml(respath..'config-'..config.game..'.xml', respath..'catalog-'..config.game..'.xml')
require "init"