From 02921d0148e26205452d15cc2866c1c11fe5b31b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 4 Mar 2011 20:38:36 +0100
Subject: [PATCH 1/2] removed all unused items

---
 res/herbs.xml               | 89 +++++++++++++++++++++++++++++++++++++
 res/luxuries.xml            | 40 +++++++++++++++++
 res/races/zombie.xml        | 12 +++++
 scripts/example/modules.lua |  8 ++++
 4 files changed, 149 insertions(+)
 create mode 100644 res/herbs.xml
 create mode 100644 res/luxuries.xml
 create mode 100644 res/races/zombie.xml

diff --git a/res/herbs.xml b/res/herbs.xml
new file mode 100644
index 000000000..69c67fe5c
--- /dev/null
+++ b/res/herbs.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<resources>
+	<!-- this file contains herbs that are part of the alchemy system -->
+
+	<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"><!-- Windbeutel -->
+		<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"><!-- Alraune -->
+		<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>
+
+</resources>
diff --git a/res/luxuries.xml b/res/luxuries.xml
new file mode 100644
index 000000000..83c187c6e
--- /dev/null
+++ b/res/luxuries.xml
@@ -0,0 +1,40 @@
+<?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>
diff --git a/res/races/zombie.xml b/res/races/zombie.xml
new file mode 100644
index 000000000..5d76a8557
--- /dev/null
+++ b/res/races/zombie.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<race name="zombie" magres="0.20000" maxaura="1.0" regaura="1.0"
+	recruitcost="-1" maintenance="0" weight="1000" capacity="440" speed="1.000000"
+	hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="no"
+	walk="yes" shapeshift="no" giveitem="no" giveperson="no" giveunit="no"
+	getitem="no" recruitethereal="no" equipment="yes" scarepeasants="yes"
+	cansteal="no" unarmedguard="yes" absorbpeasants="yes" noheal="yes"
+	undead="yes" resistpierce="yes">
+	<ai splitsize="1000" moverandom="yes" learn="yes" />
+	<attack type="1" damage="1d5" />
+	<attack type="5" />
+</race>
diff --git a/scripts/example/modules.lua b/scripts/example/modules.lua
index 9d62abb01..8ded0b7b8 100644
--- a/scripts/example/modules.lua
+++ b/scripts/example/modules.lua
@@ -5,3 +5,11 @@ tests = {
   srcpath .. '/shared/scripts/tests/common.lua', 
   srcpath .. '/shared/scripts/tests/bson.lua', 
 }
+
+-- variables used in testsuite
+test = {  
+swordmakeskill = 3, -- weaponsmithing skill for swords
+swordiron = 1, -- iron per sword
+horsecapacity = 2000, -- carrying capacity of horses (minus weight)
+cartcapacity = 10000 -- carrying capacity of carts (minus weight)
+}
\ No newline at end of file

From a1af32895022c1afc3046297f8218007c8679573 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 6 Mar 2011 11:27:37 +0100
Subject: [PATCH 2/2] added Atlantis ship types

---
 scripts/example/modules.lua | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/example/modules.lua b/scripts/example/modules.lua
index 8ded0b7b8..f44352ebf 100644
--- a/scripts/example/modules.lua
+++ b/scripts/example/modules.lua
@@ -8,8 +8,9 @@ tests = {
 
 -- variables used in testsuite
 test = {  
-swordmakeskill = 3, -- weaponsmithing skill for swords
-swordiron = 1, -- iron per sword
-horsecapacity = 2000, -- carrying capacity of horses (minus weight)
-cartcapacity = 10000 -- carrying capacity of carts (minus weight)
+swordmakeskill = 3 -- weaponsmithing skill for swords
+,swordiron = 1 -- iron per sword
+,horsecapacity = 2000 -- carrying capacity of horses (minus weight)
+,cartcapacity = 10000 -- carrying capacity of carts (minus weight)
+,shipname = "boat" -- some ship name (any name)
 }
\ No newline at end of file