Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -42,3 +42,4 @@ tests/data/185.dat
 /quicklist/
 /cutest/
 /critbit/
+*.mo

CMakeLists.txt

@@ -13,9 +13,13 @@ include(MSVC)
 set (HAVE_STRDUP 0)
 set (HAVE_STRLCAT 0)
 set (HAVE_LIBBSD 0)
+set (HAVE_SIGNAL_H 0)
+set (HAVE_EXECINFO_H 0)
 else (MSVC)
 
 INCLUDE (CheckIncludeFile)
+CHECK_INCLUDE_FILE(signal.h HAVE_SIGNAL_H)
+CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILE(bsd/string.h HAVE_LIBBSD)
 
 INCLUDE (CheckFunctionExists)
@@ -46,7 +50,7 @@ else()
 find_package (SQLite3 REQUIRED QUIET)
 endif()
 
-find_package (LibXml2 REQUIRED)
+find_package(EXPAT REQUIRED)
 find_package (ToLua REQUIRED)
 if (TOLUA_FOUND)
 if (${TOLUA_VERSION_STRING} VERSION_EQUAL "5.2")
@@ -66,6 +70,7 @@ add_subdirectory (process)
 add_subdirectory (src eressea)
 
 install(DIRECTORY etc DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.txt")
+install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.po")
 install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml")
 install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.json")
 install(DIRECTORY scripts DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.lua")

README.md

@@ -18,3 +18,6 @@ This repository relies heavily on the use of submodules, and it pulls in most of
     ./s/build
 
 If you got this far and all went well, you have built a server (it is linked from the `game` subdirectory), and it will have passed some basic functionality tests.
+
+* [![Static Analysis](https://scan.coverity.com/projects/6742/badge.svg?flat=1)](https://scan.coverity.com/projects/6742/)
+* [![Build Status](https://api.travis-ci.org/eressea/server.svg?branch=develop)](https://travis-ci.org/eressea/server)

clibs

@@ -1 +1 @@
-Subproject commit 7eb6713ff73d29e67d2bc87fb037a9c738c2c512
+Subproject commit f9842e07a442c5453c270badf25ab72633b4edf5

conf/e2/config.json

@@ -1,15 +1,31 @@
 {
     "include": [
-        "keywords.json",
+        "config://conf/keywords.json",
-        "calendar.json",
+        "config://conf/calendar.json",
-        "prefixes.json",
+        "config://conf/prefixes.json",
-        "e2/terrains.json"
+        "config://conf/e2/locales.json",
+        "config://conf/e2/terrains.json",
+        "config://conf/e2/items.json",
+        "config://res/core/ships.xml",
+        "config://res/core/common/buildings.xml",
+        "config://res/eressea/buildings.xml",
+        "config://res/buildings/castle.xml",
+        "config://res/eressea/races.xml",
+        "config://res/eressea/artrewards.xml",
+        "config://res/eressea/spells.xml",
+        "config://res/eressea/spellbooks/gray.xml",
+        "config://res/eressea/spellbooks/gwyrrd.xml",
+        "config://res/eressea/spellbooks/draig.xml",
+        "config://res/eressea/spellbooks/illaun.xml",
+        "config://res/eressea/spellbooks/cerddor.xml",
+        "config://res/eressea/spellbooks/tybied.xml"
     ],
     "disabled": [
         "jsreport"
     ],
     "settings": {
         "game.name" : "Eressea",
+        "game.mailcmd" : "ERESSEA",
         "game.id" : 2,
         "orders.default": "work",
         "NewbieImmunity": 8,

conf/e2/items.json

@@ -0,0 +1,50 @@
+{
+    "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",
+        "config://res/core/armor/plate.xml",
+        "config://res/core/armor/rustychainmail.xml",
+        "config://res/core/armor/rustyshield.xml",
+        "config://res/core/armor/shield.xml",
+        "config://res/core/resources/cart.xml",
+        "config://res/core/resources/horse.xml",
+        "config://res/core/resources/hp.xml",
+        "config://res/core/resources/iron.xml",
+        "config://res/core/resources/laen.xml",
+        "config://res/core/resources/log.xml",
+        "config://res/core/resources/mallorn.xml",
+        "config://res/core/resources/mallornseed.xml",
+        "config://res/core/resources/seed.xml",
+        "config://res/core/resources/peasant.xml",
+        "config://res/core/resources/stone.xml",
+        "config://res/core/weapons/axe.xml",
+        "config://res/core/weapons/bow.xml",
+        "config://res/core/weapons/catapult.xml",
+        "config://res/core/weapons/crossbow.xml",
+        "config://res/core/weapons/firesword.xml",
+        "config://res/core/weapons/greatbow.xml",
+        "config://res/core/weapons/greatsword.xml",
+        "config://res/core/weapons/halberd.xml",
+        "config://res/core/weapons/laensword.xml",
+        "config://res/core/weapons/lance.xml",
+        "config://res/core/weapons/mallornbow.xml",
+        "config://res/core/weapons/mallorncrossbow.xml",
+        "config://res/core/weapons/mallornlance.xml",
+        "config://res/core/weapons/mallornspear.xml",
+        "config://res/core/weapons/runesword.xml",
+        "config://res/core/weapons/rustyaxe.xml",
+        "config://res/core/weapons/rustygreatsword.xml",
+        "config://res/core/weapons/rustyhalberd.xml",
+        "config://res/core/weapons/rustysword.xml",
+        "config://res/core/weapons/spear.xml",
+        "config://res/core/weapons/sword.xml",
+        "config://res/eressea/items.xml",
+        "config://res/adamantium.xml"
+    ]
+}

conf/e2/locales.json

@@ -0,0 +1,9 @@
+{
+    "include": [
+      "config://res/translations/strings.de.po",
+      "config://res/translations/strings.en.po",
+      "config://res/translations/messages.de.po",
+      "config://res/translations/messages.en.po",
+      "config://res/core/messages.xml"
+    ]
+}

conf/e2/locales.xml

@@ -1,13 +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://game/spellinfo.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>

conf/e2/rules.xml

@@ -1,45 +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/armor.xml" />
-  <xi:include href="config://core/common/weapons.xml" />
-  <xi:include href="config://core/common/resources.xml" />
-  <xi:include href="config://core/common/luxuries.xml" />
-  <xi:include href="config://core/common/herbs.xml" />
-  <xi:include href="config://core/common/potions.xml" />
-  <xi:include href="config://core/spoils.xml"/>
-  <xi:include href="config://game/races.xml"/>
-  <xi:include href="config://core/ships.xml"/>
-  <xi:include href="config://core/common/buildings.xml"/>
-  <xi:include href="config://game/familiars.xml"/>
-  <xi:include href="config://game/artrewards.xml"/>
-  <xi:include href="config://game/buildings.xml"/>
-  <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://default/adamantium.xml"/>
-  <equipment>
-    <set name="first_unit">
-      <item name="money" amount="2500"/>
-      <item name="log" amount="10"/>
-      <item name="stone" amount="4"/>
-    </set>
-    <set name="seed_unit">
-      <item name="log" amount="50"/>
-      <item name="stone" amount="50"/>
-      <item name="iron" amount="50"/>
-      <item name="laen" amount="10"/>
-      <item name="sword" amount="1"/>
-      <item name="mallorn" amount="10"/>
-      <item name="skillpotion" amount="5"/>
-      <item name="p2" amount="5"/>
-      <item name="money" amount="20000"/>
-      <skill name="perception" level="30"/>
-      <skill name="melee" level="1"/>
-    </set>
-    <set name="seed_faction">
-      <item name="adamantium" amount="1"/>
-    </set>
-  </equipment>
-</eressea>

conf/e3/config.json

@@ -1,9 +1,23 @@
 {
     "include": [
-        "keywords.json",
+        "config://conf/keywords.json",
-        "calendar.json",
+        "config://conf/calendar.json",
-        "prefixes.json",
+        "config://conf/prefixes.json",
-        "e3/terrains.json"
+        "config://conf/e3/locales.json",
+        "config://conf/e3/terrains.json",
+        "config://conf/e3/items.json",
+        "config://conf/e3/races.json",
+        "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",
@@ -27,6 +41,7 @@
     ],
     "settings": {
         "game.name" : "Eressea",
+        "game.mailcmd" : "ERESSEA",
         "game.id" : 3,
         "orders.default": "work",
         "database.gameid": 7,
@@ -77,7 +92,6 @@
         "rules.region_owners": true,
         "rules.cavalry.skill": 2,
         "rules.cavalry.mode": 1,
-        "rules.magic.multipotion": true,
         "rules.magic.wol_effect": 5,
         "rules.magic.factionlist": true,
         "rules.magic.wol_type": 2,

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"
+    ]
+}

conf/e3/locales.json

@@ -0,0 +1,11 @@
+{
+    "include": [
+      "config://res/translations/strings.de.po",
+      "config://res/translations/strings-e3.de.po",
+      "config://res/translations/messages.de.po",
+      "config://res/translations/strings.en.po",
+      "config://res/translations/strings-e3.en.po",
+      "config://res/translations/messages.en.po",
+      "config://res/core/messages.xml"
+    ]
+}

conf/e3/locales.xml

@@ -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>

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"
+    ]
+}

conf/e3/rules.xml

@@ -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>

process/cron/preview.cron

@@ -9,7 +9,7 @@ if [ -e ${ERESSEA}/build/.preview ]; then
 fi
 SRC=${ERESSEA}/git
 ${SRC}/s/preview build ${branch} || exit $?
-for game in 2 3 ; do
+for game in 2 3 4 ; do
 	${SRC}/s/preview -g ${game} run && \
 	${SRC}/s/preview -g ${game} send
 done

res/adamantium.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<eressea>
 <resources>
 
   <resource name="adamantium" limited="yes" material="yes">
@@ -15,7 +16,7 @@
         <requirement type="adamantium" quantity="1"/>
         <requirement type="log" quantity="1"/>
       </construction>
-      <weapon cut="true" skill="melee" offmod="2" defmod="-2" magres="0.30">
+      <weapon cut="true" magical="true" skill="melee" offmod="2" defmod="-2" magres="0.30">
         <damage type="rider" value="3d4+15"/>
         <damage type="footman" value="3d4+15"/>
       </weapon>
@@ -32,3 +33,4 @@
   </resource>
 
 </resources>
+</eressea>

res/buildings/castle-2.xml

@@ -1,4 +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"/>
@@ -19,3 +21,5 @@
     <requirement type="stone" quantity="1"/>
   </construction>
 </building>
+</buildings>
+</eressea>

res/buildings/castle.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<buildings>
 <building name="castle" fort="yes">
   <construction skill="building" minskill="1" maxsize="2" name="site">
     <requirement type="stone" quantity="1"/>
@@ -22,3 +24,5 @@
     <requirement type="stone" quantity="1"/>
   </construction>
 </building>
+</buildings>
+</eressea>

res/core/armor/chainmail.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea><resources>
 <resource name="chainmail">
   <item weight="200" score="90">
     <construction skill="armorer" minskill="3">
@@ -7,3 +8,4 @@
     <armor ac="3" penalty="0.15" magres="0.0"/>
   </item>
 </resource>
+</resources></eressea>

res/core/armor/laenmail.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea><resources>
 <resource name="laenmail">
   <item weight="100" score="1000">
     <construction skill="armorer" minskill="9">
@@ -7,3 +8,4 @@
     <armor ac="6" penalty="0.0" magres="0.3" laen="yes" />
   </item>
 </resource>
+</resources></eressea>

res/core/armor/laenshield.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea><resources>
 <resource name="laenshield">
   <item weight="0" score="1000">
     <construction skill="armorer" minskill="7">
@@ -7,3 +8,4 @@
     <armor ac="2" penalty="-0.25" magres="0.3" laen="yes" shield="yes" />
   </item>
 </resource>
+</resources></eressea>

res/core/armor/plate.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea><resources>
 <resource name="plate">
   <item weight="400" score="150">
     <construction skill="armorer" minskill="4">
@@ -7,3 +8,4 @@
     <armor ac="5" penalty="0.30" magres="0.0"/>
   </item>
 </resource>
+</resources></eressea>

res/core/armor/rustychainmail.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea><resources>
 <resource name="rustychainmail">
   <item weight="200" score="30">
     <construction skill="armorer" minskill="3">
@@ -7,4 +8,4 @@
     <armor ac="2" penalty="0.30" magres="0.0"/>
   </item>
 </resource>
-
+</resources></eressea>

res/core/armor/rustyshield.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea><resources>
 <resource name="rustyshield">
   <item weight="100" score="10">
     <construction skill="armorer" minskill="2">
@@ -7,3 +8,4 @@
     <armor ac="1" penalty="0.0" magres="0.0" shield="yes"/>
   </item>
 </resource>
+</resources></eressea>

res/core/armor/shield.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea><resources>
 <resource name="shield">
   <item weight="100" score="30">
     <construction skill="armorer" minskill="2">
@@ -7,3 +8,4 @@
     <armor ac="1" penalty="-0.15" magres="0.0" shield="yes"/>
   </item>
 </resource>
+</resources></eressea>

res/core/common/armor.xml

@@ -1,10 +0,0 @@
-<?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/shield.xml"/>
-</resources>

res/core/common/buildings.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <buildings>
   <building name="wormhole" maxsize="4" maxcapacity="4" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="illusioncastle" capacity="0" maxcapacity="0" maxsize="0" nobuild="yes"/>
@@ -167,4 +168,4 @@
   </building>
 
 </buildings>
-
+</eressea>

res/core/common/construction.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- TODO: this does not work yet -->
-<production>
-  <construction resource="laenshield" skill="armorer" minskill="7">
-    <requirement type="laen" quantity="1"/>
-  </construction>
-  <construction resource="laenmail" skill="armorer" minskill="9">
-    <requirement type="laen" quantity="3"/>
-  </construction>
-</production>

res/core/common/herbs.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <resources>
   <!-- this file contains herbs that are part of the alchemy system -->
 
@@ -87,3 +88,4 @@
   </resource>
 
 </resources>
+</eressea>

res/core/common/items.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <resources>
 
   <resource name="money">
@@ -33,8 +34,8 @@
     <item weight="0" score="6000"/>
   </resource>
 
-  <resource name="presspass" cursed="yes">
+  <resource name="presspass">
-    <item weight="0" score="6000"/>
+    <item weight="0" score="6000" cursed="yes"/>
   </resource>
 
   <resource name="aurafocus">
@@ -133,3 +134,4 @@
   </resource>
 
 </resources>
+</eressea>

res/core/common/luxuries.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <resources>
   <!-- this file contains luxury items that are part of the trade system -->
   <resource name="balm">
@@ -24,3 +25,4 @@
   </resource>
 
 </resources>
+</eressea>

res/core/common/potions.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <resources>
   <!-- this file contains potions that are part of the alchemy system -->
 
@@ -33,7 +34,7 @@
     </item>
   </resource>
 
-  <resource name="p2" appearance="vial">
+  <resource name="lifepotion" appearance="vial">
     <item weight="0" score="30" use="yes">
       <potion level="1"/>
       <construction skill="alchemy" minskill="2">
@@ -166,7 +167,7 @@
     </item>
   </resource>
 
-  <resource name="p14" appearance="vial">
+  <resource name="healing" appearance="vial">
     <item weight="0" score="120" use="yes">
       <potion level="4"/>
       <construction skill="alchemy" minskill="8">
@@ -180,3 +181,4 @@
   </resource>
 
 </resources>
+</eressea>

res/core/common/resources.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!--
-  this file contains the most important items and resources any game will
-  want to use. Or maybe you just have to roll your own file.
-  -->
-
-  <xi:include href="../resources/cart.xml"/>
-  <xi:include href="../resources/horse.xml"/>
-  <xi:include href="../resources/hp.xml"/>
-  <xi:include href="../resources/iron.xml"/>
-  <xi:include href="../resources/laen.xml"/>
-  <xi:include href="../resources/log.xml"/>
-  <xi:include href="../resources/mallorn.xml"/>
-  <xi:include href="../resources/mallornseed.xml"/>
-  <xi:include href="../resources/seed.xml"/>
-  <xi:include href="../resources/peasant.xml"/>
-  <xi:include href="../resources/stone.xml"/>
-</resources>

res/core/common/weapons.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<resources xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../weapons/axe.xml"/>
-  <xi:include href="../weapons/bow.xml"/>
-  <xi:include href="../weapons/catapult.xml"/>
-  <xi:include href="../weapons/crossbow.xml"/>
-  <xi:include href="../weapons/firesword.xml"/>
-  <xi:include href="../weapons/greatbow.xml"/>
-  <xi:include href="../weapons/greatsword.xml"/>
-  <xi:include href="../weapons/halberd.xml"/>
-  <xi:include href="../weapons/laensword.xml"/>
-  <xi:include href="../weapons/lance.xml"/>
-  <xi:include href="../weapons/mallornbow.xml"/>
-  <xi:include href="../weapons/mallorncrossbow.xml"/>
-  <xi:include href="../weapons/mallornlance.xml"/>
-  <xi:include href="../weapons/mallornspear.xml"/>
-  <xi:include href="../weapons/runesword.xml"/>
-  <xi:include href="../weapons/rustyaxe.xml"/>
-  <xi:include href="../weapons/rustygreatsword.xml"/>
-  <xi:include href="../weapons/rustyhalberd.xml"/>
-  <xi:include href="../weapons/rustysword.xml"/>
-  <xi:include href="../weapons/spear.xml"/>
-  <xi:include href="../weapons/sword.xml"/>
-</resources>

res/core/resources/cart.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="cart">
   <item capacity="14000" weight="4000" score="60" vehicle="yes" big="yes">
     <construction skill="cartmaking" minskill="1">
@@ -6,3 +8,5 @@
     </construction>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/resources/horse.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="horse" limited="yes">
   <item big="yes" weight="5000" score="10" capacity="7000" animal="yes">
     <construction skill="training" minskill="1" />
   </item>
 </resource>
+</resources>
+</eressea>

res/core/resources/hp.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="hp" pooled="false">
   <function name="change" value="lua_changeresource"/>
 </resource>
+</resources>
+</eressea>

res/core/resources/iron.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="iron" limited="yes" material="yes">
     <item weight="500" score="10">
         <construction skill="mining" minskill="1"/>
@@ -6,5 +8,7 @@
     <modifier building="smithy" type="save" value="2"/>
     <modifier building="mine" type="skill" value="1"/>
     <modifier building="mine" type="material" value="0.5"/>
-    <modifier race="dwarf" type="material" value="0.6"/>
+    <modifier races="dwarf" type="material" value="0.6"/>
 </resource>
+</resources>
+</eressea>

res/core/resources/laen.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="laen" limited="yes" material="yes">
   <item weight="200" score="100">
     <construction skill="mining" minskill="7"/>
@@ -6,3 +8,5 @@
   <modifier building="mine" type="skill" value="1"/>
   <modifier type="require" building="mine"/>
 </resource>
+</resources>
+</eressea>

res/core/resources/log.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="log" limited="yes">
     <item weight="500" score="10">
         <construction skill="forestry" minskill="1"/>
@@ -6,3 +8,5 @@
     <modifier building="sawmill" type="skill" value="1"/>
     <modifier building="sawmill" type="material" value="0.5"/>
 </resource>
+</resources>
+</eressea>

res/core/resources/mallorn.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="mallorn" limited="yes">
     <item weight="500" score="30">
         <construction skill="forestry" minskill="2"/>
@@ -6,3 +8,5 @@
     <modifier building="sawmill" type="skill" value="1"/>
     <modifier building="sawmill" type="material" value="0.5"/>
 </resource>
+</resources>
+</eressea>

res/core/resources/mallornseed.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="mallornseed" limited="yes">
   <item weight="10" score="100">
     <construction skill="herbalism" minskill="4"/>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/resources/peasant.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="peasant" pooled="false">
   <function name="change" value="lua_changeresource"/>
 </resource>
+</resources>
+</eressea>

res/core/resources/seed.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="seed" limited="yes">
   <item weight="10" score="50">
     <construction skill="herbalism" minskill="3"/>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/resources/stone.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0"?>
+<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"/>
-    <modifier race="troll" type="material" value="0.75"/>
+    <modifier races="troll" type="material" value="0.75"/>
 </resource>
+</resources>
+</eressea>

res/core/ships.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <ships>
   <ship name="trireme" range="7" storm="1.00" damage="1.00" cargo="200000" cptskill="4" minskill="1" sumskill="120" opensea="yes">
     <coast terrain="plain"/>
@@ -73,4 +74,4 @@
   </ship>
 
 </ships>
-
+</eressea>

res/core/spellbooks/cerddor.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" ?>
-<spellbook name="cerddor">
-    <entry spell="create_roi" level="6" />
-    <entry spell="earn_silver#cerddor" level="1" />
-    <entry spell="create_aots" level="6" />
-    <entry spell="create_roqf" level="11" />
-</spellbook>

res/core/spellbooks/draig.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<spellbook name="draig">
-    <entry spell="create_roi" level="6" />
-    <entry spell="earn_silver#draig" level="1" />
-    <entry spell="create_aots" level="6" />
-    <entry spell="create_firesword" level="12" />
-    <entry spell="create_trollbelt" level="9" />
-</spellbook>

res/core/spellbooks/gray.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" ?>
-<spellbook name="gray">
-    <entry spell="create_runesword" level="6" />
-    <entry spell="create_chastitybelt" level="7" />
-    <entry spell="create_focus" level="9" />
-    <entry spell="create_ror" level="9" />
-</spellbook>

res/core/spellbooks/gwyrrd.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" ?>
-<spellbook name="gwyrrd">
-    <entry spell="create_roi" level="6" />
-    <entry spell="earn_silver#gwyrrd" level="1" />
-    <entry spell="create_aots" level="6" />
-    <entry spell="create_magicherbbag" level="5" />
-</spellbook>

res/core/spellbooks/illaun.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<spellbook name="illaun">
-    <entry spell="create_roi" level="6" />
-    <entry spell="earn_silver#illaun" level="1" />
-    <entry spell="create_aots" level="6" />
-    <entry spell="create_dreameye" level="14" />
-    <entry spell="create_invisibility_sphere" level="13" />
-</spellbook>

res/core/spellbooks/tybied.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" ?>
-<spellbook name="tybied">
-    <entry spell="create_roi" level="6" />
-    <entry spell="earn_silver#tybied" level="1" />
-    <entry spell="create_aots" level="6" />
-    <entry spell="create_antimagic" level="7" />
-    <entry spell="create_rop" level="9" />
-    <entry spell="create_bagofholding" level="10" />
-</spellbook>

res/core/spells.xml

@@ -1,123 +1,116 @@
 <?xml version="1.0"?>
-<spells xmlns:xi="http://www.w3.org/2001/XInclude">
+<spells>
-
-  <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"/>
 
   <!-- shared spells -->
-  <spell name="create_roi" ship="true" rank="5" index="130">
+  <spell name="create_roi" ship="true" rank="5">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_aots" ship="true" rank="5" index="125">
+  <spell name="create_aots" ship="true" rank="5">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
   <!-- draig spells -->
-  <spell name="earn_silver#draig" ship="true" variable="true" rank="5" index="159">
+  <spell name="earn_silver#draig" ship="true" variable="true" rank="5">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_firesword" ship="true" rank="5" index="148">
+  <spell name="create_firesword" ship="true" rank="5">
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="p10" amount="1" cost="fixed"/>
     <resource name="sword" amount="1" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_trollbelt" ship="true" rank="5" index="48">
+  <spell name="create_trollbelt" ship="true" rank="5">
     <resource name="aura" amount="20" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
   <!-- gwyrrd spells -->
-  <spell name="earn_silver#gwyrrd" ship="true" variable="true" rank="5" index="159">
+  <spell name="earn_silver#gwyrrd" ship="true" variable="true" rank="5">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_magicherbbag" ship="true" rank="5" index="165">
+  <spell name="create_magicherbbag" ship="true" rank="5">
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
-    <resource name="p2" amount="1" cost="fixed"/>
+    <resource name="lifepotion" amount="1" cost="fixed"/>
   </spell>
 
   <!-- illaun spells -->
-  <spell name="earn_silver#illaun" ship="true" variable="true" rank="5" index="159">
+  <spell name="earn_silver#illaun" ship="true" variable="true" rank="5">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_dreameye" ship="true" rank="5" index="149">
+  <spell name="create_dreameye" ship="true" rank="5">
     <resource name="dragonhead" amount="1" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
 
-  <spell name="create_invisibility_sphere" ship="true" rank="5" index="178">
+  <spell name="create_invisibility_sphere" ship="true" rank="5">
     <resource name="aura" amount="150" cost="fixed"/>
     <resource name="money" amount="30000" cost="fixed"/>
     <resource name="permaura" amount="3" cost="fixed"/>
   </spell>
 
   <!-- cerddor spells -->
-  <spell name="earn_silver#cerddor" ship="true" variable="true" rank="5" index="159">
+  <spell name="earn_silver#cerddor" ship="true" variable="true" rank="5">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_roqf" ship="true" rank="5" index="63">
+  <spell name="create_roqf" ship="true" rank="5">
     <resource name="aura" amount="20" cost="fixed"/>
     <resource name="money" amount="1000" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
   <!-- tybied spells -->
-  <spell name="earn_silver#tybied" ship="true" variable="true" rank="5" index="159">
+  <spell name="earn_silver#tybied" ship="true" variable="true" rank="5">
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
-  <spell name="create_antimagic" ship="true" rank="5" index="38">
+  <spell name="create_antimagic" ship="true" rank="5">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
   </spell>
 
-  <spell name="create_rop" ship="true" rank="5" index="1">
+  <spell name="create_rop" ship="true" rank="5">
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="4000" cost="fixed"/>
   </spell>
 
-  <spell name="create_bagofholding" ship="true" rank="5" index="155">
+  <spell name="create_bagofholding" ship="true" rank="5">
     <resource name="aura" amount="30" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="5000" cost="fixed"/>
   </spell>
 
   <!-- gray magic -->
-  <spell name="create_runesword" ship="true" rank="5" index="135">
+  <spell name="create_runesword" ship="true" rank="5">
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="1000" cost="fixed"/>
     <resource name="laensword" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_chastitybelt" ship="true" rank="5" index="134">
+  <spell name="create_chastitybelt" ship="true" rank="5">
     <resource name="aura" amount="50" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
     <resource name="money" amount="3000" cost="fixed"/>
   </spell>
 
-  <spell name="create_focus" ship="true" rank="5" index="2">
+  <spell name="create_focus" ship="true" rank="5">
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>
 
-  <spell name="create_ror" ship="true" rank="5" index="3">
+  <spell name="create_ror" ship="true" rank="5">
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="1" cost="fixed"/>
   </spell>

res/core/spoils.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<eressea>
 <resources>
 
   <resource name="elfspoil">
@@ -57,3 +58,4 @@
   </resource>
 
 </resources>
+</eressea>

res/core/weapons/axe.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="axe">
   <item weight="200">
     <construction skill="weaponsmithing" minskill="3">
@@ -11,3 +13,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/bow.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="bow">
   <item weight="100">
     <construction skill="weaponsmithing" minskill="2">
@@ -11,3 +13,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/catapult.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="catapult">
   <item weight="10000" big="yes">
     <construction skill="cartmaking" minskill="5">
@@ -12,3 +14,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/crossbow.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="crossbow">
   <item weight="100">
     <construction skill="weaponsmithing" minskill="3">
@@ -11,3 +13,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/firesword.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="firesword">
   <item weight="100">
-    <weapon magres="0.3" cut="true" skill="melee" offmod="1" defmod="1">
+    <weapon magres="0.3" cut="true" magical="true" skill="melee" offmod="1" defmod="1">
       <function name="attack" value="attack_firesword"/>
       <damage type="rider" value="3d6+10"/>
       <damage type="footman" value="3d6+10"/>
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/greatbow.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="greatbow">
-  <modifier type="require" race="elf"/>
+  <modifier type="require" races="elf"/>
   <item weight="100">
     <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="2"/>
@@ -9,9 +11,9 @@
       <damage type="rider" value="2d6+4"/>
       <damage type="footman" value="2d6+4"/>
       <modifier type="missile_target" value="2"/>
-      <modifier type="damage" value="1">
+      <modifier type="damage" value="1" races="elf"/>
-        <race name="elf"/>
-      </modifier>
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/greatsword.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="greatsword">
   <item weight="200" score="30">
     <construction skill="weaponsmithing" minskill="4">
@@ -10,3 +12,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/halberd.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="halberd">
   <item weight="200">
     <construction skill="weaponsmithing" minskill="3">
@@ -12,3 +14,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/laensword.xml

@@ -1,12 +1,16 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <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">
+    <weapon cut="true" magical="true" skill="melee" offmod="1" defmod="1" magres="0.30">
       <damage type="rider" value="3d6+10"/>
       <damage type="footman" value="3d6+10"/>
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/lance.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="lance">
   <item weight="200">
     <construction skill="weaponsmithing" minskill="2">
@@ -10,3 +12,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/mallornbow.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="mallornbow">
   <item weight="100">
     <construction skill="weaponsmithing" minskill="5">
@@ -8,9 +10,9 @@
       <damage type="rider" value="1d11+2"/>
       <damage type="footman" value="1d11+2"/>
       <modifier type="missile_target" value="2"/>
-      <modifier type="damage" value="1">
+      <modifier type="damage" value="1" races="elf"/>
-        <race name="elf"/>
-      </modifier>
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/mallorncrossbow.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="mallorncrossbow">
   <item weight="100">
     <construction skill="weaponsmithing" minskill="5">
@@ -11,3 +13,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/mallornlance.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="mallornlance">
   <item weight="100">
     <construction skill="weaponsmithing" minskill="5">
@@ -10,3 +12,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/mallornspear.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="mallornspear">
   <item weight="100">
     <construction skill="weaponsmithing" minskill="5">
@@ -12,3 +14,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/runesword.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="runesword">
   <item weight="100" score="2000">
     <weapon cut="true" magical="yes" skill="melee" offmod="2" defmod="2">
@@ -8,3 +10,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/rustyaxe.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="rustyaxe">
   <item weight="200">
     <construction skill="weaponsmithing" minskill="3">
@@ -11,3 +13,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/rustygreatsword.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="rustygreatsword">
   <item weight="200" score="20">
     <construction skill="weaponsmithing" minskill="4">
@@ -10,3 +12,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/rustyhalberd.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="rustyhalberd">
   <item weight="200" score="20">
     <construction skill="weaponsmithing" minskill="3">
@@ -12,3 +14,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/rustysword.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="rustysword">
   <item weight="100" score="10">
     <construction skill="weaponsmithing" minskill="3">
@@ -10,3 +12,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/spear.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="spear">
   <item weight="100">
     <construction skill="weaponsmithing" minskill="2">
@@ -12,3 +14,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/core/weapons/sword.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<eressea>
+<resources>
 <resource name="sword">
   <item weight="100" score="30">
     <construction skill="weaponsmithing" minskill="3">
@@ -10,3 +12,5 @@
     </weapon>
   </item>
 </resource>
+</resources>
+</eressea>

res/e3a/armor.xml

@@ -1,12 +1,79 @@
 <?xml version="1.0"?>
-<resources xmlns:xi="http://www.w3.org/2001/XInclude">
+<eressea>
-  <xi:include href="armor/chainmail.xml"/>
+<resources>
-  <xi:include href="armor/laenmail.xml"/>
+<resource name="towershield">
-  <xi:include href="armor/laenshield.xml"/>
+  <modifier type="require" races="dwarf irongolem"/>
-  <xi:include href="armor/plate.xml"/>
+  <item weight="200" score="60" allow="dwarf">
-  <xi:include href="armor/rustychainmail.xml"/>
+    <construction skill="armorer" minskill="4">
-  <xi:include href="armor/rustyshield.xml"/>
+      <requirement type="iron" quantity="1"/>
-  <xi:include href="armor/scale.xml"/>
+    </construction>
-  <xi:include href="armor/shield.xml"/>
+    <armor ac="0" penalty="-0.15" projectile="0.25" magres="0.0" shield="yes"/>
-  <xi:include href="armor/towershield.xml"/>
+  </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" races="dwarf 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>

res/e3a/armor/chainmail.xml

@@ -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>

res/e3a/armor/laenmail.xml

@@ -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>

res/e3a/armor/laenshield.xml

@@ -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>

res/e3a/armor/plate.xml

@@ -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>

res/e3a/armor/rustychainmail.xml

@@ -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>

res/e3a/armor/rustyshield.xml

@@ -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>

res/e3a/armor/scale.xml

@@ -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>

res/e3a/armor/shield.xml

@@ -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>

res/e3a/armor/towershield.xml

@@ -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>

res/e3a/buildings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-<buildings xmlns:xi="http://www.w3.org/2001/XInclude">
+<eressea>
-
+<buildings>
-  <xi:include href="config://default/buildings/castle-2.xml" />
 
   <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>

res/e3a/equipment.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<equipment>
-
-  <set name="spo_seaserpent">
-    <item name="dragonblood" amount="2"/>
-    <item name="seaserpenthead" amount="1"/>
-  </set>
-
-</equipment>

res/e3a/familiars.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<equipment>
-
-  <!-- equipment given to familiars -->
-  <set name="fam_lynx">
-    <skill name="magic" level="1"/>
-  </set>
-
-  <set name="fam_tunnelworm">
-    <skill name="magic" level="1"/>
-    <skill name="mining" level="1"/>
-    <skill name="forestry" level="1"/>
-    <skill name="stamina" level="1"/>
-  </set>
-
-  <set name="fam_eagle">
-    <skill name="magic" level="1"/>
-  </set>
-
-  <set name="fam_rat">
-    <skill name="magic" level="1"/>
-    <skill name="stamina" level="6"/>
-  </set>
-
-  <set name="fam_songdragon">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="flee" level="2"/>
-    <spell name="sleep" level="7"/>
-    <spell name="frighten" level="8"/>
-  </set>
-
-  <set name="fam_nymph">
-    <skill name="magic" level="1"/>
-    <skill name="bow" level="1"/>
-    <skill name="training" level="1"/>
-    <skill name="riding" level="1"/>
-    <!-- spells -->
-    <spell name="seduction" level="6"/>
-    <spell name="calm_monster" level="6"/>
-    <spell name="song_of_confusion" level="4"/>
-    <spell name="appeasement" level="1"/>
-  </set>
-
-  <set name="fam_unicorn">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="resist_magic" level="3"/>
-    <spell name="song_of_peace" level="12"/>
-    <spell name="calm_monster" level="6"/>
-    <spell name="heroic_song" level="5"/>
-    <spell name="song_of_healing" level="2"/>
-    <spell name="appeasement" level="1"/>
-  </set>
-
-  <set name="fam_direwolf">
-    <skill name="magic" level="1"/>
-  </set>
-
-  <set name="fam_ghost">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="steal_aura" level="6"/>
-    <spell name="frighten" level="8"/>
-    <spell name="summonundead" level="6"/>
-  </set>
-
-  <set name="fam_imp">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="steal_aura" level="6"/>
-    <spell name="shapeshift" level="3"/>
-    <spell name="seduction" level="6"/>
-  </set>
-
-  <set name="fam_dreamcat">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="shapeshift" level="3"/>
-    <spell name="transferauratraum" level="3"/>
-  </set>
-
-  <set name="fam_fairy">
-    <skill name="magic" level="1"/>
-    <!-- spells -->
-    <spell name="appeasement" level="1"/>
-    <spell name="calm_monster" level="6"/>
-    <spell name="seduction" level="6"/>
-  </set>
-
-  <set name="fam_owl">
-    <skill name="magic" level="1"/>
-  </set>
-
-  <set name="fam_hellcat">
-    <skill name="magic" level="1"/>
-  </set>
-
-  <set name="fam_tiger">
-    <skill name="magic" level="1"/>
-  </set>
-
-</equipment>
-

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>
@@ -26,7 +52,7 @@
     </item>
   </resource>
 
-  <resource name="p14" appearance="vial">
+  <resource name="healing" appearance="vial">
     <!-- Heiltrank -->
     <item weight="0" score="120" use="yes">
       <potion level="4"/>
@@ -40,7 +66,7 @@
     </item>
   </resource>
 
-  <resource name="p2" appearance="vial">
+  <resource name="lifepotion" appearance="vial">
     <!-- Wasser des Lebens -->
     <item weight="0" score="30" use="yes">
       <potion level="1"/>
@@ -76,3 +102,4 @@
   </resource>
 
 </resources>
+</eressea>

res/e3a/races.xml

@@ -1,18 +1,14 @@
 <?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"/>
+  <race name="template" maintenance="0" magres="100" maxaura="0" regaura="0" weight="0" capacity="1000" speed="10.000000" hp="10" damage="1d4" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" fly="yes" swim="yes" walk="yes" shapeshift="yes" shapeshiftany="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" recruitunlimited="yes" equipment="yes">
-  <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="template" maintenance="0" magres="100" maxaura="0.000000" regaura="0.000000" weight="0" capacity="1000" speed="10.000000" hp="10" damage="1d4" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" fly="yes" swim="yes" walk="yes" shapeshift="yes" shapeshiftany="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" recruitunlimited="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <attack type="1" damage="1d4"/>
   </race>
-  <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">
+  <race name="lynx" maxaura="0" regaura="0" 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"/>
     <skill name="mining" modifier="-99"/>
@@ -35,7 +31,7 @@
     <attack type="4" damage="2d3"/>
   </race>
 
-  <race name="human" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="human" maxaura="1" regaura="1" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <param name="other_race" value="elf"/>
     <skill name="riding" modifier="+1"/>
@@ -44,11 +40,11 @@
     <skill name="magic" modifier="-99"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="dolphin" default="yes"/>
+    <familiar race="dolphin"/>
     <familiar race="giantturtle"/>
   </race>
 
-  <race name="orc" studyspeed="-5" magres="-5" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="orc" studyspeed="-5" magres="-5" maxaura="1" regaura="1" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <param name="other_race" value="troll"/>
 
@@ -71,12 +67,12 @@
     <skill name="unarmed" modifier="-99"/>
     <skill name="weaponsmithing" modifier="2"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="wolf" default="yes"/>
+    <familiar race="wolf"/>
     <familiar race="ghost"/>
   </race>
 
-  <race name="halfling" defensemodifier="1" magres="5" maxaura="1.0"
+  <race name="halfling" defensemodifier="1" magres="5" maxaura="1"
-  regaura="1.0" recruitcost="100" maintenance="10" weight="1000"
+  regaura="1" recruitcost="100" maintenance="10" weight="1000"
   capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2"
   unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes"
   giveunit="yes" getitem="yes" equipment="yes">
@@ -99,13 +95,13 @@
     <skill name="magic" modifier="-99"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="eagle" default="yes"/>
+    <familiar race="eagle"/>
     <familiar race="imp"/>
   </race>
   
   <!-- begin secondary races -->
 
-  <race name="demon" magres="15" maxaura="1.0" regaura="1.1" recruitcost="360" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="30" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
+  <race name="demon" magres="15" maxaura="1" regaura="1.1" recruitcost="360" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="30" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <skill name="cartmaking" modifier="-2"/>
     <skill name="forestry" modifier="1"/>
@@ -120,11 +116,11 @@
     <skill name="weaponsmithing" modifier="1"/>
     <attack type="1" damage="1d5"/>
     <attack type="5"/>
-    <familiar race="imp" default="yes"/>
+    <familiar race="imp"/>
     <familiar race="ghost"/>
   </race>
 
-  <race name="elf" magres="10" maxaura="1.0" regaura="1.1"
+  <race name="elf" magres="10" maxaura="1" regaura="1.1"
   recruitcost="200" maintenance="10" weight="1000" capacity="540"
   speed="1.0" hp="20" damage="1d5" unarmedattack="-2"
   unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes"
@@ -142,11 +138,11 @@
     <skill name="training" modifier="2"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="nymph" default="yes"/>
+    <familiar race="nymph"/>
     <familiar race="unicorn"/>
   </race>
 
-  <race name="troll" magres="10" maxaura="1.0" regaura="1.0" recruitcost="260" maintenance="10" weight="2000" capacity="1080" speed="1.0" hp="20" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="troll" magres="10" maxaura="1" regaura="1" recruitcost="260" maintenance="10" weight="2000" capacity="1080" speed="1.0" hp="20" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <param name="armor.stamina" value="4"/> <!-- +1 natural armor per X levels stamina -->
     <skill name="armorer" modifier="2"/>
@@ -164,11 +160,11 @@
     <skill name="training" modifier="-1"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5+3"/>
-    <familiar race="tunnelworm" default="yes"/>
+    <familiar race="tunnelworm"/>
     <familiar race="rat"/>
   </race>
 
-  <race name="dwarf" magres="5" maxaura="1.0" regaura="0.9"
+  <race name="dwarf" magres="5" maxaura="1" regaura="0.9"
   recruitcost="240" maintenance="10" weight="1000" capacity="540"
   speed="1.0" hp="20" damage="1d5" unarmedattack="-2"
   unarmeddefense="-2" playerrace="yes" walk="yes" giveperson="yes"
@@ -190,7 +186,7 @@
     <skill name="weaponsmithing" modifier="2"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d5"/>
-    <familiar race="lynx" default="yes"/>
+    <familiar race="lynx"/>
     <familiar race="songdragon"/>
   </race>
 
@@ -607,7 +603,7 @@
     <attack type="3" damage="1d1"/>
     <attack type="4" damage="1d1"/>
   </race>
-  <race name="toad" magres="20" maxaura="1.0" regaura="1.0" maintenance="10" weight="100" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+  <race name="toad" magres="20" maxaura="1" regaura="1" maintenance="10" weight="100" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
     <ai splitsize="1" learn="yes"/>
     <skill name="crossbow" modifier="-10"/>
     <skill name="mining" modifier="-10"/>
@@ -655,38 +651,38 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
-  <race name="mountainguard" unarmedguard="yes" magres="50" maxaura="1.0" regaura="0.500000" weight="10000" capacity="2000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" canlearn="no" teach="no" noweapons="yes">
+  <race name="mountainguard" unarmedguard="yes" magres="50" maxaura="1.0" regaura="0.500000" weight="10000" capacity="2000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" learn="no" teach="no" noweapons="yes">
     <ai splitsize="1"/>
     <attack type="4" damage="2d40"/>
   </race>
-  <race name="shadowmaster" cansail="no" cansteal="no" canlearn="no" magres="75" maxaura="1.0" regaura="2.000000" weight="500" capacity="540" speed="1.0" hp="150" ac="4" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="11" defensemodifier="13" scarepeasants="yes" walk="yes" teach="no" desert="yes">
+  <race name="shadowmaster" cansail="no" cansteal="no" learn="no" magres="75" maxaura="1.0" regaura="2.000000" weight="500" capacity="540" speed="1.0" hp="150" ac="4" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="11" defensemodifier="13" scarepeasants="yes" walk="yes" teach="no" desert="yes">
     <ai splitsize="50" killpeasants="yes" moverandom="yes" learn="yes"/>
     <attack type="4" damage="2d4"/>
     <attack type="2" damage="2d30"/>
     <attack type="3" damage="1d2"/>
   </race>
-  <race name="shadowdemon" cansail="no" cansteal="no" canlearn="no" magres="75" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="50" ac="3" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="8" defensemodifier="11" scarepeasants="yes" walk="yes" teach="no" desert="yes" recruitethereal="yes">
+  <race name="shadowdemon" cansail="no" cansteal="no" learn="no" magres="75" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="50" ac="3" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="8" defensemodifier="11" scarepeasants="yes" walk="yes" teach="no" desert="yes" recruitethereal="yes">
     <ai splitsize="1000" killpeasants="yes" moverandom="yes" learn="yes"/>
     <attack type="4" damage="2d3"/>
     <attack type="3" damage="1d1"/>
   </race>
-  <race name="stonegolem" stonegolem="true" magres="25" maxaura="1.0" regaura="0.100000" weight="10000" capacity="2000" speed="1.0" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" canlearn="no" teach="no">
+  <race name="stonegolem" stonegolem="true" magres="25" maxaura="1.0" regaura="0.100000" weight="10000" capacity="2000" speed="1.0" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" learn="no" teach="no">
     <ai splitsize="50"/>
     <skill name="building" modifier="14"/>
     <skill name="roadwork" modifier="14"/>
     <attack type="4" damage="2d10+4"/>
   </race>
-  <race name="irongolem" irongolem="true" magres="25" maxaura="1.0" regaura="0.100000" weight="10000" capacity="2000" speed="1.0" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" canlearn="no" teach="no">
+  <race name="irongolem" irongolem="true" magres="25" maxaura="1.0" regaura="0.100000" weight="10000" capacity="2000" speed="1.0" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" learn="no" teach="no">
     <ai splitsize="50"/>
     <skill name="armorer" modifier="14"/>
     <skill name="weaponsmithing" modifier="14"/>
     <attack type="4" damage="2d8+4"/>
   </race>
-  <race name="spell" maxaura="1.0" regaura="0.100000" weight="0" capacity="0" speed="0.000000" hp="1" damage="1d4" unarmedattack="-2" unarmeddefense="-2" canlearn="no" noheal="yes" noweapons="yes" illusionary="yes" invisible="yes" fly="yes" swim="yes" walk="yes">
+  <race name="spell" maxaura="1" regaura="0.100000" weight="0" capacity="0" speed="0.000000" hp="1" damage="1d4" unarmedattack="-2" unarmeddefense="-2" learn="no" noheal="yes" noweapons="yes" illusionary="yes" invisible="yes" fly="yes" swim="yes" walk="yes">
     <ai splitsize="1"/>
     <attack type="1" damage="1d4"/>
   </race>
-  <race name="special" maxaura="0.000000" regaura="0.000000" weight="0" capacity="0" speed="0.000000" hp="1" damage="1d4" unarmedattack="-2" unarmeddefense="-2">
+  <race name="special" maxaura="0" regaura="0" weight="0" capacity="0" speed="0.000000" hp="1" damage="1d4" unarmedattack="-2" unarmeddefense="-2">
     <ai splitsize="1"/>
     <attack type="1" damage="1d4"/>
   </race>
@@ -704,17 +700,17 @@
     <attack type="4" damage="2d12"/>
   </race>
 
-  <race name="undead" maxaura="1.0" regaura="1.0" weight="1000"
+  <race name="undead" maxaura="1" regaura="1" weight="1000"
   capacity="540" speed="1.0" hp="20" damage="1d7" unarmedattack="0"
   unarmeddefense="0" attackmodifier="1" defensemodifier="1"
-  scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes"
+  scarepeasants="yes" walk="yes" learn="no" teach="no" noheal="yes"
   undead="yes" equipment="yes" giveperson="yes">
     <ai splitsize="20000" moverandom="yes"/>
     <attack type="4" damage="1d7"/>
     <attack type="5"/>
   </race>
 
-  <race name="clone" magres="90" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.0" hp="40" damage="0d0" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" canlearn="no" teach="no" noheal="yes">
+  <race name="clone" magres="90" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.0" hp="40" damage="0d0" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" learn="no" teach="no" noheal="yes">
     <ai splitsize="10000"/>
     <skill name="crossbow" modifier="-99"/>
     <skill name="mining" modifier="-99"/>
@@ -740,7 +736,7 @@
     <attack type="1" damage="0d0"/>
   </race>
 
-  <race name="ghast" magres="60" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" giveperson="yes">
+  <race name="ghast" magres="60" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" learn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" giveperson="yes">
     <ai splitsize="2000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -758,7 +754,7 @@
     <attack type="2" damage="1d30"/>
   </race>
 
-  <race name="ghoul" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" giveperson="yes">
+  <race name="ghoul" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" learn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" giveperson="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -775,7 +771,7 @@
     <attack type="2" damage="1d30"/>
   </race>
 
-  <race name="juju" magres="50" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistbash="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
+  <race name="juju" magres="50" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" learn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistbash="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="2000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -791,7 +787,7 @@
     <attack type="3" damage="1d1"/>
   </race>
 
-  <race name="zombie" magres="20" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
+  <race name="zombie" magres="20" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants="yes" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -805,7 +801,7 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="skeletonlord" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
+  <race name="skeletonlord" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" learn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="2000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -820,7 +816,7 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="skeleton" magres="10" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
+  <race name="skeleton" magres="10" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" learn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -834,7 +830,7 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="shadowknight" maxaura="0.000000" regaura="0.000000" weight="0" capacity="540" speed="1.0" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noblock="yes">
+  <race name="shadowknight" maxaura="0.000000" regaura="0.000000" weight="0" capacity="540" speed="1.0" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants="yes" walk="yes" learn="no" teach="no" noblock="yes">
     <ai splitsize="20000" moverandom="yes"/>
     <attack type="1" damage="1d1"/>
   </race>
@@ -850,3 +846,4 @@
   </race>
 
 </races>
+</eressea>

res/e3a/resources.xml

@@ -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>

res/e3a/resources/iron.xml

@@ -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>

res/e3a/resources/mallornseed.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<resource name="mallornseed">
-  <item weight="10" score="100"/>
-</resource>

res/e3a/resources/seed.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<resource name="seed">
-  <item weight="10" score="50"/>
-</resource>

res/e3a/resources/stone.xml

@@ -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>