- test case for production and renaming of items (old aliases)

- splitting items over several files

src/common/kernel/item.c

@@ -391,6 +391,7 @@ static const char * it_aliases[][2] = {
   { "diamond", "adamantium" },
   { "diamondaxe", "adamantiumaxe" },
   { "diamondplate", "adamantiumplate" },
+  { "aoh", "ao_healing" },
   { NULL, NULL },
 };
 
@@ -716,7 +717,7 @@ typedef struct t_item {
 } t_item;
 
 const char * itemnames[MAXITEMS] = {
-  "iron", "stone", "horse", "aoh",
+  "iron", "stone", "horse", "ao_healing",
   "aots", "roi", "rop", "ao_chastity",
   "laen", "fairyboot", "aoc", "pegasus",
   "elvenhorse", "dolphin", "roqf", "trollbelt",

src/eressea.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
@@ -21,9 +21,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea\eres
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codegen", "tools\codegen\codegen.vcproj", "{BEF9E49F-3E98-4CE7-B641-62456E656E34}"
-EndProject
 Global
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Profile|Win32 = Profile|Win32
@@ -66,18 +68,8 @@ Global
 		{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Profile|Win32.Build.0 = Release|Win32
 		{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32
 		{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.Build.0 = Release|Win32
-		{BEF9E49F-3E98-4CE7-B641-62456E656E34}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BEF9E49F-3E98-4CE7-B641-62456E656E34}.Debug|Win32.Build.0 = Debug|Win32
-		{BEF9E49F-3E98-4CE7-B641-62456E656E34}.Profile|Win32.ActiveCfg = Release|Win32
-		{BEF9E49F-3E98-4CE7-B641-62456E656E34}.Profile|Win32.Build.0 = Release|Win32
-		{BEF9E49F-3E98-4CE7-B641-62456E656E34}.Release|Win32.ActiveCfg = Release|Win32
-		{BEF9E49F-3E98-4CE7-B641-62456E656E34}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(SubversionScc) = preSolution
-		Svn-Managed = True
-		Manager = AnkhSVN - Subversion Support for Visual Studio
-	EndGlobalSection
 EndGlobal

src/eressea/tolua/bind_unit.c

@@ -828,7 +828,8 @@ tolua_unit_create(lua_State* tolua_S)
 {
   faction * f = (faction *)tolua_tousertype(tolua_S, 1, 0);
   region * r = (region *)tolua_tousertype(tolua_S, 2, 0);
-  unit * u = create_unit(r, f, 0, f->race, 0, NULL, NULL);
+  int num = (int)tolua_tonumber(tolua_S, 3, 0);
+  unit * u = create_unit(r, f, num, f->race, 0, NULL, NULL);
 
   tolua_pushusertype(tolua_S, u, "unit");
   return 1;

src/res/asgard.xml

@@ -16,6 +16,13 @@
   <xi:include href="calendar.xml"/>
   <xi:include href="equipment.xml"/>
   
+  <xi:include href="eressea/strings.xml"/>
+  <xi:include href="eressea/races.xml"/>
+  <xi:include href="eressea/items.xml"/>
+  <xi:include href="eressea/artrewards.xml"/>
+  <xi:include href="eressea/dungeons.xml"/>
+  <xi:include href="eressea/temple.xml"/>
+
   <equipment>
     <set name="first_unit">
       <item name="conquesttoken" amount="1"/>
@@ -109,12 +116,6 @@
     <param name="hunger.long" value="1"/>
     <param name="rules.check_overload" value="0"/>
   </game>
-  <xi:include href="eressea/strings.xml"/>
-  <xi:include href="eressea/races.xml"/>
-  <xi:include href="eressea/items.xml"/>
-  <xi:include href="eressea/artrewards.xml"/>
-  <xi:include href="eressea/dungeons.xml"/>
-  <xi:include href="eressea/temple.xml"/>
   <strings>
     <string name="mailto">
       <text locale="de">eressea-server@eressea.kn-bremen.de</text>

src/res/asgard/items.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resources>
 
-  <resource name="aoh" appearance="amulet">
+  <resource name="ao_healing" appearance="amulet">
     <item weight="0" score="6000"/>
   </resource>
 
@@ -79,7 +79,7 @@
     <item weight="5000" notlost="yes" big="yes" score="6000" capacity="7000" animal="yes"/>
   </resource>
 
-  <resource name="iron" limited="yes">
+  <resource name="iron" limited="yes" material="rm_iron">
     <item weight="500" score="10">
       <construction skill="mining" minskill="1" reqsize="1"/>
     </item>
@@ -91,16 +91,17 @@
     </resourcelimit>
   </resource>
 
-  <resource name="laen" limited="yes">
+  <resource name="laen" limited="yes" material="rm_laen">
     <item weight="200" score="100">
       <construction skill="mining" minskill="7" reqsize="1"/>
     </item>
     <resourcelimit>
+      <modifier type="require" building="mine"/>
       <guard flag="mining"/>
     </resourcelimit>
   </resource>
 
-  <resource name="stone" limited="yes">
+  <resource name="stone" limited="yes" material="rm_stone">
     <item weight="6000" score="10" big="yes">
       <construction skill="quarrying" minskill="1" reqsize="1"/>
     </item>
@@ -135,11 +136,15 @@
   </resource>
 
   <resource name="seed" limited="yes">
-    <item weight="10" score="50"/>
+    <item weight="10" score="50">
+      <construction skill="herbalism" minskill="3" reqsize="1"/>
+    </item>
   </resource>
 
   <resource name="mallornseed" limited="yes">
-    <item weight="10" score="100"/>
+    <item weight="10" score="100">
+      <construction skill="herbalism" minskill="4" reqsize="1"/>
+    </item>
   </resource>
 
   <resource name="log">
@@ -435,7 +440,7 @@
       <construction skill="cartmaking" minskill="5" reqsize="1">
         <requirement type="log" quantity="10"/>
       </construction>
-      <weapon bash="true" missile="true" skill="catapult" offmod="0" defmod="0" reload="5">
+      <weapon siege="true" bash="true" missile="true" skill="catapult" offmod="0" defmod="0" reload="5">
         <damage type="rider" value="3d10+5"/>
         <damage type="footman" value="3d10+5"/>
         <modifier type="missile_target" value="4"/>

src/res/common/armor.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<resources>
+  <!-- this file contains a lot of armor -->
+
+  <resource name="laenshield">
+    <item weight="0" score="1000">
+      <construction skill="armorer" minskill="7" reqsize="1">
+        <requirement type="laen" quantity="1"/>
+      </construction>
+      <armor ac="2" penalty="-0.25" magres="0.3" laen="yes" shield="yes" />
+    </item>
+  </resource>
+
+  <resource name="laenmail">
+    <item weight="100" score="1000">
+      <construction skill="armorer" minskill="9" reqsize="1">
+        <requirement type="laen" quantity="3"/>
+      </construction>
+      <armor ac="6" penalty="0.0" magres="0.3" laen="yes" />
+    </item>
+  </resource>
+
+  <resource name="rustyshield">
+    <item weight="100" score="10">
+      <construction skill="armorer" minskill="2" reqsize="1">
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <armor ac="1" penalty="0.0" magres="0.0" shield="yes"/>
+    </item>
+  </resource>
+
+  <resource name="rustychainmail">
+    <item weight="200" score="30">
+      <construction skill="armorer" minskill="3" reqsize="1">
+        <requirement type="iron" quantity="3"/>
+      </construction>
+      <armor ac="2" penalty="0.30" magres="0.0"/>
+    </item>
+  </resource>
+
+  <resource name="shield">
+    <item weight="100" score="30">
+      <construction skill="armorer" minskill="2" reqsize="1">
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <armor ac="1" penalty="-0.15" magres="0.0" shield="yes"/>
+    </item>
+  </resource>
+
+  <resource name="chainmail">
+    <item weight="200" score="90">
+      <construction skill="armorer" minskill="3" reqsize="1">
+        <requirement type="iron" quantity="3"/>
+      </construction>
+      <armor ac="3" penalty="0.15" magres="0.0"/>
+    </item>
+  </resource>
+
+  <resource name="plate">
+    <item weight="400" score="150">
+      <construction skill="armorer" minskill="4" reqsize="1">
+        <requirement type="iron" quantity="5"/>
+      </construction>
+      <armor ac="5" penalty="0.30" magres="0.0"/>
+    </item>
+  </resource>
+
+</resources>

src/res/common/construction.xml

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

src/res/common/items.xml

@@ -0,0 +1,178 @@
+<?xml version="1.0"?>
+<resources>
+
+  <resource name="ao_healing" appearance="amulet">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="aots" appearance="amulet">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="roi" appearance="">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="rop" appearance="">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="roqf" appearance="">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="trollbelt">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="presspass" cursed="yes">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="aurafocus">
+    <item weight="100" score="6000"/>
+  </resource>
+
+  <resource name="sphereofinv" appearance="">
+    <item weight="100" score="6000"/>
+  </resource>
+
+  <resource name="magicbag">
+    <item big="yes" notlost="yes" weight="100" score="6000"/>
+  </resource>
+
+  <resource name="magicherbbag" appearance="">
+    <item weight="100" score="6000"/>
+  </resource>
+
+  <resource name="ao_chastity" appearance="amulet">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="fairyboot">
+    <item weight="0" score="6000"/>
+  </resource>
+
+  <resource name="aoc" appearance="amulet">
+    <item weight="100">
+      <function name="use" value="use_birthdayamulet"/>
+    </item>
+  </resource>
+
+  <resource name="dreameye">
+    <item weight="100">
+      <function name="use" value="use_tacticcrystal"/>
+    </item>
+  </resource>
+
+  <resource name="pegasus">
+    <item weight="5000" notlost="yes" big="yes" score="6000" capacity="7000" animal="yes"/>
+  </resource>
+
+  <resource name="elvenhorse">
+    <item weight="5000" notlost="yes" big="yes" score="6000" capacity="7000" animal="yes">
+      <function name="give" value="givehorses"/>
+    </item>
+  </resource>
+
+  <resource name="dolphin">
+    <item weight="5000" notlost="yes" big="yes" score="6000" capacity="7000" animal="yes"/>
+  </resource>
+
+  <resource name="seaserpenthead">
+    <item weight="500" score="400"/>
+  </resource>
+
+  <resource name="dragonblood">
+    <item weight="100" score="100"/>
+  </resource>
+
+  <resource name="dragonhead">
+    <item weight="500" score="300"/>
+  </resource>
+
+  <resource name="seed" limited="yes">
+    <item weight="10" score="50">
+      <construction skill="herbalism" minskill="3" reqsize="1"/>
+    </item>
+  </resource>
+
+  <resource name="mallornseed" limited="yes">
+    <item weight="10" score="100">
+      <construction skill="herbalism" minskill="4" reqsize="1"/>
+    </item>
+  </resource>
+
+<!-- XE items -->
+  <resource name="skillpotion">
+    <!-- gives user one free learning attempt -->
+    <item weight="0">
+      <function name="use" value="use_skillpotion"/>
+    </item>
+  </resource>
+
+  <resource name="manacrystal">
+    <!-- gives user free aura -->
+    <item weight="0">
+      <function name="use" value="use_manacrystal"/>
+    </item>
+  </resource>
+
+<!-- xmas items -->
+  <resource name="mistletoe">
+    <!-- Sets the chance of escape in a fight to 100 percent -->
+    <item notlost="yes" weight="0">
+      <function name="use" value="usemistletoe"/>
+    </item>
+  </resource>
+
+  <resource name="speedsail">
+    <item weight="0">
+      <function name="use" value="use_speedsail"/>
+    </item>
+  </resource>
+
+<!-- items -->
+  <resource name="cart" big="true">
+    <item capacity="14000" weight="4000" score="60" vehicle="yes">
+      <construction skill="cartmaking" minskill="1" reqsize="1">
+        <requirement type="log" quantity="5"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="antimagic" appearance="amulet">
+    <item weight="0" score="2000">
+      <function name="use" value="use_antimagiccrystal"/>
+    </item>
+  </resource>
+
+  <resource name="wand_of_tears">
+    <item notlost="yes" weight="0">
+      <function name="use" value="use_wand_of_tears"/>
+    </item>
+  </resource>
+
+  <resource name="peasant" pooled="false">
+    <function name="change" value="lua_changeresource"/>
+    <function name="get" value="lua_getresource"/>
+  </resource>
+
+  <resource name="hp" pooled="false">
+    <function name="change" value="lua_changeresource"/>
+    <function name="get" value="lua_getresource"/>
+  </resource>
+
+  <resource name="catapultammo">
+    <item weight="1000">
+      <construction skill="quarrying" minskill="3" reqsize="1">
+        <requirement type="stone" quantity="1"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="toadslime" appearance="vial">
+    <item weight="100" score="0"/>
+  </resource>
+
+</resources>

src/res/common/luxuries.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<resources>
+  <!-- this file contains luxury items that are part of the trade system -->
+  <resource name="balm">
+    <item weight="200"><luxury price="4"/></item>
+  </resource>
+  <resource name="spice">
+    <item weight="200"><luxury price="5"/></item>
+  </resource>
+  <resource name="jewel">
+    <item weight="100"><luxury price="7"/></item>
+  </resource>
+  <resource name="myrrh">
+    <item weight="200"><luxury price="5"/></item>
+  </resource>
+  <resource name="oil">
+    <item weight="300"><luxury price="3"/></item>
+  </resource>
+  <resource name="silk">
+    <item weight="300"><luxury price="6"/></item>
+  </resource>
+  <resource name="incense">
+    <item weight="200"><luxury price="4"/></item>
+  </resource>
+
+</resources>

src/res/common/potions.xml

@@ -0,0 +1,282 @@
+<?xml version="1.0"?>
+<resources>
+  <!-- this file contains potions and herbs that are part of the alchemy system -->
+
+  <!-- 21 stupidly named herbs -->
+  <resource name="h0" appearance="herbbag"><!-- Flachwurz -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h1" appearance="herbbag"><!-- Würziger Wagemut -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h2" appearance="herbbag"><!-- Eulenauge -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h3" appearance="herbbag"><!-- Grüner Spinnerich -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h4" appearance="herbbag"><!-- Blauer Baumringel -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h5" appearance="herbbag"><!-- Elfenlieb -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h6" appearance="herbbag"><!-- Gurgelkraut -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h7" appearance="herbbag"><!-- Knotiger Saugwurz -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h8" appearance="herbbag"><!-- Blasenmorchel -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h9" appearance="herbbag"><!-- Wasserfinder -->
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h10" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h11" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h12" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h13" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h14" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h15" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h16" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h17" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h18" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h19" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <resource name="h20" appearance="herbbag">
+    <item weight="0" score="10" herb="yes"/>
+  </resource>
+
+  <!-- potions -->
+  <resource name="p0" appearance="vial">
+    <item weight="0" score="30">
+      <function name="use" value="usepotion"/>
+      <potion level="1"/>
+      <construction skill="alchemy" minskill="2" reqsize="1">
+        <requirement type="h4"/>
+        <requirement type="h12"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="goliathwater" appearance="vial">
+    <item weight="0" score="30">
+      <function name="use" value="usepotion"/>
+      <potion level="1"/>
+      <construction skill="alchemy" minskill="2" reqsize="1">
+        <requirement type="h6"/>
+        <requirement type="h13"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="truthpotion" appearance="vial">
+    <item weight="0" score="30">
+      <function name="use" value="usepotion"/>
+      <potion level="1"/>
+      <construction skill="alchemy" minskill="2" reqsize="1">
+        <requirement type="h0"/>
+        <requirement type="h13"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p2" appearance="vial">
+    <item weight="0" score="30">
+      <function name="use" value="usepotion"/>
+      <potion level="1"/>
+      <construction skill="alchemy" minskill="2" reqsize="1">
+        <requirement type="h5"/>
+        <requirement type="h7"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p3" appearance="vial">
+    <item weight="0" score="60">
+      <function name="use" value="usepotion"/>
+      <potion level="2"/>
+      <construction skill="alchemy" minskill="4" reqsize="1">
+        <requirement type="h14"/>
+        <requirement type="h16"/>
+        <requirement type="h1"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p4" appearance="vial">
+    <!-- Heilwasser -->
+    <item weight="0" score="60">
+      <function name="use" value="usehealingpotion"/>
+      <potion level="2"/>
+      <construction skill="alchemy" minskill="4" reqsize="1">
+        <requirement type="h19"/>
+        <requirement type="h4"/>
+        <requirement type="h1"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="peasantblood" appearance="vial">
+    <!-- Bauernblut -->
+    <item weight="0" score="60">
+      <function name="use" value="usebloodpotion"/>
+      <potion level="2"/>
+      <construction skill="alchemy" minskill="4" reqsize="1">
+        <requirement type="h17"/>
+        <requirement type="h13"/>
+        <requirement type="h4"/>
+        <requirement type="peasant"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p6" appearance="vial">
+    <item weight="0" score="90">
+      <function name="use" value="usepotion"/>
+      <potion level="3"/>
+      <construction skill="alchemy" minskill="6" reqsize="1">
+        <requirement type="h9"/>
+        <requirement type="h15"/>
+        <requirement type="h12"/>
+        <requirement type="h6"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p7" appearance="vial">
+    <item weight="0" score="90">
+      <function name="useonother" value="usefoolpotion"/>
+      <potion level="3"/>
+      <construction skill="alchemy" minskill="6" reqsize="1">
+        <requirement type="h2"/>
+        <requirement type="h3"/>
+        <requirement type="h17"/>
+        <requirement type="h13"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="nestwarmth" appearance="vial">
+    <item weight="0" score="90">
+      <function name="use" value="usewarmthpotion"/>
+      <potion level="3"/>
+      <construction skill="alchemy" minskill="6" reqsize="1">
+        <requirement type="h18"/>
+        <requirement type="h3"/>
+        <requirement type="h16"/>
+        <requirement type="h10"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p9" appearance="vial">
+    <item weight="0" score="90">
+      <function name="use" value="usepotion"/>
+      <potion level="3"/>
+      <construction skill="alchemy" minskill="6" reqsize="1">
+        <requirement type="h4"/>
+        <requirement type="h11"/>
+        <requirement type="h10"/>
+        <requirement type="h7"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p10" appearance="vial">
+    <item weight="0" score="90">
+      <function name="use" value="usepotion"/>
+      <potion level="3"/>
+      <construction skill="alchemy" minskill="6" reqsize="1">
+        <requirement type="h19"/>
+        <requirement type="h14"/>
+        <requirement type="h0"/>
+        <requirement type="h11"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p11" appearance="vial">
+    <item weight="0" score="120">
+      <function name="use" value="usepotion"/>
+      <potion level="4"/>
+      <construction skill="alchemy" minskill="8" reqsize="1">
+        <requirement type="h14"/>
+        <requirement type="h20"/>
+        <requirement type="h15"/>
+        <requirement type="h8"/>
+        <requirement type="h5"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p13" appearance="vial">
+    <item weight="0" score="120">
+      <function name="use" value="usepotion"/>
+      <potion level="4"/>
+      <construction skill="alchemy" minskill="8" reqsize="1">
+        <requirement type="h5"/>
+        <requirement type="h9"/>
+        <requirement type="h12"/>
+        <requirement type="h3"/>
+        <requirement type="h8"/>
+        <requirement type="dragonblood"/>
+      </construction>
+    </item>
+  </resource>
+
+  <resource name="p14" appearance="vial">
+    <item weight="0" score="120">
+      <function name="use" value="usepotion"/>
+      <potion level="4"/>
+      <construction skill="alchemy" minskill="8" reqsize="1">
+        <requirement type="h6"/>
+        <requirement type="h12"/>
+        <requirement type="h18"/>
+        <requirement type="h5"/>
+        <requirement type="h16"/>
+      </construction>
+    </item>
+  </resource>
+
+</resources>

src/res/common/resources.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<resources>
+  <!-- this file contains resources that can be mined in some way (anything with a resourcelimit) -->
+  <resource name="iron" limited="yes" material="rm_iron">
+    <item weight="500" score="10">
+      <construction skill="mining" minskill="1" reqsize="1"/>
+    </item>
+    <resourcelimit>
+      <modifier building="mine" type="skill" value="1"/>
+      <modifier building="mine" type="material" value="0.5"/>
+      <modifier race="dwarf" type="material" value="0.75"/>
+      <guard flag="mining"/>
+    </resourcelimit>
+  </resource>
+
+  <resource name="laen" limited="yes" material="rm_laen">
+    <item weight="200" score="100">
+      <construction skill="mining" minskill="7" reqsize="1"/>
+    </item>
+    <resourcelimit>
+      <modifier type="require" building="mine"/>
+      <guard flag="mining"/>
+    </resourcelimit>
+  </resource>
+
+  <resource name="stone" limited="yes" material="rm_stone">
+    <item weight="6000" score="10" big="yes">
+      <construction skill="quarrying" minskill="1" reqsize="1"/>
+    </item>
+    <resourcelimit>
+      <modifier building="quarry" type="skill" value="1"/>
+      <modifier building="quarry" type="material" value="0.5"/>
+      <modifier race="troll" type="material" value="0.75"/>
+    </resourcelimit>
+  </resource>
+
+  <resource name="horse" limited="yes" material="rm_horse">
+    <item big="yes" weight="5000" score="10" capacity="7000" animal="yes">
+      <construction skill="training" minskill="1" reqsize="1"/>
+      <function name="give" value="givehorses"/>
+    </item>
+    <resourcelimit>
+      <function name="produce" value="lua_produceresource"/>
+      <function name="limit" value="lua_limitresource"/>
+    </resourcelimit>
+  </resource>
+
+  <resource name="log" material="rm_tree">
+    <item weight="500" score="10">
+      <construction skill="forestry" minskill="1" reqsize="1"/>
+    </item>
+    <resourcelimit>
+      <modifier building="sawmill" type="skill" value="1"/>
+      <modifier building="sawmill" type="material" value="0.5"/>
+      <guard flag="logging"/>
+      <function name="produce" value="lua_produceresource"/>
+      <function name="limit" value="lua_limitresource"/>
+    </resourcelimit>
+  </resource>
+
+  <resource name="mallorn" material="rm_mallorn">
+    <item weight="500" score="30">
+      <construction skill="forestry" minskill="2" reqsize="1"/>
+    </item>
+    <resourcelimit>
+      <modifier building="sawmill" type="skill" value="1"/>
+      <modifier building="sawmill" type="material" value="0.5"/>
+      <guard flag="logging"/>
+      <function name="produce" value="lua_produceresource"/>
+      <function name="limit" value="lua_limitresource"/>
+    </resourcelimit>
+  </resource>
+
+</resources>

src/res/common/weapons.xml

@@ -0,0 +1,276 @@
+<?xml version="1.0"?>
+<resources>
+  <!-- this file contains a lot of weapons -->
+  <resource name="mallornbow">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="5" reqsize="1">
+        <requirement type="mallorn" quantity="1"/>
+      </construction>
+      <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.15">
+        <damage type="rider" value="1d11+2"/>
+        <damage type="footman" value="1d11+2"/>
+        <modifier type="missile_target" value="2"/>
+        <modifier type="damage" value="1">
+          <race name="elf"/>
+        </modifier>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="laensword">
+    <item weight="100" score="400">
+      <construction skill="weaponsmithing" minskill="8" reqsize="1">
+        <requirement type="laen" quantity="1"/>
+      </construction>
+      <weapon cut="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>
+
+  <resource name="rustygreatsword">
+    <item weight="200" score="20">
+      <construction skill="weaponsmithing" minskill="4" reqsize="1">
+        <requirement type="iron" quantity="2"/>
+      </construction>
+      <weapon cut="true" skill="melee" offmod="-2" defmod="-3">
+        <damage type="rider" value="2d8"/>
+        <damage type="footman" value="2d8"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="runesword">
+    <item weight="100" score="2000">
+      <weapon minskill="7" cut="true" magical="yes" skill="melee" offmod="2" defmod="2">
+        <function name="attack" value="attack_firesword"/>
+        <damage type="rider" value="3d10+10"/>
+        <damage type="footman" value="3d10+10"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="firesword">
+    <item weight="100">
+      <weapon minskill="7" magres="0.3" cut="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>
+
+  <resource name="greatsword">
+    <item weight="200" score="30">
+      <construction skill="weaponsmithing" minskill="4" reqsize="1">
+        <requirement type="iron" quantity="2"/>
+      </construction>
+      <weapon cut="true" skill="melee" offmod="-1" defmod="-2">
+        <damage type="rider" value="2d8+3"/>
+        <damage type="footman" value="2d8+3"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="sword">
+    <item weight="100" score="30">
+      <construction skill="weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <weapon cut="true" skill="melee">
+        <damage type="rider" value="1d9+2"/>
+        <damage type="footman" value="1d9+2"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="greatbow">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="5" reqsize="1">
+        <modifier function="mod_elves_only"/>
+        <requirement type="mallorn" quantity="2"/>
+      </construction>
+      <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
+        <damage type="rider" value="2d6+4"/>
+        <damage type="footman" value="2d6+4"/>
+        <modifier type="missile_target" value="2"/>
+        <modifier type="damage" value="1">
+          <race name="elf"/>
+        </modifier>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="halberd">
+    <item weight="200">
+      <construction skill="weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="log" quantity="2"/>
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <weapon cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0">
+        <damage type="rider" value="2d6+3"/>
+        <damage type="footman" value="2d6+3"/>
+        <modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="rustyhalberd">
+    <item weight="200" score="20">
+      <construction skill="weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="iron" quantity="1"/>
+        <requirement type="log" quantity="1"/>
+      </construction>
+      <weapon cut="true" skill="polearm" offmod="-2" defmod="-1">
+        <damage type="rider" value="2d6"/>
+        <damage type="footman" value="2d6"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="rustysword">
+    <item weight="100" score="10">
+      <construction skill="weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <weapon cut="true" skill="melee" offmod="-1" defmod="-1">
+        <damage type="rider" value="1d9"/>
+        <damage type="footman" value="1d9"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="axe">
+    <item weight="200">
+      <construction skill="weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="log" quantity="1"/>
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <weapon cut="true" skill="melee" offmod="1" defmod="-2">
+        <damage type="rider" value="2d6+4"/>
+        <damage type="footman" value="2d6+4"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="rustyaxe">
+    <item weight="200">
+      <construction skill="weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="log" quantity="1"/>
+        <requirement type="iron" quantity="1"/>
+      </construction>
+      <weapon cut="true" skill="melee" offmod="0" defmod="-3">
+        <damage type="rider" value="2d6"/>
+        <damage type="footman" value="2d6"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="bow">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="2" reqsize="1">
+        <requirement type="log" quantity="1"/>
+      </construction>
+      <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0">
+        <damage type="rider" value="1d11+1"/>
+        <damage type="footman" value="1d11+1"/>
+        <modifier type="missile_target" value="2"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="catapult">
+    <item weight="10000">
+      <construction skill="cartmaking" minskill="5" reqsize="1">
+        <requirement type="log" quantity="10"/>
+      </construction>
+      <weapon siege="true" bash="true" missile="true" skill="catapult" offmod="0" defmod="0" reload="5">
+        <damage type="rider" value="3d10+5"/>
+        <damage type="footman" value="3d10+5"/>
+        <modifier type="missile_target" value="4"/>
+        <function name="attack" value="attack_catapult"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="crossbow">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="3" reqsize="1">
+        <requirement type="log" quantity="1"/>
+      </construction>
+      <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
+        <damage type="rider" value="3d3+5"/>
+        <damage type="footman" value="3d3+5"/>
+        <modifier type="missile_target" value="2"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="mallorncrossbow">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="5" reqsize="1">
+        <requirement type="mallorn" quantity="1"/>
+      </construction>
+      <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
+        <damage type="rider" value="3d3+5"/>
+        <damage type="footman" value="3d3+5"/>
+        <modifier type="missile_target" value="2"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="spear">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="2" reqsize="1">
+        <requirement type="log" quantity="1"/>
+      </construction>
+      <weapon pierce="true" skill="polearm" offmod="0" defmod="0">
+        <damage type="footman" value="1d10"/>
+        <damage type="rider" value="1d12+2"/>
+        <modifier type="skill" value="1" riding="true" against_riding="true" against_walking="true" offensive="true"/>
+        <modifier type="skill" value="1" walking="true" against_riding="true" against_walking="true" defensive="true"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="mallornspear">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="5" reqsize="1">
+        <requirement type="mallorn" quantity="1"/>
+      </construction>
+      <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
+        <damage type="footman" value="1d10+1"/>
+        <damage type="rider" value="1d12+3"/>
+        <modifier type="skill" value="1" riding="true" against_riding="true" against_walking="true" offensive="true"/>
+        <modifier type="skill" value="1" walking="true" against_riding="true" against_walking="true" defensive="true"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="lance">
+    <item weight="200">
+      <construction skill="weaponsmithing" minskill="2" reqsize="1">
+        <requirement type="log" quantity="2"/>
+      </construction>
+      <weapon pierce="true" skill="polearm" offmod="0" defmod="-2">
+        <damage type="footman" value="1d5"/>
+        <damage type="rider" value="2d6+5"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="mallornlance">
+    <item weight="100">
+      <construction skill="weaponsmithing" minskill="5" reqsize="1">
+        <requirement type="mallorn" quantity="2"/>
+      </construction>
+      <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
+        <damage type="footman" value="1d5+1"/>
+        <damage type="rider" value="2d6+6"/>
+      </weapon>
+    </item>
+  </resource>
+
+
+</resources>

src/res/conquest.xml

@@ -1,14 +1,20 @@
 <eressea>
-	<include href="messages.xml"></include>
+	<include href="messages.xml" />
 
 	<comment>Localization</comment>
-	<include href="de/strings.xml"></include>
+	<include href="de/strings.xml" />
-	<include href="en/strings.xml"></include>
+	<include href="en/strings.xml" />
 
-	<include href="races.xml"></include>
+	<include href="races.xml" />
-	<include href="resources.xml"></include>
+	<include href="ships.xml" />
-	<include href="ships.xml"></include>
+	<include href="buildings.xml" />
-	<include href="buildings.xml"></include>
+
+	<include href="common/items.xml" />
+	<include href="common/armor.xml" />
+	<include href="common/weapons.xml" />
+	<include href="common/resources.xml" />
+	<include href="common/luxuries.xml" />
+	<include href="common/potions.xml" />
 
 	<game name="Kreis der Macht" units="250" welcome="vinyambar">
 		<comment>Game specific</comment>
@@ -16,6 +22,6 @@
 		<order name="MEINUNG" disable></order>
 		<order name="MAGIEGEBIET" disable></order>
 	</game>
-	<include href="vinyambar/de/strings.xml"></include>
+	<include href="vinyambar/de/strings.xml" />
-	<include href="vinyambar/conquest.xml"></include>
+	<include href="vinyambar/conquest.xml" />
 </eressea>

src/res/de/strings.xml

@@ -70,7 +70,7 @@
       <text locale="de">Beim Barte des Proheten! Ach nein, Zwergen. Irgendetwas riecht hier ranzig.</text>
       <text locale="en">Sniff... Bleah. Don't they ever wash these?</text>
     </string>
-    <string name="aoh">
+    <string name="ao_healing">
       <text locale="de">Diese Amulett ist ein hervorragender Fokus für alle Heilzauber. Ein
         mit diesem Fokus gewirkter Heilzauber wird mit größerer
         Warscheinlichkeit Erfolgreich sein und doppelt so viele Leute heilen
@@ -1342,10 +1342,10 @@
   <string name="ao_chastity_p">
     <text locale="de">Amulette der Keuschheit</text>
   </string>
-  <string name="aoh">
+  <string name="ao_healing">
     <text locale="de">Amulett der Heilung</text>
   </string>
-  <string name="aoh_p">
+  <string name="ao_healing_p">
     <text locale="de">Amulette der Heilung</text>
   </string>
   <string name="aog">

src/res/en/strings.xml

@@ -459,10 +459,10 @@
   <string name="aog_p">
     <text locale="en">amulets of gathering</text>
   </string>
-  <string name="aoh">
+  <string name="ao_healing">
     <text locale="en">amulet of healing</text>
   </string>
-  <string name="aoh_p">
+  <string name="ao_healing_p">
     <text locale="en">amulets of healing</text>
   </string>
   <string name="aots">

src/res/eressea.xml

@@ -6,7 +6,12 @@
   <xi:include href="de/strings.xml"/>
   <xi:include href="en/strings.xml"/>
 
-  <xi:include href="resources.xml"/>
+	<xi:include href="common/items.xml" />
+	<xi:include href="common/armor.xml" />
+	<xi:include href="common/weapons.xml" />
+	<xi:include href="common/resources.xml" />
+	<xi:include href="common/luxuries.xml" />
+	<xi:include href="common/potions.xml" />
   <xi:include href="spoils.xml"/>
   <xi:include href="races.xml"/>
   <xi:include href="prefixes.xml"/>

src/res/fr/strings.xml

@@ -476,10 +476,10 @@
   <string name="aog_p">
     <text locale="fr">amulettes de rassemblement</text>
   </string>
-  <string name="aoh">
+  <string name="ao_healing">
     <text locale="fr">amulette de soin</text>
   </string>
-  <string name="aoh_p">
+  <string name="ao_healing_p">
     <text locale="fr">amulettes de soin</text>
   </string>
   <string name="aots">

src/res/hse-05-01.xml

@@ -6,7 +6,12 @@
   <xi:include href="de/strings.xml"/>
   <xi:include href="en/strings.xml"/>
 
-  <xi:include href="resources.xml"/>
+	<xi:include href="common/items.xml" />
+	<xi:include href="common/armor.xml" />
+	<xi:include href="common/weapons.xml" />
+	<xi:include href="common/resources.xml" />
+	<xi:include href="common/luxuries.xml" />
+	<xi:include href="common/potions.xml" />
   <xi:include href="spoils.xml"/>
   <xi:include href="races.xml"/>
   <xi:include href="prefixes.xml"/>

src/res/hse4.xml

@@ -6,7 +6,12 @@
   <xi:include href="de/strings.xml"/>
   <xi:include href="en/strings.xml"/>
 
-  <xi:include href="resources.xml"/>
+	<xi:include href="common/items.xml" />
+	<xi:include href="common/armor.xml" />
+	<xi:include href="common/weapons.xml" />
+	<xi:include href="common/resources.xml" />
+	<xi:include href="common/luxuries.xml" />
+	<xi:include href="common/potions.xml" />
   <xi:include href="spoils.xml"/>
   <xi:include href="races.xml"/>
   <xi:include href="prefixes.xml"/>

src/res/kingdoms.xml

@@ -6,7 +6,12 @@
   <xi:include href="de/strings.xml"/>
   <xi:include href="en/strings.xml"/>
 
-  <xi:include href="kingdoms/resources.xml"/>
+	<xi:include href="common/items.xml" />
+	<xi:include href="common/armor.xml" />
+	<xi:include href="common/weapons.xml" />
+	<xi:include href="common/resources.xml" />
+	<xi:include href="common/luxuries.xml" />
+	<xi:include href="common/potions.xml" />
   <xi:include href="kingdoms/races.xml"/>
   <xi:include href="prefixes.xml"/>
   <xi:include href="calendar.xml"/>

src/res/resources.xml

@@ -1,882 +0,0 @@
-<?xml version="1.0"?>
-<resources>
-
-  <resource name="aoh" appearance="amulet">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="aots" appearance="amulet">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="roi" appearance="">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="rop" appearance="">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="roqf" appearance="">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="trollbelt">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="presspass" cursed="yes">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="aurafocus">
-    <item weight="100" score="6000"/>
-  </resource>
-
-  <resource name="sphereofinv" appearance="">
-    <item weight="100" score="6000"/>
-  </resource>
-
-  <resource name="magicbag">
-    <item big="yes" notlost="yes" weight="100" score="6000"/>
-  </resource>
-
-  <resource name="magicherbbag" appearance="">
-    <item weight="100" score="6000"/>
-  </resource>
-
-  <resource name="ao_chastity" appearance="amulet">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="fairyboot">
-    <item weight="0" score="6000"/>
-  </resource>
-
-  <resource name="aoc" appearance="amulet">
-    <item weight="100">
-      <function name="use" value="use_birthdayamulet"/>
-    </item>
-  </resource>
-
-  <resource name="dreameye">
-    <item weight="100">
-      <function name="use" value="use_tacticcrystal"/>
-    </item>
-  </resource>
-
-  <resource name="pegasus">
-    <item weight="5000" notlost="yes" big="yes" score="6000" capacity="7000" animal="yes"/>
-  </resource>
-
-  <resource name="elvenhorse">
-    <item weight="5000" notlost="yes" big="yes" score="6000" capacity="7000" animal="yes">
-      <function name="give" value="givehorses"/>
-    </item>
-  </resource>
-
-  <resource name="dolphin">
-    <item weight="5000" notlost="yes" big="yes" score="6000" capacity="7000" animal="yes"/>
-  </resource>
-
-  <resource name="iron" limited="yes" material="rm_iron">
-    <item weight="500" score="10">
-      <construction skill="mining" minskill="1" reqsize="1"/>
-    </item>
-    <resourcelimit>
-      <modifier building="mine" type="skill" value="1"/>
-      <modifier building="mine" type="material" value="0.5"/>
-      <modifier race="dwarf" type="material" value="0.75"/>
-      <guard flag="mining"/>
-    </resourcelimit>
-  </resource>
-
-  <resource name="laen" limited="yes" material="rm_laen">
-    <item weight="200" score="100">
-      <construction skill="mining" minskill="7" reqsize="1"/>
-    </item>
-    <resourcelimit>
-      <modifier type="require" building="mine"/>
-      <guard flag="mining"/>
-    </resourcelimit>
-  </resource>
-
-  <resource name="stone" limited="yes" material="rm_stone">
-    <item weight="6000" score="10" big="yes">
-      <construction skill="quarrying" minskill="1" reqsize="1"/>
-    </item>
-    <resourcelimit>
-      <modifier building="quarry" type="skill" value="1"/>
-      <modifier building="quarry" type="material" value="0.5"/>
-      <modifier race="troll" type="material" value="0.75"/>
-    </resourcelimit>
-  </resource>
-
-  <resource name="horse" limited="yes">
-    <item big="yes" weight="5000" score="10" capacity="7000" animal="yes">
-      <construction skill="training" minskill="1" reqsize="1"/>
-      <function name="give" value="givehorses"/>
-    </item>
-    <resourcelimit>
-      <function name="produce" value="lua_produceresource"/>
-      <function name="limit" value="lua_limitresource"/>
-    </resourcelimit>
-  </resource>
-
-  <resource name="seaserpenthead">
-    <item weight="500" score="400"/>
-  </resource>
-
-  <resource name="dragonblood">
-    <item weight="100" score="100"/>
-  </resource>
-
-  <resource name="dragonhead">
-    <item weight="500" score="300"/>
-  </resource>
-
-  <resource name="seed" limited="yes">
-    <item weight="10" score="50">
-      <construction skill="herbalism" minskill="3" reqsize="1"/>
-    </item>
-  </resource>
-
-  <resource name="mallornseed" limited="yes">
-    <item weight="10" score="100">
-      <construction skill="herbalism" minskill="4" reqsize="1"/>
-    </item>
-  </resource>
-
-  <resource name="log">
-    <item weight="500" score="10">
-      <construction skill="forestry" minskill="1" reqsize="1"/>
-    </item>
-    <resourcelimit>
-      <modifier building="sawmill" type="skill" value="1"/>
-      <modifier building="sawmill" type="material" value="0.5"/>
-      <guard flag="logging"/>
-      <function name="produce" value="lua_produceresource"/>
-      <function name="limit" value="lua_limitresource"/>
-    </resourcelimit>
-  </resource>
-
-  <resource name="mallorn">
-    <item weight="500" score="30">
-      <construction skill="forestry" minskill="2" reqsize="1"/>
-    </item>
-    <resourcelimit>
-      <modifier building="sawmill" type="skill" value="1"/>
-      <modifier building="sawmill" type="material" value="0.5"/>
-      <guard flag="logging"/>
-      <function name="produce" value="lua_produceresource"/>
-      <function name="limit" value="lua_limitresource"/>
-    </resourcelimit>
-  </resource>
-
-<!-- luxury items -->
-  <resource name="balm">
-    <item weight="200"><luxury price="4"/></item>
-  </resource>
-  <resource name="spice">
-    <item weight="200"><luxury price="5"/></item>
-  </resource>
-  <resource name="jewel">
-    <item weight="100"><luxury price="7"/></item>
-  </resource>
-  <resource name="myrrh">
-    <item weight="200"><luxury price="5"/></item>
-  </resource>
-  <resource name="oil">
-    <item weight="300"><luxury price="3"/></item>
-  </resource>
-  <resource name="silk">
-    <item weight="300"><luxury price="6"/></item>
-  </resource>
-  <resource name="incense">
-    <item weight="200"><luxury price="4"/></item>
-  </resource>
-
-<!-- XE items -->
-  <resource name="skillpotion">
-    <!-- gives user one free learning attempt -->
-    <item weight="0">
-      <function name="use" value="use_skillpotion"/>
-    </item>
-  </resource>
-
-  <resource name="manacrystal">
-    <!-- gives user free aura -->
-    <item weight="0">
-      <function name="use" value="use_manacrystal"/>
-    </item>
-  </resource>
-
-<!-- xmas items -->
-  <resource name="mistletoe">
-    <!-- Sets the chance of escape in a fight to 100 percent -->
-    <item notlost="yes" weight="0">
-      <function name="use" value="usemistletoe"/>
-    </item>
-  </resource>
-
-  <resource name="speedsail">
-    <item weight="0">
-      <function name="use" value="use_speedsail"/>
-    </item>
-  </resource>
-
-<!-- items -->
-  <resource name="cart" big="true">
-    <item capacity="14000" weight="4000" score="60" vehicle="yes">
-      <construction skill="cartmaking" minskill="1" reqsize="1">
-        <requirement type="log" quantity="5"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="antimagic" appearance="amulet">
-    <item weight="0" score="2000">
-      <function name="use" value="use_antimagiccrystal"/>
-    </item>
-  </resource>
-
-  <resource name="wand_of_tears">
-    <item notlost="yes" weight="0">
-      <function name="use" value="use_wand_of_tears"/>
-    </item>
-  </resource>
-
-  <resource name="mallornbow">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="5" reqsize="1">
-        <requirement type="mallorn" quantity="1"/>
-      </construction>
-      <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.15">
-        <damage type="rider" value="1d11+2"/>
-        <damage type="footman" value="1d11+2"/>
-        <modifier type="missile_target" value="2"/>
-        <modifier type="damage" value="1">
-          <race name="elf"/>
-        </modifier>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="laensword">
-    <item weight="100" score="400">
-      <construction skill="weaponsmithing" minskill="8" reqsize="1">
-        <requirement type="laen" quantity="1"/>
-      </construction>
-      <weapon cut="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>
-
-  <resource name="rustygreatsword">
-    <item weight="200" score="20">
-      <construction skill="weaponsmithing" minskill="4" reqsize="1">
-        <requirement type="iron" quantity="2"/>
-      </construction>
-      <weapon cut="true" skill="melee" offmod="-2" defmod="-3">
-        <damage type="rider" value="2d8"/>
-        <damage type="footman" value="2d8"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="runesword">
-    <item weight="100" score="2000">
-      <weapon minskill="7" cut="true" magical="yes" skill="melee" offmod="2" defmod="2">
-        <function name="attack" value="attack_firesword"/>
-        <damage type="rider" value="3d10+10"/>
-        <damage type="footman" value="3d10+10"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="firesword">
-    <item weight="100">
-      <weapon minskill="7" magres="0.3" cut="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>
-
-  <resource name="greatsword">
-    <item weight="200" score="30">
-      <construction skill="weaponsmithing" minskill="4" reqsize="1">
-        <requirement type="iron" quantity="2"/>
-      </construction>
-      <weapon cut="true" skill="melee" offmod="-1" defmod="-2">
-        <damage type="rider" value="2d8+3"/>
-        <damage type="footman" value="2d8+3"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="sword">
-    <item weight="100" score="30">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="melee">
-        <damage type="rider" value="1d9+2"/>
-        <damage type="footman" value="1d9+2"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="greatbow">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="5" reqsize="1">
-        <modifier function="mod_elves_only"/>
-        <requirement type="mallorn" quantity="2"/>
-      </construction>
-      <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
-        <damage type="rider" value="2d6+4"/>
-        <damage type="footman" value="2d6+4"/>
-        <modifier type="missile_target" value="2"/>
-        <modifier type="damage" value="1">
-          <race name="elf"/>
-        </modifier>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="halberd">
-    <item weight="200">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="log" quantity="2"/>
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0">
-        <damage type="rider" value="2d6+3"/>
-        <damage type="footman" value="2d6+3"/>
-        <modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="peasant" pooled="false">
-    <function name="change" value="lua_changeresource"/>
-    <function name="get" value="lua_getresource"/>
-  </resource>
-
-  <resource name="hp" pooled="false">
-    <function name="change" value="lua_changeresource"/>
-    <function name="get" value="lua_getresource"/>
-  </resource>
-
-  <resource name="rustyhalberd">
-    <item weight="200" score="20">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="iron" quantity="1"/>
-        <requirement type="log" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="polearm" offmod="-2" defmod="-1">
-        <damage type="rider" value="2d6"/>
-        <damage type="footman" value="2d6"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="rustysword">
-    <item weight="100" score="10">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="melee" offmod="-1" defmod="-1">
-        <damage type="rider" value="1d9"/>
-        <damage type="footman" value="1d9"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="axe">
-    <item weight="200">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="log" quantity="1"/>
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="melee" offmod="1" defmod="-2">
-        <damage type="rider" value="2d6+4"/>
-        <damage type="footman" value="2d6+4"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="rustyaxe">
-    <item weight="200">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="log" quantity="1"/>
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <weapon cut="true" skill="melee" offmod="0" defmod="-3">
-        <damage type="rider" value="2d6"/>
-        <damage type="footman" value="2d6"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="bow">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="2" reqsize="1">
-        <requirement type="log" quantity="1"/>
-      </construction>
-      <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0">
-        <damage type="rider" value="1d11+1"/>
-        <damage type="footman" value="1d11+1"/>
-        <modifier type="missile_target" value="2"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="catapult">
-    <item weight="10000">
-      <construction skill="cartmaking" minskill="5" reqsize="1">
-        <requirement type="log" quantity="10"/>
-      </construction>
-      <weapon siege="true" bash="true" missile="true" skill="catapult" offmod="0" defmod="0" reload="5">
-        <damage type="rider" value="3d10+5"/>
-        <damage type="footman" value="3d10+5"/>
-        <modifier type="missile_target" value="4"/>
-        <function name="attack" value="attack_catapult"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="crossbow">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="3" reqsize="1">
-        <requirement type="log" quantity="1"/>
-      </construction>
-      <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
-        <damage type="rider" value="3d3+5"/>
-        <damage type="footman" value="3d3+5"/>
-        <modifier type="missile_target" value="2"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="mallorncrossbow">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="5" reqsize="1">
-        <requirement type="mallorn" quantity="1"/>
-      </construction>
-      <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
-        <damage type="rider" value="3d3+5"/>
-        <damage type="footman" value="3d3+5"/>
-        <modifier type="missile_target" value="2"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="spear">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="2" reqsize="1">
-        <requirement type="log" quantity="1"/>
-      </construction>
-      <weapon pierce="true" skill="polearm" offmod="0" defmod="0">
-        <damage type="footman" value="1d10"/>
-        <damage type="rider" value="1d12+2"/>
-        <modifier type="skill" value="1" riding="true" against_riding="true" against_walking="true" offensive="true"/>
-        <modifier type="skill" value="1" walking="true" against_riding="true" against_walking="true" defensive="true"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="mallornspear">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="5" reqsize="1">
-        <requirement type="mallorn" quantity="1"/>
-      </construction>
-      <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
-        <damage type="footman" value="1d10+1"/>
-        <damage type="rider" value="1d12+3"/>
-        <modifier type="skill" value="1" riding="true" against_riding="true" against_walking="true" offensive="true"/>
-        <modifier type="skill" value="1" walking="true" against_riding="true" against_walking="true" defensive="true"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="lance">
-    <item weight="200">
-      <construction skill="weaponsmithing" minskill="2" reqsize="1">
-        <requirement type="log" quantity="2"/>
-      </construction>
-      <weapon pierce="true" skill="polearm" offmod="0" defmod="-2">
-        <damage type="footman" value="1d5"/>
-        <damage type="rider" value="2d6+5"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="mallornlance">
-    <item weight="100">
-      <construction skill="weaponsmithing" minskill="5" reqsize="1">
-        <requirement type="mallorn" quantity="2"/>
-      </construction>
-      <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
-        <damage type="footman" value="1d5+1"/>
-        <damage type="rider" value="2d6+6"/>
-      </weapon>
-    </item>
-  </resource>
-
-  <resource name="catapultammo">
-    <item weight="1000">
-      <construction skill="quarrying" minskill="3" reqsize="1">
-        <requirement type="stone" quantity="1"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="laenshield">
-    <item weight="0" score="1000">
-      <construction skill="armorer" minskill="7" reqsize="1">
-        <requirement type="laen" quantity="1"/>
-      </construction>
-      <armor ac="2" penalty="-0.25" magres="0.3" laen="yes" shield="yes" />
-    </item>
-  </resource>
-
-  <resource name="laenmail">
-    <item weight="100" score="1000">
-      <construction skill="armorer" minskill="9" reqsize="1">
-        <requirement type="laen" quantity="3"/>
-      </construction>
-      <armor ac="6" penalty="0.0" magres="0.3" laen="yes" />
-    </item>
-  </resource>
-
-  <resource name="rustyshield">
-    <item weight="100" score="10">
-      <construction skill="armorer" minskill="2" reqsize="1">
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <armor ac="1" penalty="0.0" magres="0.0" shield="yes"/>
-    </item>
-  </resource>
-
-  <resource name="rustychainmail">
-    <item weight="200" score="30">
-      <construction skill="armorer" minskill="3" reqsize="1">
-        <requirement type="iron" quantity="3"/>
-      </construction>
-      <armor ac="2" penalty="0.30" magres="0.0"/>
-    </item>
-  </resource>
-
-  <resource name="shield">
-    <item weight="100" score="30">
-      <construction skill="armorer" minskill="2" reqsize="1">
-        <requirement type="iron" quantity="1"/>
-      </construction>
-      <armor ac="1" penalty="-0.15" magres="0.0" shield="yes"/>
-    </item>
-  </resource>
-
-  <resource name="chainmail">
-    <item weight="200" score="90">
-      <construction skill="armorer" minskill="3" reqsize="1">
-        <requirement type="iron" quantity="3"/>
-      </construction>
-      <armor ac="3" penalty="0.15" magres="0.0"/>
-    </item>
-  </resource>
-
-  <resource name="plate">
-    <item weight="400" score="150">
-      <construction skill="armorer" minskill="4" reqsize="1">
-        <requirement type="iron" quantity="5"/>
-      </construction>
-      <armor ac="5" penalty="0.30" magres="0.0"/>
-    </item>
-  </resource>
-
-  <!-- 21 stupid herbs -->
-  <resource name="h0" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h1" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h2" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h3" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h4" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h5" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h6" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h7" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h8" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h9" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h10" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h11" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h12" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h13" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h14" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h15" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h16" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h17" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h18" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h19" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <resource name="h20" appearance="herbbag">
-    <item weight="0" score="10" herb="yes"/>
-  </resource>
-
-  <!-- potions -->
-  <resource name="p0" appearance="vial">
-    <item weight="0" score="30">
-      <function name="use" value="usepotion"/>
-      <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
-        <requirement type="h4"/>
-        <requirement type="h12"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="goliathwater" appearance="vial">
-    <item weight="0" score="30">
-      <function name="use" value="usepotion"/>
-      <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
-        <requirement type="h6"/>
-        <requirement type="h13"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="truthpotion" appearance="vial">
-    <item weight="0" score="30">
-      <function name="use" value="usepotion"/>
-      <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
-        <requirement type="h0"/>
-        <requirement type="h13"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p2" appearance="vial">
-    <item weight="0" score="30">
-      <function name="use" value="usepotion"/>
-      <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
-        <requirement type="h5"/>
-        <requirement type="h7"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p3" appearance="vial">
-    <item weight="0" score="60">
-      <function name="use" value="usepotion"/>
-      <potion level="2"/>
-      <construction skill="alchemy" minskill="4" reqsize="1">
-        <requirement type="h14"/>
-        <requirement type="h16"/>
-        <requirement type="h1"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p4" appearance="vial">
-    <!-- Heilwasser -->
-    <item weight="0" score="60">
-      <function name="use" value="usehealingpotion"/>
-      <potion level="2"/>
-      <construction skill="alchemy" minskill="4" reqsize="1">
-        <requirement type="h19"/>
-        <requirement type="h4"/>
-        <requirement type="h1"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="peasantblood" appearance="vial">
-    <!-- Bauernblut -->
-    <item weight="0" score="60">
-      <function name="use" value="usebloodpotion"/>
-      <potion level="2"/>
-      <construction skill="alchemy" minskill="4" reqsize="1">
-        <requirement type="h17"/>
-        <requirement type="h13"/>
-        <requirement type="h4"/>
-        <requirement type="peasant"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p6" appearance="vial">
-    <item weight="0" score="90">
-      <function name="use" value="usepotion"/>
-      <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
-        <requirement type="h9"/>
-        <requirement type="h15"/>
-        <requirement type="h12"/>
-        <requirement type="h6"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p7" appearance="vial">
-    <item weight="0" score="90">
-      <function name="useonother" value="usefoolpotion"/>
-      <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
-        <requirement type="h2"/>
-        <requirement type="h3"/>
-        <requirement type="h17"/>
-        <requirement type="h13"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="nestwarmth" appearance="vial">
-    <item weight="0" score="90">
-      <function name="use" value="usewarmthpotion"/>
-      <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
-        <requirement type="h18"/>
-        <requirement type="h3"/>
-        <requirement type="h16"/>
-        <requirement type="h10"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p9" appearance="vial">
-    <item weight="0" score="90">
-      <function name="use" value="usepotion"/>
-      <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
-        <requirement type="h4"/>
-        <requirement type="h11"/>
-        <requirement type="h10"/>
-        <requirement type="h7"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p10" appearance="vial">
-    <item weight="0" score="90">
-      <function name="use" value="usepotion"/>
-      <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
-        <requirement type="h19"/>
-        <requirement type="h14"/>
-        <requirement type="h0"/>
-        <requirement type="h11"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p11" appearance="vial">
-    <item weight="0" score="120">
-      <function name="use" value="usepotion"/>
-      <potion level="4"/>
-      <construction skill="alchemy" minskill="8" reqsize="1">
-        <requirement type="h14"/>
-        <requirement type="h20"/>
-        <requirement type="h15"/>
-        <requirement type="h8"/>
-        <requirement type="h5"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p13" appearance="vial">
-    <item weight="0" score="120">
-      <function name="use" value="usepotion"/>
-      <potion level="4"/>
-      <construction skill="alchemy" minskill="8" reqsize="1">
-        <requirement type="h5"/>
-        <requirement type="h9"/>
-        <requirement type="h12"/>
-        <requirement type="h3"/>
-        <requirement type="h8"/>
-        <requirement type="dragonblood"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="p14" appearance="vial">
-    <item weight="0" score="120">
-      <function name="use" value="usepotion"/>
-      <potion level="4"/>
-      <construction skill="alchemy" minskill="8" reqsize="1">
-        <requirement type="h6"/>
-        <requirement type="h12"/>
-        <requirement type="h18"/>
-        <requirement type="h5"/>
-        <requirement type="h16"/>
-      </construction>
-    </item>
-  </resource>
-
-  <resource name="toadslime" appearance="vial">
-    <item weight="100" score="0"/>
-  </resource>
-
-</resources>

src/res/rts.xml

@@ -6,7 +6,12 @@
   <xi:include href="de/strings.xml"/>
   <xi:include href="en/strings.xml"/>
 
-  <xi:include href="resources.xml"/>
+	<xi:include href="common/items.xml" />
+	<xi:include href="common/armor.xml" />
+	<xi:include href="common/weapons.xml" />
+	<xi:include href="common/resources.xml" />
+	<xi:include href="common/luxuries.xml" />
+	<xi:include href="common/potions.xml" />
   <xi:include href="spoils.xml"/>
   <xi:include href="races.xml"/>
   <xi:include href="prefixes.xml"/>

src/res/tutorial.xml

@@ -7,7 +7,12 @@
   <xi:include href="en/strings.xml"/>
   <xi:include href="fr/strings.xml"/>
 
-  <xi:include href="resources.xml"/>
+	<xi:include href="common/items.xml" />
+	<xi:include href="common/armor.xml" />
+	<xi:include href="common/weapons.xml" />
+	<xi:include href="common/resources.xml" />
+	<xi:include href="common/luxuries.xml" />
+	<xi:include href="common/potions.xml" />
   <xi:include href="spoils.xml"/>
   <xi:include href="races.xml"/>
   <xi:include href="prefixes.xml"/>

src/res/vinyambar-3.xml

@@ -1,14 +1,14 @@
 <eressea>
-  <include href="messages.xml"></include>
+  <include href="messages.xml" />
 
   <comment>Localization</comment>
-  <include href="de/strings.xml"></include>
+  <include href="de/strings.xml" />
-  <include href="en/strings.xml"></include>
+  <include href="en/strings.xml" />
 
-  <include href="races.xml"></include>
+  <include href="races.xml" />
-  <include href="resources.xml"></include>
+  <include href="resources.xml" />
-  <include href="ships.xml"></include>
+  <include href="ships.xml" />
-  <include href="buildings.xml"></include>
+  <include href="buildings.xml" />
 
   <game name="Kreis der Macht" units="250" welcome="vinyambar">
     <comment>Game specific</comment>
@@ -27,8 +27,8 @@
     <param name="alliance.auto" value="fight"/>
     <param name="alliance.transferquit" value="true"/>
   </game>
-  <include href="vinyambar/de/strings.xml"></include>
+  <include href="vinyambar/de/strings.xml" />
-  <include href="vinyambar/stronghold.xml"></include>
+  <include href="vinyambar/stronghold.xml" />
   <strings>
     <string name="mailto">
       <text>vinyambar@eressea.amber.kn-bremen.de</text>

src/res/vinyambar-classic.xml

@@ -1,13 +1,13 @@
 <eressea>
-	<include href="messages.xml"></include>
+	<include href="messages.xml" />
 
 	<comment>Localization</comment>
-	<include href="de/strings.xml"></include>
+	<include href="de/strings.xml" />
-	<include href="en/strings.xml"></include>
+	<include href="en/strings.xml" />
 
-	<include href="races.xml"></include>
+	<include href="races.xml" />
-	<include href="resources.xml"></include>
+	<include href="resources.xml" />
-	<include href="ships.xml"></include>
+	<include href="ships.xml" />
 
 	<game name="Vinyambar I" units="250" welcome="vinyambar">
 		<comment>Game specific</comment>
@@ -21,8 +21,8 @@
 		<param name="database.gameid" value="1"></param>
 		<param name="hunger.long" value="1"></param>
 	</game>
-	<include href="vinyambar/races.xml"></include>
+	<include href="vinyambar/races.xml" />
-	<include href="vinyambar/de/strings-classic.xml"></include>
+	<include href="vinyambar/de/strings-classic.xml" />
 	<strings>
 		<string name="mailto">
 			<text>vinyambar@eressea.amber.kn-bremen.de</text>

src/res/vinyambar-wdw.xml

@@ -6,7 +6,12 @@
   <xi:include href="de/strings.xml"/>
   <xi:include href="en/strings.xml"/>
 
-  <xi:include href="resources.xml"/>
+	<xi:include href="common/items.xml" />
+	<xi:include href="common/armor.xml" />
+	<xi:include href="common/weapons.xml" />
+	<xi:include href="common/resources.xml" />
+	<xi:include href="common/luxuries.xml" />
+	<xi:include href="common/potions.xml" />
   <xi:include href="spoils.xml"/>
   <xi:include href="races.xml"/>
   <xi:include href="prefixes.xml"/>

src/res/vinyambar.xml

@@ -1,13 +1,13 @@
 <eressea>
-	<include href="messages.xml"></include>
+	<include href="messages.xml" />
 
 	<comment>Localization</comment>
-	<include href="de/strings.xml"></include>
+	<include href="de/strings.xml" />
-	<include href="en/strings.xml"></include>
+	<include href="en/strings.xml" />
 
-	<include href="races.xml"></include>
+	<include href="races.xml" />
-	<include href="resources.xml"></include>
+	<include href="resources.xml" />
-	<include href="ships.xml"></include>
+	<include href="ships.xml" />
 
 	<game name="Vinyambar II" units="250" welcome="vinyambar">
 		<comment>Game specific</comment>
@@ -22,8 +22,8 @@
 		<param name="database.gameid" value="2"></param>
 		<param name="hunger.long" value="0"></param>
 	</game>
-	<include href="vinyambar/races.xml"></include>
+	<include href="vinyambar/races.xml" />
-	<include href="vinyambar/de/strings.xml"></include>
+	<include href="vinyambar/de/strings.xml" />
 	<strings>
 		<string name="mailto">
 			<text>vinyambar@eressea.amber.kn-bremen.de</text>

src/scripts/tests.lua

@@ -1,3 +1,12 @@
+local function test_rename()
+    free_game()
+    local r = region.create(0, 0, "plain")
+    local f = faction.create("enno@eressea.de", "human", "de")
+    local u = unit.create(f, r)
+    u:add_item("aoh", 1)
+    assert(u:get_item("ao_healing")==1)
+end
+
 local function test_pure()
     free_game()
     local r = region.create(0, 0, "plain")
@@ -236,6 +245,21 @@ local function test_recruit()
   assert(u:get_item("money")==10)
 end
 
+local function test_produce()
+  free_game()
+  local r = region.create(0, 0, "plain")
+  local f = faction.create("enno@eressea.de", "human", "de")
+  local u = unit.create(f, r, 1)
+  u:clear_orders()
+  u:set_skill("weaponsmithing", 3)
+  u:add_item("iron", 2)
+  u:add_item("money", u.number * 10)
+  u:add_order("MACHE Schwert")
+  process_orders()
+  assert(u:get_item("iron")==1)
+  assert(u:get_item("sword")==1)
+end
+
 loadscript("extensions.lua")
 tests = {
     ["pure"] = test_pure,
@@ -248,6 +272,8 @@ tests = {
     ["hashtable"] = test_hashtable,
     ["gmtool"] = test_gmtool,
     ["events"] = test_events,
+    ["produce"] = test_produce,
+    ["rename"] = test_rename,
     ["recruit"] = test_recruit
 }