Merge branch 'master' of gitorious.org:~wombat/tmwdata/cache-clientdata

8 files changed, 162 insertions, 0 deletions

diff --git a/ea-skills.xml b/ea-skills.xml
index 4835c03a..846df978 100644
--- a/ea-skills.xml
+++ b/ea-skills.xml
@@ -13,4 +13,13 @@
         <skill id="344" name="Nature Magic" icon="graphics/skills/magic/nature.png"/>
         <skill id="345" name="Astral Magic" icon="graphics/skills/magic/astral.png"/>
     </set>
+    <set name="Skills">
+        <skill id="45"  name="Mallards Eye Skill" icon="graphics/skills/unknown.png"/>
+        <skill id="350" name="Brawling Skill" icon="graphics/skills/unknown.png"/>
+        <skill id="351" name="Lucky Counter Skill" icon="graphics/skills/unknown.png"/>
+        <skill id="352" name="Speed Skill" icon="graphics/skills/unknown.png"/>
+        <skill id="353" name="Resist Poison Skill" icon="graphics/skills/unknown.png"/>
+        <skill id="354" name="Astral Soul Skill" icon="graphics/skills/unknown.png"/>
+    </set>
 </skills>
+
diff --git a/graphics/items/armor-head-overlordhelm.png b/graphics/items/armor-head-overlordhelm.png
new file mode 100644
index 00000000..17b5a5fc
--- /dev/null
+++ b/graphics/items/armor-head-overlordhelm.png
diff --git a/graphics/items/armor-head-paladinhelm.png b/graphics/items/armor-head-paladinhelm.png
new file mode 100644
index 00000000..d6ee5f2e
--- /dev/null
+++ b/graphics/items/armor-head-paladinhelm.png
diff --git a/graphics/items/equipment/head/bowler-hat.png b/graphics/items/equipment/head/bowler-hat.png
new file mode 100644
index 00000000..fc02b853
--- /dev/null
+++ b/graphics/items/equipment/head/bowler-hat.png
diff --git a/graphics/sprites/equipment/head/bowler-hat.png b/graphics/sprites/equipment/head/bowler-hat.png
new file mode 100644
index 00000000..0939cee8
--- /dev/null
+++ b/graphics/sprites/equipment/head/bowler-hat.png
diff --git a/graphics/sprites/equipment/head/bowler-hat.xml b/graphics/sprites/equipment/head/bowler-hat.xml
new file mode 100644
index 00000000..d2740176
--- /dev/null
+++ b/graphics/sprites/equipment/head/bowler-hat.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/equipment/head/bowler-hat.png" width="40" height="40" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-29" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="0" offsetY ="-29"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="0" offsetY ="-29"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-17" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="4" offsetY ="-20"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="0" offsetY ="-17"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-6" offsetY ="-20"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="4" offsetX="21" offsetY="-4"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/player_male_base.png b/graphics/sprites/player_male_base.png
index b9c439f4..57e66d9d 100755
--- a/graphics/sprites/player_male_base.png
+++ b/graphics/sprites/player_male_base.png
diff --git a/items.xml b/items.xml
index bdc04e5c..76ccd107 100644
--- a/items.xml
+++ b/items.xml
@@ -5253,6 +5253,17 @@
         type="generic"
         weight="50"
         max-per-slot="10"/>
+    <item id="4030"
+        image="equipment/head/bowler-hat.png"
+        name="Bowler Hat"
+        description="A hat for those with a bit of class."
+        effect="+10% Defense"
+        type="equip-head"
+        weight="30"
+        defense="10"
+        max-per-slot="1">
+        <sprite>equipment/head/bowler-hat.xml</sprite>
+    </item>
     <item id="3000"
         image="generic-jackolantern.png"
         name="Jack-o-Lantern"