Merge gitorious.org:+tmw-admins/tmw/tmwa-client-test

176 files changed, 807 insertions, 466 deletions

diff --git a/graphics/sprites/equipment/chest/brassplate-female.png b/graphics/sprites/equipment/chest/bromenalchest-female.png
index 7035c735..7035c735 100644
--- a/graphics/sprites/equipment/chest/brassplate-female.png
+++ b/graphics/sprites/equipment/chest/bromenalchest-female.png
diff --git a/graphics/sprites/equipment/chest/bromenalchest-female.xml b/graphics/sprites/equipment/chest/bromenalchest-female.xml
new file mode 100644
index 00000000..20b94c37
--- /dev/null
+++ b/graphics/sprites/equipment/chest/bromenalchest-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-female.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/chest/brassplate-male.png b/graphics/sprites/equipment/chest/bromenalchest-male.png
index 49394f2e..49394f2e 100644
--- a/graphics/sprites/equipment/chest/brassplate-male.png
+++ b/graphics/sprites/equipment/chest/bromenalchest-male.png
diff --git a/graphics/sprites/equipment/chest/brassplate-male.xml b/graphics/sprites/equipment/chest/bromenalchest-male.xml
index d4400a4f..dac81aca 100644
--- a/graphics/sprites/equipment/chest/brassplate-male.xml
+++ b/graphics/sprites/equipment/chest/bromenalchest-male.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/equipment/chest/brassplate-male.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/chest/bromenalchest-male.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/equipment/feet/brassboots-female.png b/graphics/sprites/equipment/feet/bromenalboots-female.png
index 6e084914..6e084914 100644
--- a/graphics/sprites/equipment/feet/brassboots-female.png
+++ b/graphics/sprites/equipment/feet/bromenalboots-female.png
diff --git a/graphics/sprites/equipment/feet/brassboots-male.xml b/graphics/sprites/equipment/feet/bromenalboots-female.xml
index ada5bedf..3a2cc633 100644
--- a/graphics/sprites/equipment/feet/brassboots-male.xml
+++ b/graphics/sprites/equipment/feet/bromenalboots-female.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/equipment/feet/brassboots-male.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/feet/bromenalboots-female.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/equipment/feet/brassboots-male.png b/graphics/sprites/equipment/feet/bromenalboots-male.png
index 7086470d..7086470d 100644
--- a/graphics/sprites/equipment/feet/brassboots-male.png
+++ b/graphics/sprites/equipment/feet/bromenalboots-male.png
diff --git a/graphics/sprites/equipment/chest/brassplate-female.xml b/graphics/sprites/equipment/feet/bromenalboots-male.xml
index da984634..35749913 100644
--- a/graphics/sprites/equipment/chest/brassplate-female.xml
+++ b/graphics/sprites/equipment/feet/bromenalboots-male.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/equipment/chest/brassplate-female.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/feet/bromenalboots-male.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/equipment/hands/assassin-male.xml b/graphics/sprites/equipment/hands/assassin-male.xml
index 0a075b5a..b87adb08 100644
--- a/graphics/sprites/equipment/hands/assassin-male.xml
+++ b/graphics/sprites/equipment/hands/assassin-male.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/equipment/hands/assassin-male.png" width="64" height="64" />
 
-	<include file="hands-gloves-generic-male.xml" />
+	<include file="equipment/hands/generic-male.xml" />
 
 </sprite>
diff --git a/graphics/sprites/equipment/hands/brassgloves-female.xml b/graphics/sprites/equipment/hands/brassgloves-female.xml
deleted file mode 100644
index b4f3551c..00000000
--- a/graphics/sprites/equipment/hands/brassgloves-female.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/hands/brassgloves-female.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/hands/brassgloves-female.png b/graphics/sprites/equipment/hands/bromenalgloves-female.png
index ef4e19d5..ef4e19d5 100644
--- a/graphics/sprites/equipment/hands/brassgloves-female.png
+++ b/graphics/sprites/equipment/hands/bromenalgloves-female.png
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-female.xml b/graphics/sprites/equipment/hands/bromenalgloves-female.xml
new file mode 100644
index 00000000..03ce3e5a
--- /dev/null
+++ b/graphics/sprites/equipment/hands/bromenalgloves-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/hands/bromenalgloves-female.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/hands/brassgloves-male.png b/graphics/sprites/equipment/hands/bromenalgloves-male.png
index b5379063..b5379063 100644
--- a/graphics/sprites/equipment/hands/brassgloves-male.png
+++ b/graphics/sprites/equipment/hands/bromenalgloves-male.png
diff --git a/graphics/sprites/equipment/hands/bromenalgloves-male.xml b/graphics/sprites/equipment/hands/bromenalgloves-male.xml
new file mode 100644
index 00000000..0d39eb09
--- /dev/null
+++ b/graphics/sprites/equipment/hands/bromenalgloves-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/hands/bromenalgloves-male.png" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/equipment/head/brasshelmet.png b/graphics/sprites/equipment/head/bromenalhelmet.png
index 555ea093..555ea093 100644
--- a/graphics/sprites/equipment/head/brasshelmet.png
+++ b/graphics/sprites/equipment/head/bromenalhelmet.png
diff --git a/graphics/sprites/equipment/head/brasshelmet.xml b/graphics/sprites/equipment/head/bromenalhelmet.xml
index 7f05ebf2..d234fe8c 100644
--- a/graphics/sprites/equipment/head/brasshelmet.xml
+++ b/graphics/sprites/equipment/head/bromenalhelmet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/brasshelmet.png" width="27" height="19"/>
+	<imageset name="base" src="graphics/sprites/equipment/head/bromenalhelmet.png" width="27" height="19"/>
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/equipment/head/candlehelmet.png b/graphics/sprites/equipment/head/candlehelmet.png
index f3ea2d88..d8ebcc6f 100644
--- a/graphics/sprites/equipment/head/candlehelmet.png
+++ b/graphics/sprites/equipment/head/candlehelmet.png
diff --git a/graphics/sprites/equipment/head/candlehelmet.xml b/graphics/sprites/equipment/head/candlehelmet.xml
index 477a22c1..e30c187b 100644
--- a/graphics/sprites/equipment/head/candlehelmet.xml
+++ b/graphics/sprites/equipment/head/candlehelmet.xml
@@ -1,123 +1,185 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/candlehelmet.png" width="39" height="39"/>
+	<imageset name="base" src="graphics/sprites/equipment/head/candlehelmet.png" width="25" height="44" />
+	<imageset name="base_dead" src="graphics/sprites/equipment/head/candlehelmet.png" width="50" height="44" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-31"/>
+		  <frame index="0" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="1" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="4" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="5" offsetX="-1" offsetY ="-39" delay="75"/>
 		</animation>
 		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-31"/>
+		  <frame index="6" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="7" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="8" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="9" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="10" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="11" offsetX="-2" offsetY ="-38" delay="75"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-32"/>
+		  <frame index="12" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="13" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="14" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="15" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="16" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="17" offsetX="-2" offsetY ="-38" delay="75"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-31"/>
+		  <frame index="18" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="19" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="20" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="21" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="22" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="23" offsetX="1" offsetY ="-40" delay="75"/>
 		</animation>
 	</action>
 
 	<action name="walk" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-30" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-31" delay="150"/>
-		  <frame index="0" offsetX="-1" offsetY ="-30" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-31" delay="150"/>
+		  <frame index="0" offsetX="-1" offsetY ="-38" delay="75"/>
+		  <frame index="1" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-38" delay="75"/>
+		  <frame index="4" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="5" offsetX="-1" offsetY ="-39" delay="75"/>
 		</animation>
 		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-31" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-30" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-31" delay="150"/>
-		  <frame index="1" offsetX="0" offsetY ="-30" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="6" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="7" offsetX="-2" offsetY ="-37" delay="75"/>
+		  <frame index="8" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="9" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="10" offsetX="-2" offsetY ="-37" delay="75"/>
+		  <frame index="11" offsetX="-2" offsetY ="-38" delay="75"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-32" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-33" delay="150"/>
-		  <frame index="2" offsetX="-2" offsetY ="-32" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-33" delay="150"/>
+		  <frame index="12" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="13" offsetX="-2" offsetY ="-39" delay="75"/>
+		  <frame index="14" offsetX="-2" offsetY ="-39" delay="75"/>
+		  <frame index="15" offsetX="-2" offsetY ="-38" delay="75"/>
+		  <frame index="16" offsetX="-2" offsetY ="-39" delay="75"/>
+		  <frame index="17" offsetX="-2" offsetY ="-39" delay="75"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-31" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-31" delay="150"/>
-		  <frame index="3" offsetX="0" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-31" delay="75"/>
+		  <frame index="18" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="19" offsetX="1" offsetY ="-39" delay="75"/>
+		  <frame index="20" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="21" offsetX="1" offsetY ="-40" delay="75"/>
+		  <frame index="22" offsetX="1" offsetY ="-39" delay="75"/>
+		  <frame index="23" offsetX="1" offsetY ="-40" delay="75"/>
 		</animation>
 	</action>
 
 	<action name="attack" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-29" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-30" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-27" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-36" delay="75"/>
+		  <frame index="1" offsetX="-1" offsetY ="-38" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-35" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-34" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-32" delay="75"/>
-		  <frame index="1" offsetX="4" offsetY ="-33" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-30" delay="75"/>
-		  <frame index="1" offsetX="-1" offsetY ="-29" delay="75"/>
+		  <frame index="6" offsetX="2" offsetY ="-39" delay="75"/>
+		  <frame index="7" offsetX="2" offsetY ="-40" delay="75"/>
+		  <frame index="8" offsetX="-2" offsetY ="-37" delay="75"/>
+		  <frame index="9" offsetX="-3" offsetY ="-36" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="up">
-		  <frame index="2" offsetX="-3" offsetY ="-32" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="12" offsetX="-3" offsetY ="-38" delay="75"/>
+		  <frame index="13" offsetX="-3" offsetY ="-38" delay="75"/>
+		  <frame index="14" offsetX="-3" offsetY ="-38" delay="75"/>
+		  <frame index="15" offsetX="-3" offsetY ="-35" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-32" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-33" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-29" delay="75"/>
+		  <frame index="18" offsetX="-2" offsetY ="-41" delay="75"/>
+		  <frame index="19" offsetX="-2" offsetY ="-42" delay="75"/>
+		  <frame index="20" offsetX="1" offsetY ="-39" delay="75"/>
+		  <frame index="21" offsetX="2" offsetY ="-38" delay="75"/>
 		  <end />
 		</animation>
 	</action>
 
 	<action name="attack_bow" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-30" delay="225"/>
-		  <frame index="0" offsetX="-1" offsetY ="-29" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-30" delay="75"/>
+		  <frame index="0" offsetX="-1" offsetY ="-40" delay="75"/>
+		  <frame index="1" offsetX="-1" offsetY ="-40" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-39" delay="75"/>
+		  <frame index="4" offsetX="-1" offsetY ="-40" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-31" delay="225"/>
-		  <frame index="1" offsetX="5" offsetY ="-32" delay="150"/>
+		  <frame index="6" offsetX="3" offsetY ="-41" delay="75"/>
+		  <frame index="7" offsetX="3" offsetY ="-41" delay="75"/>
+		  <frame index="8" offsetX="3" offsetY ="-41" delay="75"/>
+		  <frame index="9" offsetX="5" offsetY ="-42" delay="75"/>
+		  <frame index="10" offsetX="5" offsetY ="-42" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-32" delay="225"/>
-		  <frame index="2" offsetX="-3" offsetY ="-31" delay="75"/>
-		  <frame index="2" offsetX="-3" offsetY ="-32" delay="75"/>
+		  <frame index="12" offsetX="-2" offsetY ="-42" delay="75"/>
+		  <frame index="13" offsetX="-2" offsetY ="-42" delay="75"/>
+		  <frame index="14" offsetX="-3" offsetY ="-42" delay="75"/>
+		  <frame index="15" offsetX="-3" offsetY ="-41" delay="75"/>
+		  <frame index="16" offsetX="-3" offsetY ="-42" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-31" delay="225"/>
-		  <frame index="3" offsetX="-5" offsetY ="-32" delay="150"/>
+		  <frame index="18" offsetX="-3" offsetY ="-41" delay="75"/>
+		  <frame index="19" offsetX="-3" offsetY ="-41" delay="75"/>
+		  <frame index="20" offsetX="-3" offsetY ="-41" delay="75"/>
+		  <frame index="21" offsetX="-5" offsetY ="-42" delay="75"/>
+		  <frame index="22" offsetX="-5" offsetY ="-42" delay="75"/>
 		  <end />
 		</animation>
 	</action>
 
 	<action name="sit" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-19"/>
+		  <frame index="0" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="1" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="4" offsetX="-1" offsetY ="-27" delay="75"/>
+		  <frame index="5" offsetX="-1" offsetY ="-27" delay="75"/>
 		</animation>
 		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-22"/>
+		  <frame index="6" offsetX="2" offsetY ="-30" delay="75"/>
+		  <frame index="7" offsetX="2" offsetY ="-30" delay="75"/>
+		  <frame index="8" offsetX="2" offsetY ="-30" delay="75"/>
+		  <frame index="9" offsetX="2" offsetY ="-30" delay="75"/>
+		  <frame index="10" offsetX="2" offsetY ="-30" delay="75"/>
+		  <frame index="11" offsetX="2" offsetY ="-30" delay="75"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-24"/>
+		  <frame index="12" offsetX="-1" offsetY ="-30" delay="75"/>
+		  <frame index="13" offsetX="-1" offsetY ="-30" delay="75"/>
+		  <frame index="14" offsetX="-1" offsetY ="-30" delay="75"/>
+		  <frame index="15" offsetX="-1" offsetY ="-30" delay="75"/>
+		  <frame index="16" offsetX="-1" offsetY ="-30" delay="75"/>
+		  <frame index="17" offsetX="-1" offsetY ="-30" delay="75"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="3" offsetX="-6" offsetY ="-22"/>
+		  <frame index="18" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="19" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="20" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="21" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="22" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="23" offsetX="-5" offsetY ="-30" delay="75"/>
 		</animation>
 	</action>
 
-	<action name="dead" imageset="base">
+	<action name="dead" imageset="base_dead">
 		<animation direction="default">
-			<frame index="4" offsetX="21" offsetY="-5"/>
+			<frame index="12" offsetX="40" offsetY="-7" delay="140"/>
+			<frame index="13" offsetX="40" offsetY="-7" delay="140"/>
+			<frame index="14" offsetX="40" offsetY="-7" delay="140"/>
+			<frame index="14" offsetX="40" offsetY="-7" delay="0"/>
 		</animation>
 	</action>
 
diff --git a/graphics/sprites/equipment/head/pinkie-helmet.png b/graphics/sprites/equipment/head/pinkie-helmet.png
index 54c37c75..e97ad2e5 100644
--- a/graphics/sprites/equipment/head/pinkie-helmet.png
+++ b/graphics/sprites/equipment/head/pinkie-helmet.png
diff --git a/graphics/sprites/equipment/head/wizard-hat.png b/graphics/sprites/equipment/head/wizard-hat.png
index 6e6c0cdf..6e6c0cdf 100755..100644
--- a/graphics/sprites/equipment/head/wizard-hat.png
+++ b/graphics/sprites/equipment/head/wizard-hat.png
diff --git a/graphics/sprites/equipment/legs/brasspants-female.xml b/graphics/sprites/equipment/legs/brasspants-female.xml
deleted file mode 100644
index 1d20c292..00000000
--- a/graphics/sprites/equipment/legs/brasspants-female.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/legs/brasspants-female.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/legs/brasspants-male.xml b/graphics/sprites/equipment/legs/brasspants-male.xml
deleted file mode 100644
index 2f08d96a..00000000
--- a/graphics/sprites/equipment/legs/brasspants-male.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/equipment/legs/brasspants-male.png" width="64" height="64" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" />
-		</animation>
-		<animation direction="left">
-		  <frame index="18" />
-		</animation>
-		<animation direction="up">
-		  <frame index="36" />
-		</animation>
-		<animation direction="right">
-		  <frame index="54" />
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="6" delay="75" />
-		</animation>
-		<animation direction="left">
-			<sequence start="19" end="24" delay="75" />
-		</animation>
-		<animation direction="up">
-			<sequence start="37" end="42" delay="75" />
-		</animation>
-		<animation direction="right">
-			<sequence start="55" end="60" delay="75" />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		 <frame index="7" />
-		</animation>
-		<animation direction="left">
-		 <frame index="25" />
-		</animation>
-		<animation direction="up">
-		 <frame index="43" />
-		</animation>
-		<animation direction="right">
-		 <frame index="61" />
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="8" />
-		</animation>
-		<animation direction="left">
-		  <frame index="26" />
-		</animation>
-		<animation direction="up">
-		  <frame index="44" />
-		</animation>
-		<animation direction="right">
-		  <frame index="62" />
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="9" end="12" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="27" end="30" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="45" end="48" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="63" end="66" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-			<sequence start="13" end="17" delay="75" />
-			<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="31" end="35" delay="75" />
-			<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="49" end="53" delay="75" />
-			<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="67" end="71" delay="75" />
-			<end />
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/legs/brasspants-female.png b/graphics/sprites/equipment/legs/bromenallegs-female.png
index e100059f..e100059f 100644
--- a/graphics/sprites/equipment/legs/brasspants-female.png
+++ b/graphics/sprites/equipment/legs/bromenallegs-female.png
diff --git a/graphics/sprites/equipment/feet/brassboots-female.xml b/graphics/sprites/equipment/legs/bromenallegs-female.xml
index eee14b80..7b814c7c 100644
--- a/graphics/sprites/equipment/feet/brassboots-female.xml
+++ b/graphics/sprites/equipment/legs/bromenallegs-female.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/equipment/feet/brassboots-female.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs-female.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/equipment/legs/brasspants-male.png b/graphics/sprites/equipment/legs/bromenallegs-male.png
index ee682d84..ee682d84 100644
--- a/graphics/sprites/equipment/legs/brasspants-male.png
+++ b/graphics/sprites/equipment/legs/bromenallegs-male.png
diff --git a/graphics/sprites/equipment/hands/brassgloves-male.xml b/graphics/sprites/equipment/legs/bromenallegs-male.xml
index 958e5191..049a2280 100644
--- a/graphics/sprites/equipment/hands/brassgloves-male.xml
+++ b/graphics/sprites/equipment/legs/bromenallegs-male.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/equipment/hands/brassgloves-male.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/legs/bromenallegs-male.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/accessories/ball-lighning-shadow.xml b/graphics/sprites/monsters/accessories/ball-lighning-shadow.xml
index 1b7444d6..1b7444d6 100755..100644
--- a/graphics/sprites/monsters/accessories/ball-lighning-shadow.xml
+++ b/graphics/sprites/monsters/accessories/ball-lighning-shadow.xml
diff --git a/graphics/sprites/monsters/accessories/ball-lightning-shadow.xml b/graphics/sprites/monsters/accessories/ball-lightning-shadow.xml
index 1b7444d6..1b7444d6 100755..100644
--- a/graphics/sprites/monsters/accessories/ball-lightning-shadow.xml
+++ b/graphics/sprites/monsters/accessories/ball-lightning-shadow.xml
diff --git a/graphics/sprites/monsters/accessories/empty-frame.png b/graphics/sprites/monsters/accessories/empty-frame.png
index dabd9f21..dabd9f21 100755..100644
--- a/graphics/sprites/monsters/accessories/empty-frame.png
+++ b/graphics/sprites/monsters/accessories/empty-frame.png
diff --git a/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.png b/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.png
index 1c43e809..1c43e809 100755..100644
--- a/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.png
+++ b/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.png
diff --git a/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.xml b/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.xml
index ccc62215..ccc62215 100755..100644
--- a/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.xml
+++ b/graphics/sprites/monsters/accessories/generic-shadow-medium-circle.xml
diff --git a/graphics/sprites/monsters/accessories/reaper-shadow.xml b/graphics/sprites/monsters/accessories/reaper-shadow.xml
index 38c537cf..38c537cf 100755..100644
--- a/graphics/sprites/monsters/accessories/reaper-shadow.xml
+++ b/graphics/sprites/monsters/accessories/reaper-shadow.xml
diff --git a/graphics/sprites/monsters/accessories/scythe-shadow.png b/graphics/sprites/monsters/accessories/scythe-shadow.png
index c4471ca5..c4471ca5 100755..100644
--- a/graphics/sprites/monsters/accessories/scythe-shadow.png
+++ b/graphics/sprites/monsters/accessories/scythe-shadow.png
diff --git a/graphics/sprites/monsters/accessories/scythe-shadow.xml b/graphics/sprites/monsters/accessories/scythe-shadow.xml
index 49c71619..49c71619 100755..100644
--- a/graphics/sprites/monsters/accessories/scythe-shadow.xml
+++ b/graphics/sprites/monsters/accessories/scythe-shadow.xml
diff --git a/graphics/sprites/monsters/weapon-bow.xml b/graphics/sprites/monsters/accessories/weapon-bow.xml
index 2429a5e0..2429a5e0 100644
--- a/graphics/sprites/monsters/weapon-bow.xml
+++ b/graphics/sprites/monsters/accessories/weapon-bow.xml
diff --git a/graphics/sprites/monsters/weapon-dagger.xml b/graphics/sprites/monsters/accessories/weapon-dagger.xml
index 5159b49f..5159b49f 100644
--- a/graphics/sprites/monsters/weapon-dagger.xml
+++ b/graphics/sprites/monsters/accessories/weapon-dagger.xml
diff --git a/graphics/sprites/monsters/monster-archant.png b/graphics/sprites/monsters/archant.png
index b554435f..b554435f 100644
--- a/graphics/sprites/monsters/monster-archant.png
+++ b/graphics/sprites/monsters/archant.png
diff --git a/graphics/sprites/monsters/monster-archant.xml b/graphics/sprites/monsters/archant.xml
index 79862707..68c3918c 100644
--- a/graphics/sprites/monsters/monster-archant.xml
+++ b/graphics/sprites/monsters/archant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-archant.png" width="24" height="30" />
+	<imageset name="base" src="graphics/sprites/monsters/archant.png" width="24" height="30" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-ball-lightning.png b/graphics/sprites/monsters/ball-lightning.png
index 894dcecc..894dcecc 100755..100644
--- a/graphics/sprites/monsters/monster-ball-lightning.png
+++ b/graphics/sprites/monsters/ball-lightning.png
diff --git a/graphics/sprites/monsters/monster-ball-lightning.xml b/graphics/sprites/monsters/ball-lightning.xml
index 335d39a4..49bdc273 100755..100644
--- a/graphics/sprites/monsters/monster-ball-lightning.xml
+++ b/graphics/sprites/monsters/ball-lightning.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-ball-lightning.png" width="70" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/ball-lightning.png" width="70" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
@@ -29,4 +29,4 @@
 		</animation>
 	</action>
 	
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-bandit-lord.png b/graphics/sprites/monsters/bandit-lord.png
index 8c860143..8c860143 100644
--- a/graphics/sprites/monsters/monster-bandit-lord.png
+++ b/graphics/sprites/monsters/bandit-lord.png
diff --git a/graphics/sprites/monsters/monster-bandit-lord.xml b/graphics/sprites/monsters/bandit-lord.xml
index a4bb7b73..5876969f 100644
--- a/graphics/sprites/monsters/monster-bandit-lord.xml
+++ b/graphics/sprites/monsters/bandit-lord.xml
@@ -2,7 +2,7 @@
 <sprite>
 
 	<imageset name="base" 
-		src=      "graphics/sprites/monsters/monster-bandit-lord.png" 
+		src=      "graphics/sprites/monsters/bandit-lord.png" 
 		width=    "64" 
 		height=   "64" 
 	/>
diff --git a/graphics/sprites/monsters/monster-bandit.png b/graphics/sprites/monsters/bandit.png
index a0c2fd46..a0c2fd46 100644
--- a/graphics/sprites/monsters/monster-bandit.png
+++ b/graphics/sprites/monsters/bandit.png
diff --git a/graphics/sprites/monsters/monster-bandit.xml b/graphics/sprites/monsters/bandit.xml
index dbcfa681..7caeda14 100644
--- a/graphics/sprites/monsters/monster-bandit.xml
+++ b/graphics/sprites/monsters/bandit.xml
@@ -2,7 +2,7 @@
 <sprite>
 
 	<imageset name="base" 
-		src=      "graphics/sprites/monsters/monster-bandit.png" 
+		src=      "graphics/sprites/monsters/bandit.png" 
 		width=    "64" 
 		height=   "64" 
 	/>
diff --git a/graphics/sprites/monsters/monster-bat.png b/graphics/sprites/monsters/bat.png
index f84a1f76..f84a1f76 100644
--- a/graphics/sprites/monsters/monster-bat.png
+++ b/graphics/sprites/monsters/bat.png
diff --git a/graphics/sprites/monsters/monster-vampire-bat.xml b/graphics/sprites/monsters/bat.xml
index 450340e8..844ad7cf 100644
--- a/graphics/sprites/monsters/monster-vampire-bat.xml
+++ b/graphics/sprites/monsters/bat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-vampire-bat.png" width="37" height="58" />
+	<imageset name="base" src="graphics/sprites/monsters/bat.png" width="37" height="58" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-bee.png b/graphics/sprites/monsters/bee.png
index cd1f8bcd..cd1f8bcd 100644
--- a/graphics/sprites/monsters/monster-bee.png
+++ b/graphics/sprites/monsters/bee.png
diff --git a/graphics/sprites/monsters/monster-bee.xml b/graphics/sprites/monsters/bee.xml
index c6eb61b1..6a1c3018 100644
--- a/graphics/sprites/monsters/monster-bee.xml
+++ b/graphics/sprites/monsters/bee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-bee.png" width="20" height="19" />
+	<imageset name="base" src="graphics/sprites/monsters/bee.png" width="20" height="19" />
 	<action name="stand" imageset="base">
 		<animation direction="down">
 			<sequence start="8" end="11" delay="75" offsetY="-20" />
diff --git a/graphics/sprites/monsters/monster-butterfly.png b/graphics/sprites/monsters/butterfly.png
index f15cd2c7..f15cd2c7 100644
--- a/graphics/sprites/monsters/monster-butterfly.png
+++ b/graphics/sprites/monsters/butterfly.png
diff --git a/graphics/sprites/monsters/monster-butterfly.xml b/graphics/sprites/monsters/butterfly.xml
index 063983aa..0c6647bf 100644
--- a/graphics/sprites/monsters/monster-butterfly.xml
+++ b/graphics/sprites/monsters/butterfly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-butterfly.png|W" width="28" height="28" />
+	<imageset name="base" src="graphics/sprites/monsters/butterfly.png|W" width="28" height="28" />
 	<action name="stand" imageset="base">
 		<animation direction="up">
 			<sequence start="0" end="3" delay="100" offsetY="-20" />
diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.png b/graphics/sprites/monsters/cave-maggot-giant.png
index 4eee44d7..4eee44d7 100644
--- a/graphics/sprites/monsters/monster-cave-maggot-giant.png
+++ b/graphics/sprites/monsters/cave-maggot-giant.png
diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.xml b/graphics/sprites/monsters/cave-maggot-giant.xml
index e3c65356..635b8011 100644
--- a/graphics/sprites/monsters/monster-cave-maggot-giant.xml
+++ b/graphics/sprites/monsters/cave-maggot-giant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-cave-maggot-giant.png|W" width="58" height="46" />
+	<imageset name="base" src="graphics/sprites/monsters/cave-maggot-giant.png|W" width="58" height="46" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-cave-maggot.png b/graphics/sprites/monsters/cave-maggot.png
index fe5f3c0d..fe5f3c0d 100644
--- a/graphics/sprites/monsters/monster-cave-maggot.png
+++ b/graphics/sprites/monsters/cave-maggot.png
diff --git a/graphics/sprites/monsters/monster-cave-maggot.xml b/graphics/sprites/monsters/cave-maggot.xml
index ac2a0741..58b2f752 100644
--- a/graphics/sprites/monsters/monster-cave-maggot.xml
+++ b/graphics/sprites/monsters/cave-maggot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-cave-maggot.png" width="20" height="15" />
+	<imageset name="base" src="graphics/sprites/monsters/cave-maggot.png" width="20" height="15" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/resource-clover.png b/graphics/sprites/monsters/clover.png
index c2d3ee3d..c2d3ee3d 100644
--- a/graphics/sprites/resource-clover.png
+++ b/graphics/sprites/monsters/clover.png
diff --git a/graphics/sprites/resource-clover.xml b/graphics/sprites/monsters/clover.xml
index 3e4a365b..450c80a6 100644
--- a/graphics/sprites/resource-clover.xml
+++ b/graphics/sprites/monsters/clover.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-    <imageset name="base" src="graphics/sprites/resource-clover.png" width="30" height="30" />
+    <imageset name="base" src="graphics/sprites/monsters/clover.png" width="30" height="30" />
 
     <action name="stand" imageset="base">
         <animation>
@@ -13,4 +13,4 @@
             <frame index="1"/>
         </animation>
     </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-duck.png b/graphics/sprites/monsters/duck.png
index 44319fb9..44319fb9 100644
--- a/graphics/sprites/monsters/monster-duck.png
+++ b/graphics/sprites/monsters/duck.png
diff --git a/graphics/sprites/monsters/monster-duck.xml b/graphics/sprites/monsters/duck.xml
index dcb03026..4aa1c812 100644
--- a/graphics/sprites/monsters/monster-duck.xml
+++ b/graphics/sprites/monsters/duck.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-   <imageset name="base" src="graphics/sprites/monsters/monster-duck.png|W;M;R;G;C;B" width="24" height="26" />
+   <imageset name="base" src="graphics/sprites/monsters/duck.png|W;M;R;G;C;B" width="24" height="26" />
 
    <action name="stand" imageset="base">
       <animation direction="down">
diff --git a/graphics/sprites/monsters/element-ball.png b/graphics/sprites/monsters/element-ball.png
new file mode 100644
index 00000000..a58f500a
--- /dev/null
+++ b/graphics/sprites/monsters/element-ball.png
diff --git a/graphics/sprites/monsters/monster-element-ball.xml b/graphics/sprites/monsters/element-ball.xml
index 99934944..6815846a 100644
--- a/graphics/sprites/monsters/monster-element-ball.xml
+++ b/graphics/sprites/monsters/element-ball.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-<imageset name="base" src="graphics/sprites/monsters/monster-element-ball.png|W" width="50" height="80" />
+<imageset name="base" src="graphics/sprites/monsters/element-ball.png|W" width="50" height="80" />
 
 <action name="stand" imageset="base">
 <animation direction="default">
diff --git a/graphics/sprites/monsters/monster-flower.png b/graphics/sprites/monsters/flower.png
index f398b862..f398b862 100644
--- a/graphics/sprites/monsters/monster-flower.png
+++ b/graphics/sprites/monsters/flower.png
diff --git a/graphics/sprites/monsters/monster-flower.xml b/graphics/sprites/monsters/flower.xml
index f7753277..afa65e7c 100644
--- a/graphics/sprites/monsters/monster-flower.xml
+++ b/graphics/sprites/monsters/flower.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-flower.png|W;R;Y" width="58" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/flower.png|W;R;Y" width="58" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-fluffy.png b/graphics/sprites/monsters/fluffy.png
index 8cb26d03..8cb26d03 100644
--- a/graphics/sprites/monsters/monster-fluffy.png
+++ b/graphics/sprites/monsters/fluffy.png
diff --git a/graphics/sprites/monsters/monster-fluffy.xml b/graphics/sprites/monsters/fluffy.xml
index 938051c7..ee074b31 100644
--- a/graphics/sprites/monsters/monster-fluffy.xml
+++ b/graphics/sprites/monsters/fluffy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-fluffy.png" width="28" height="32" />
+	<imageset name="base" src="graphics/sprites/monsters/fluffy.png" width="28" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.png b/graphics/sprites/monsters/ghost-pumpkin.png
index e464c885..e464c885 100644
--- a/graphics/sprites/monsters/monster-ghost-pumpkin.png
+++ b/graphics/sprites/monsters/ghost-pumpkin.png
diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.xml b/graphics/sprites/monsters/ghost-pumpkin.xml
index 27aa7a9f..4d867290 100644
--- a/graphics/sprites/monsters/monster-ghost-pumpkin.xml
+++ b/graphics/sprites/monsters/ghost-pumpkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-ghost-pumpkin.png" width="60" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/ghost-pumpkin.png" width="60" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -39,4 +39,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-goblin-fire.png b/graphics/sprites/monsters/goblin-fire.png
index b52d274e..b52d274e 100644
--- a/graphics/sprites/monsters/monster-goblin-fire.png
+++ b/graphics/sprites/monsters/goblin-fire.png
diff --git a/graphics/sprites/monsters/monster-goblin-ice.xml b/graphics/sprites/monsters/goblin-fire.xml
index a2183fe9..b2d09320 100644
--- a/graphics/sprites/monsters/monster-goblin-ice.xml
+++ b/graphics/sprites/monsters/goblin-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-goblin-ice.png" width="60" height="43" />
+	<imageset name="base" src="graphics/sprites/monsters/goblin-fire.png" width="60" height="43" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-goblin-ice.png b/graphics/sprites/monsters/goblin-ice.png
index cbba8f3e..cbba8f3e 100644
--- a/graphics/sprites/monsters/monster-goblin-ice.png
+++ b/graphics/sprites/monsters/goblin-ice.png
diff --git a/graphics/sprites/monsters/monster-goblin-fire.xml b/graphics/sprites/monsters/goblin-ice.xml
index 5b6045c1..bbc90d27 100644
--- a/graphics/sprites/monsters/monster-goblin-fire.xml
+++ b/graphics/sprites/monsters/goblin-ice.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-goblin-fire.png" width="60" height="43" />
+	<imageset name="base" src="graphics/sprites/monsters/goblin-ice.png" width="60" height="43" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/larvespa.png b/graphics/sprites/monsters/larvespa.png
new file mode 100644
index 00000000..84e9ad6e
--- /dev/null
+++ b/graphics/sprites/monsters/larvespa.png
diff --git a/graphics/sprites/monsters/larvespa.xml b/graphics/sprites/monsters/larvespa.xml
new file mode 100644
index 00000000..337868f5
--- /dev/null
+++ b/graphics/sprites/monsters/larvespa.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/monsters/larvespa.png|R;G" width="45" height="45" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+			<frame index="27" delay="150"/>
+		</animation>
+		<animation direction="left">
+			<frame index="0" delay="150"/>
+		</animation>
+		<animation direction="up">
+			<frame index="9" delay="150"/>
+		</animation>
+		<animation direction="right">
+			<frame index="18" delay="150"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="27" end="31" delay="150"/>
+		</animation>
+		<animation direction="left">
+			<sequence start="0" end="4" delay="150"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="9" end="13" delay="150"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="18" end="22" delay="150"/>
+		</animation>
+	</action>
+
+
+	<action name="dead" imageset="base">
+		<animation direction="right">
+			<frame index="26" delay="0"/>
+		</animation>
+		<animation direction="down">
+			<frame index="35" delay="0"/>
+		</animation>
+		<animation direction="left">
+			<frame index="8" delay="0"/>
+		</animation>
+		<animation direction="up">
+			<frame index="17" delay="0"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="32" end="34" delay="150"/>		</animation>
+		<animation direction="left">
+			<sequence start="5" end="7" delay="150"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="14" end="16" delay="150"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="23" end="25" delay="150"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/monster-lizard.png b/graphics/sprites/monsters/lizard.png
index a5fc6edd..a5fc6edd 100644
--- a/graphics/sprites/monsters/monster-lizard.png
+++ b/graphics/sprites/monsters/lizard.png
diff --git a/graphics/sprites/monsters/monster-lizard.xml b/graphics/sprites/monsters/lizard.xml
index ec0dfeab..d3bf2964 100644
--- a/graphics/sprites/monsters/monster-lizard.xml
+++ b/graphics/sprites/monsters/lizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-lizard.png|W" width="80" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/lizard.png|W" width="80" height="56" />
 
 
 <action name="stand" imageset="base">
diff --git a/graphics/sprites/monsters/monster-logmonster.png b/graphics/sprites/monsters/logmonster.png
index 183faf69..183faf69 100644
--- a/graphics/sprites/monsters/monster-logmonster.png
+++ b/graphics/sprites/monsters/logmonster.png
diff --git a/graphics/sprites/monsters/monster-logmonster.xml b/graphics/sprites/monsters/logmonster.xml
index 664e9301..65b10bcb 100644
--- a/graphics/sprites/monsters/monster-logmonster.xml
+++ b/graphics/sprites/monsters/logmonster.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/monster-logmonster.png" width="45" height="43" />
+  <imageset name="base" src="graphics/sprites/monsters/logmonster.png" width="45" height="43" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" delay="100" />
@@ -64,4 +64,4 @@
       <end />
     </animation>
   </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-maggot-giant.png b/graphics/sprites/monsters/maggot-giant.png
index a9bf0fb7..a9bf0fb7 100644
--- a/graphics/sprites/monsters/monster-maggot-giant.png
+++ b/graphics/sprites/monsters/maggot-giant.png
diff --git a/graphics/sprites/monsters/monster-maggot-giant.xml b/graphics/sprites/monsters/maggot-giant.xml
index a4f77936..77e14bb2 100644
--- a/graphics/sprites/monsters/monster-maggot-giant.xml
+++ b/graphics/sprites/monsters/maggot-giant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-maggot-giant.png" width="58" height="46" />
+	<imageset name="base" src="graphics/sprites/monsters/maggot-giant.png" width="58" height="46" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-maggot.png b/graphics/sprites/monsters/maggot.png
index 64474f94..64474f94 100644
--- a/graphics/sprites/monsters/monster-maggot.png
+++ b/graphics/sprites/monsters/maggot.png
diff --git a/graphics/sprites/monsters/monster-maggot.xml b/graphics/sprites/monsters/maggot.xml
index f603b8db..da1d2a22 100644
--- a/graphics/sprites/monsters/monster-maggot.xml
+++ b/graphics/sprites/monsters/maggot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-maggot.png" width="20" height="15" />
+	<imageset name="base" src="graphics/sprites/monsters/maggot.png" width="20" height="15" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -63,4 +63,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-moggun.png b/graphics/sprites/monsters/moggun.png
index 9645ff0c..9645ff0c 100644
--- a/graphics/sprites/monsters/monster-moggun.png
+++ b/graphics/sprites/monsters/moggun.png
diff --git a/graphics/sprites/monsters/monster-moggun.xml b/graphics/sprites/monsters/moggun.xml
index 36b0708f..ff9125a6 100644
--- a/graphics/sprites/monsters/monster-moggun.xml
+++ b/graphics/sprites/monsters/moggun.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-moggun.png" width="77" height="76" />
+	<imageset name="base" src="graphics/sprites/monsters/moggun.png" width="77" height="76" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-element-ball.png b/graphics/sprites/monsters/monster-element-ball.png
deleted file mode 100644
index 9d28f45a..00000000
--- a/graphics/sprites/monsters/monster-element-ball.png
+++ /dev/null
diff --git a/graphics/sprites/monsters/monster-skeleton.xml b/graphics/sprites/monsters/monster-skeleton.xml
deleted file mode 100644
index 1eef0ca5..00000000
--- a/graphics/sprites/monsters/monster-skeleton.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/monsters/monster-skeleton.png|W" width="64" height="64" />
-
-	<include file="player_male_base_old.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/monsters/monster-yeti.png b/graphics/sprites/monsters/monster-yeti.png
deleted file mode 100644
index 0fa41948..00000000
--- a/graphics/sprites/monsters/monster-yeti.png
+++ /dev/null
diff --git a/graphics/sprites/monsters/monster-mouboo.png b/graphics/sprites/monsters/mouboo.png
index 813176bf..813176bf 100644
--- a/graphics/sprites/monsters/monster-mouboo.png
+++ b/graphics/sprites/monsters/mouboo.png
diff --git a/graphics/sprites/monsters/monster-mouboo.xml b/graphics/sprites/monsters/mouboo.xml
index 3ab9c3ba..38e65be4 100644
--- a/graphics/sprites/monsters/monster-mouboo.xml
+++ b/graphics/sprites/monsters/mouboo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-mouboo.png" width="80" height="80" />
+	<imageset name="base" src="graphics/sprites/monsters/mouboo.png" width="80" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-mushroom-red.png b/graphics/sprites/monsters/mushroom-red.png
index 743d83e7..743d83e7 100644
--- a/graphics/sprites/monsters/monster-mushroom-red.png
+++ b/graphics/sprites/monsters/mushroom-red.png
diff --git a/graphics/sprites/monsters/monster-mushroom-red.xml b/graphics/sprites/monsters/mushroom-red.xml
index 1e2876a3..f8e152ba 100644
--- a/graphics/sprites/monsters/monster-mushroom-red.xml
+++ b/graphics/sprites/monsters/mushroom-red.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-red.png" width="42" height="33" />
+	<imageset name="base" src="graphics/sprites/monsters/mushroom-red.png" width="42" height="33" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-mushroom-spiky.png b/graphics/sprites/monsters/mushroom-spiky.png
index 78ac875d..78ac875d 100644
--- a/graphics/sprites/monsters/monster-mushroom-spiky.png
+++ b/graphics/sprites/monsters/mushroom-spiky.png
diff --git a/graphics/sprites/monsters/monster-mushroom-spiky.xml b/graphics/sprites/monsters/mushroom-spiky.xml
index 514704a5..0e57cc55 100644
--- a/graphics/sprites/monsters/monster-mushroom-spiky.xml
+++ b/graphics/sprites/monsters/mushroom-spiky.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-spiky.png" width="42" height="40" />
+	<imageset name="base" src="graphics/sprites/monsters/mushroom-spiky.png" width="42" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-pinkie.png b/graphics/sprites/monsters/pinkie.png
index ec5ae768..ec5ae768 100644
--- a/graphics/sprites/monsters/monster-pinkie.png
+++ b/graphics/sprites/monsters/pinkie.png
diff --git a/graphics/sprites/monsters/monster-pinkie.xml b/graphics/sprites/monsters/pinkie.xml
index a080ea3e..03aa2ef5 100644
--- a/graphics/sprites/monsters/monster-pinkie.xml
+++ b/graphics/sprites/monsters/pinkie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-pinkie.png" width="50" height="42" />
+	<imageset name="base" src="graphics/sprites/monsters/pinkie.png" width="50" height="42" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/resource-plant.png b/graphics/sprites/monsters/plant.png
index 04bb0490..04bb0490 100644
--- a/graphics/sprites/resource-plant.png
+++ b/graphics/sprites/monsters/plant.png
diff --git a/graphics/sprites/resource-plant.xml b/graphics/sprites/monsters/plant.xml
index c61ccbcd..778f12f8 100644
--- a/graphics/sprites/resource-plant.xml
+++ b/graphics/sprites/monsters/plant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/resource-plant.png|W" width="46" height="42" />
+	<imageset name="base" src="graphics/sprites/monsters/plant.png|W" width="46" height="42" />
 
 	<action name="stand" imageset="base">
 		<animation>
@@ -15,4 +15,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/resource-pumpkin.png b/graphics/sprites/monsters/pumpkin.png
index 011b097b..011b097b 100644
--- a/graphics/sprites/resource-pumpkin.png
+++ b/graphics/sprites/monsters/pumpkin.png
diff --git a/graphics/sprites/resource-pumpkin.xml b/graphics/sprites/monsters/pumpkin.xml
index 2e51a847..544b6b95 100644
--- a/graphics/sprites/resource-pumpkin.xml
+++ b/graphics/sprites/monsters/pumpkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-    <imageset name="base" src="graphics/sprites/resource-pumpkin.png" width="50" height="50" />
+    <imageset name="base" src="graphics/sprites/monsters/pumpkin.png" width="50" height="50" />
 
     <action name="stand" imageset="base">
         <animation>
diff --git a/graphics/sprites/monsters/monster-reaper.png b/graphics/sprites/monsters/reaper.png
index 2e5de375..2e5de375 100755..100644
--- a/graphics/sprites/monsters/monster-reaper.png
+++ b/graphics/sprites/monsters/reaper.png
diff --git a/graphics/sprites/monsters/monster-reaper.xml b/graphics/sprites/monsters/reaper.xml
index b098a750..00f667c7 100755..100644
--- a/graphics/sprites/monsters/monster-reaper.xml
+++ b/graphics/sprites/monsters/reaper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-reaper.png" width="100" height="100" />
+	<imageset name="base" src="graphics/sprites/monsters/reaper.png" width="100" height="100" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -102,4 +102,4 @@
 		</animation>
 	</action>
 	
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-scorpion.png b/graphics/sprites/monsters/scorpion.png
index 0bd693fd..0bd693fd 100644
--- a/graphics/sprites/monsters/monster-scorpion.png
+++ b/graphics/sprites/monsters/scorpion.png
diff --git a/graphics/sprites/monsters/monster-scorpion.xml b/graphics/sprites/monsters/scorpion.xml
index ab1986a3..120bc5e1 100644
--- a/graphics/sprites/monsters/monster-scorpion.xml
+++ b/graphics/sprites/monsters/scorpion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-scorpion.png|W" width="48" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/scorpion.png|W" width="48" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/serqet.png b/graphics/sprites/monsters/serqet.png
new file mode 100644
index 00000000..3432dcf4
--- /dev/null
+++ b/graphics/sprites/monsters/serqet.png
diff --git a/graphics/sprites/monsters/serqet.xml b/graphics/sprites/monsters/serqet.xml
new file mode 100644
index 00000000..5c80fd92
--- /dev/null
+++ b/graphics/sprites/monsters/serqet.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monsters/serqet.png" width="60" height="47" />
+
+	<action name="stand" imageset="base">
+	<animation direction="down">
+		  <frame index="22" delay="1000" />
+		  <frame index="23" delay="100" />
+		</animation>
+		<animation direction="left">
+		  <frame index="11" delay="1000" />
+		  <frame index="12" delay="100" />
+		</animation>
+		<animation direction="up">
+		  <frame index="33" delay="1000" />
+		  <frame index="34" delay="100" />
+		</animation>
+		<animation direction="right">
+		  <frame index="0" delay="1000" />
+		  <frame index="1" delay="100" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+				<animation direction="down">
+			<sequence start="24" end="27" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="13" end="16" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="35" end="38" delay="75"  />
+		</animation>
+		<animation direction="right">
+			<sequence start="2" end="5" delay="75" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+			<sequence start="30" end="32" delay="500" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="21" delay="500" />
+		</animation>
+		<animation direction="up">
+			<sequence start="41" end="43" delay="500" />
+		</animation>
+		<animation direction="right">
+			<sequence start="8" end="10" delay="500" />
+		</animation>
+
+	</action>
+
+	<action name="attack" imageset="base">
+	<animation direction="down">
+			<sequence start="28" end="29" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="left">
+
+			<sequence start="17" end="18" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="39" end="40" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="6" end="7" delay="75" />
+
+		  	<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/monster-silkworm.png b/graphics/sprites/monsters/silkworm.png
index b5a78964..b5a78964 100644
--- a/graphics/sprites/monsters/monster-silkworm.png
+++ b/graphics/sprites/monsters/silkworm.png
diff --git a/graphics/sprites/monsters/monster-silkworm.xml b/graphics/sprites/monsters/silkworm.xml
index c1388bae..6fdeca04 100644
--- a/graphics/sprites/monsters/monster-silkworm.xml
+++ b/graphics/sprites/monsters/silkworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-silkworm.png|W;R" width="32" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/silkworm.png|W;R" width="32" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-skeleton.png b/graphics/sprites/monsters/skeleton.png
index 53438cf3..53438cf3 100644
--- a/graphics/sprites/monsters/monster-skeleton.png
+++ b/graphics/sprites/monsters/skeleton.png
diff --git a/graphics/sprites/monsters/skeleton.xml b/graphics/sprites/monsters/skeleton.xml
new file mode 100644
index 00000000..cd8fe678
--- /dev/null
+++ b/graphics/sprites/monsters/skeleton.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monsters/skeleton.png|W" width="64" height="64" />
+
+	<include file="player_male_base_old.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/monsters/monster-skull-fire.png b/graphics/sprites/monsters/skull-fire.png
index 843a7a5f..843a7a5f 100644
--- a/graphics/sprites/monsters/monster-skull-fire.png
+++ b/graphics/sprites/monsters/skull-fire.png
diff --git a/graphics/sprites/monsters/monster-skull-fire.xml b/graphics/sprites/monsters/skull-fire.xml
index 44751124..97f26716 100644
--- a/graphics/sprites/monsters/monster-skull-fire.xml
+++ b/graphics/sprites/monsters/skull-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-skull-fire.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/skull-fire.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -52,4 +52,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/skull-ice.png b/graphics/sprites/monsters/skull-ice.png
new file mode 100644
index 00000000..dcc66922
--- /dev/null
+++ b/graphics/sprites/monsters/skull-ice.png
diff --git a/graphics/sprites/monsters/skull-ice.xml b/graphics/sprites/monsters/skull-ice.xml
new file mode 100644
index 00000000..92651925
--- /dev/null
+++ b/graphics/sprites/monsters/skull-ice.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/monsters/skull-ice.png" width="45" height="60" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" delay="350" />
+		  <frame index="1" delay="350" />
+		</animation>
+		<animation direction="left">
+		  <frame index="12" delay="350" />
+		  <frame index="13" delay="350" />
+		</animation>
+		<animation direction="up">
+		  <frame index="24" delay="350" />
+		  <frame index="25" delay="350" />
+		</animation>
+		<animation direction="right">
+		  <frame index="36" delay="350" />
+		  <frame index="37" delay="350" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="0" end="4" delay="150" />
+		</animation>
+		<animation direction="left">
+			<sequence start="12" end="16" delay="150" />
+		</animation>
+		<animation direction="up">
+			<sequence start="24" end="28" delay="150" />
+		</animation>
+		<animation direction="right">
+			<sequence start="36" end="40" delay="150" />
+		</animation>
+	</action>
+
+
+	<action name="dead" imageset="base">
+		<animation direction="right">
+		<sequence start="44" end="46" delay="150" />
+		<frame index="47" delay="0" />
+		</animation>
+		<animation direction="down">
+		<sequence start="8" end="10" delay="150" />
+		<frame index="11" delay="0" />
+		</animation>
+		<animation direction="left">
+		<sequence start="20" end="22" delay="150" />
+		<frame index="23" delay="0" />
+		</animation>
+		<animation direction="up">
+		<sequence start="32" end="34" delay="150" />
+		<frame index="35" delay="0" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="5" end="7" delay="100" />
+		</animation>
+		<animation direction="left">
+			<sequence start="17" end="19" delay="100" />
+		</animation>
+		<animation direction="up">
+			<sequence start="29" end="31" delay="100" />
+		</animation>
+		<animation direction="right">
+			<sequence start="41" end="43" delay="100" />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/monster-skull-poison.png b/graphics/sprites/monsters/skull-poison.png
index 5d1b3a48..5d1b3a48 100644
--- a/graphics/sprites/monsters/monster-skull-poison.png
+++ b/graphics/sprites/monsters/skull-poison.png
diff --git a/graphics/sprites/monsters/monster-skull-poison.xml b/graphics/sprites/monsters/skull-poison.xml
index a769e74c..b2fe31e9 100644
--- a/graphics/sprites/monsters/monster-skull-poison.xml
+++ b/graphics/sprites/monsters/skull-poison.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-skull-poison.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/skull-poison.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -52,4 +52,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-slime.png b/graphics/sprites/monsters/slime.png
index ab14bbb5..ab14bbb5 100644
--- a/graphics/sprites/monsters/monster-slime.png
+++ b/graphics/sprites/monsters/slime.png
diff --git a/graphics/sprites/monsters/monster-slime.xml b/graphics/sprites/monsters/slime.xml
index 220a8e25..1940157d 100644
--- a/graphics/sprites/monsters/monster-slime.xml
+++ b/graphics/sprites/monsters/slime.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-slime.png|W" width="52" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/slime.png|W" width="52" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation>
diff --git a/graphics/sprites/monsters/monster-snail.png b/graphics/sprites/monsters/snail.png
index 2e974de2..2e974de2 100644
--- a/graphics/sprites/monsters/monster-snail.png
+++ b/graphics/sprites/monsters/snail.png
diff --git a/graphics/sprites/monsters/monster-snail.xml b/graphics/sprites/monsters/snail.xml
index 530345ed..efa46dba 100644
--- a/graphics/sprites/monsters/monster-snail.xml
+++ b/graphics/sprites/monsters/snail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-snail.png|W:#FDC689;R:#E0A6E3;Y:#E0A6E3;G:#F06EAA;C:#C69C6D;B:#A9FF02" width="50" height="50" />
+	<imageset name="base" src="graphics/sprites/monsters/snail.png|W:#FDC689;R:#E0A6E3;Y:#E0A6E3;G:#F06EAA;C:#C69C6D;B:#A9FF02" width="50" height="50" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-snake-cave.png b/graphics/sprites/monsters/snake-cave.png
index ea4045d1..ea4045d1 100644
--- a/graphics/sprites/monsters/monster-snake-cave.png
+++ b/graphics/sprites/monsters/snake-cave.png
diff --git a/graphics/sprites/monsters/monster-snake-cave.xml b/graphics/sprites/monsters/snake-cave.xml
index e7140451..4cffbb8d 100644
--- a/graphics/sprites/monsters/monster-snake-cave.xml
+++ b/graphics/sprites/monsters/snake-cave.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-snake-cave.png" width="96" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/snake-cave.png" width="96" height="56" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -75,4 +75,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-snake.png b/graphics/sprites/monsters/snake.png
index 2164d69b..2164d69b 100644
--- a/graphics/sprites/monsters/monster-snake.png
+++ b/graphics/sprites/monsters/snake.png
diff --git a/graphics/sprites/monsters/monster-snake.xml b/graphics/sprites/monsters/snake.xml
index 027242f3..af59e4ae 100644
--- a/graphics/sprites/monsters/monster-snake.xml
+++ b/graphics/sprites/monsters/snake.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-snake.png|W" width="48" height="29" />
+	<imageset name="base" src="graphics/sprites/monsters/snake.png|W" width="48" height="29" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-spider.png b/graphics/sprites/monsters/spider.png
index b6f455a8..b6f455a8 100644
--- a/graphics/sprites/monsters/monster-spider.png
+++ b/graphics/sprites/monsters/spider.png
diff --git a/graphics/sprites/monsters/monster-spider.xml b/graphics/sprites/monsters/spider.xml
index 4fc336d5..ad0cde1a 100644
--- a/graphics/sprites/monsters/monster-spider.xml
+++ b/graphics/sprites/monsters/spider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-spider.png|W;R" width="35" height="35" />
+	<imageset name="base" src="graphics/sprites/monsters/spider.png|W;R" width="35" height="35" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-spinning-scythe.png b/graphics/sprites/monsters/spinning-scythe.png
index 1c5e0b45..1c5e0b45 100755..100644
--- a/graphics/sprites/monsters/monster-spinning-scythe.png
+++ b/graphics/sprites/monsters/spinning-scythe.png
diff --git a/graphics/sprites/monsters/monster-spinning-scythe.xml b/graphics/sprites/monsters/spinning-scythe.xml
index ede84840..5f3cfa60 100755..100644
--- a/graphics/sprites/monsters/monster-spinning-scythe.xml
+++ b/graphics/sprites/monsters/spinning-scythe.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-spinning-scythe.png" width="100" height="100" />
+	<imageset name="base" src="graphics/sprites/monsters/spinning-scythe.png" width="100" height="100" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
@@ -35,4 +35,4 @@
 		</animation>
 	</action>
 	
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-squirrel.png b/graphics/sprites/monsters/squirrel.png
index 0a1f1d36..0a1f1d36 100644
--- a/graphics/sprites/monsters/monster-squirrel.png
+++ b/graphics/sprites/monsters/squirrel.png
diff --git a/graphics/sprites/monsters/monster-squirrel.xml b/graphics/sprites/monsters/squirrel.xml
index 478e611a..d138b97a 100644
--- a/graphics/sprites/monsters/monster-squirrel.xml
+++ b/graphics/sprites/monsters/squirrel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/monster-squirrel.png" width="32" height="32" />
+  <imageset name="base" src="graphics/sprites/monsters/squirrel.png" width="32" height="32" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <sequence start="16" end="19" delay="375" />
diff --git a/graphics/sprites/monsters/monster-terranite-mask.png b/graphics/sprites/monsters/terranite-mask.png
index 3ec1653b..3ec1653b 100644
--- a/graphics/sprites/monsters/monster-terranite-mask.png
+++ b/graphics/sprites/monsters/terranite-mask.png
diff --git a/graphics/sprites/monsters/monster-terranite-mask.xml b/graphics/sprites/monsters/terranite-mask.xml
index f60b3819..46818d81 100644
--- a/graphics/sprites/monsters/monster-terranite-mask.xml
+++ b/graphics/sprites/monsters/terranite-mask.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-terranite-mask.png" width="19" height="28"/>
+	<imageset name="base" src="graphics/sprites/monsters/terranite-mask.png" width="19" height="28"/>
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-terranite.png b/graphics/sprites/monsters/terranite.png
index 77f808b2..77f808b2 100644
--- a/graphics/sprites/monsters/monster-terranite.png
+++ b/graphics/sprites/monsters/terranite.png
diff --git a/graphics/sprites/monsters/monster-terranite.xml b/graphics/sprites/monsters/terranite.xml
index 7c0a287b..4a3e8c8e 100644
--- a/graphics/sprites/monsters/monster-terranite.xml
+++ b/graphics/sprites/monsters/terranite.xml
@@ -2,7 +2,7 @@
 <sprite>
 
 	<imageset name="base" 
-		src=      "graphics/sprites/monsters/monster-terranite.png" 
+		src=      "graphics/sprites/monsters/terranite.png" 
 		width=    "64" 
 		height=   "64" 
 	/>
diff --git a/graphics/sprites/monsters/monster-vampire-bat.png b/graphics/sprites/monsters/vampire-bat.png
index 1e92e9ba..1e92e9ba 100644
--- a/graphics/sprites/monsters/monster-vampire-bat.png
+++ b/graphics/sprites/monsters/vampire-bat.png
diff --git a/graphics/sprites/monsters/monster-bat.xml b/graphics/sprites/monsters/vampire-bat.xml
index 66a3ced2..73102034 100644
--- a/graphics/sprites/monsters/monster-bat.xml
+++ b/graphics/sprites/monsters/vampire-bat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-bat.png" width="37" height="58" />
+	<imageset name="base" src="graphics/sprites/monsters/vampire-bat.png" width="37" height="58" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -52,4 +52,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/vespa.png b/graphics/sprites/monsters/vespa.png
new file mode 100644
index 00000000..69b9749a
--- /dev/null
+++ b/graphics/sprites/monsters/vespa.png
diff --git a/graphics/sprites/monsters/vespa.xml b/graphics/sprites/monsters/vespa.xml
new file mode 100644
index 00000000..47120d86
--- /dev/null
+++ b/graphics/sprites/monsters/vespa.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/monsters/vespa.png|R;G" width="65" height="75" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="60"/>
+		</animation>
+		<animation direction="left">
+			<sequence start="26" end="30" delay="60"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="39" end="43" delay="60"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="0" end="4" delay="60"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="20" delay="65"/>
+		</animation>
+		<animation direction="left">
+			<sequence start="26" end="33" delay="65"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="39" end="46" delay="65"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="0" end="7" delay="65"/>
+		</animation>
+	</action>
+
+
+	<action name="dead" imageset="base">
+		<animation direction="right">
+			<frame index="12" delay="0"/>
+		</animation>
+		<animation direction="down">
+			<frame index="25" delay="0"/>
+		</animation>
+		<animation direction="left">
+			<frame index="38" delay="0"/>
+		</animation>
+		<animation direction="up">
+			<frame index="51" delay="0"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="21" end="24" delay="65"/>
+		</animation>
+		<animation direction="left">
+			<sequence start="34" end="37" delay="65"/>
+		</animation>
+		<animation direction="up">
+			<sequence start="47" end="50" delay="65"/>
+		</animation>
+		<animation direction="right">
+			<sequence start="8" end="11" delay="65"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/monster-wisp.png b/graphics/sprites/monsters/wisp.png
index c0641cae..c0641cae 100644
--- a/graphics/sprites/monsters/monster-wisp.png
+++ b/graphics/sprites/monsters/wisp.png
diff --git a/graphics/sprites/monsters/monster-wisp.xml b/graphics/sprites/monsters/wisp.xml
index 4ca542b3..68bb72dc 100644
--- a/graphics/sprites/monsters/monster-wisp.xml
+++ b/graphics/sprites/monsters/wisp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-wisp.png|W" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/wisp.png|W" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
@@ -74,4 +74,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/yeti.png b/graphics/sprites/monsters/yeti.png
new file mode 100644
index 00000000..5ccfe7b7
--- /dev/null
+++ b/graphics/sprites/monsters/yeti.png
diff --git a/graphics/sprites/monsters/monster-yeti.xml b/graphics/sprites/monsters/yeti.xml
index ee021a0c..817bcee8 100644
--- a/graphics/sprites/monsters/monster-yeti.xml
+++ b/graphics/sprites/monsters/yeti.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-yeti.png" width="80" height="80" />
+	<imageset name="base" src="graphics/sprites/monsters/yeti.png" width="80" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
-		  <frame index="3" delay="150"/>
-		  <frame index="4" delay="150"/>
+		  <frame index="3" delay="250"/>
+		  <frame index="4" delay="250"/>
 		</animation>
 		<animation>
-		  <frame index="10" delay="150"/>
-		  <frame index="11" delay="150"/>
+		  <frame index="10" delay="250"/>
+		  <frame index="11" delay="250"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="31" delay="150"/>
-		  <frame index="34" delay="150"/>
-		  <frame index="35" delay="150"/>
+		  <frame index="31" delay="250"/>
+		  <frame index="34" delay="250"/>
+		  <frame index="35" delay="250"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="20" delay="150"/>
-		  <frame index="21" delay="150"/>
+		  <frame index="20" delay="250"/>
+		  <frame index="21" delay="250"/>
 		</animation>
 	</action>
 
 	<action name="walk" imageset="base">
 		<animation direction="down">
-			<sequence start="1" end="4" delay="100" />
+			<sequence start="1" end="4" delay="160" />
 		</animation>
 		<animation direction="left">
-			<sequence start="11" end="14" delay="100" />
+			<sequence start="11" end="14" delay="160" />
 		</animation>
 		<animation direction="up">
-			<sequence start="31" end="34" delay="100" />
+			<sequence start="31" end="34" delay="160" />
 		</animation>
 		<animation direction="right">
-			<sequence start="21" end="24" delay="100" />
+			<sequence start="21" end="24" delay="160" />
 		</animation>
 	</action>
 
@@ -55,20 +55,16 @@
 
 	<action name="attack" imageset="base">
 		<animation direction="down">
-			<sequence start="5" end="8" delay="175" />
-		  	<end />
+			<sequence start="5" end="8" delay="105" />
 		</animation>
 		<animation direction="left">
-			<sequence start="15" end="18" delay="175" />
-		  	<end />
+			<sequence start="15" end="18" delay="105" />
 		</animation>
 		<animation direction="up">
-			<sequence start="35" end="38" delay="175" />
-		  	<end />
+			<sequence start="35" end="38" delay="105" />
 		</animation>
 		<animation direction="right">
-			<sequence start="25" end="28" delay="175" />
-		  	<end />
+			<sequence start="25" end="28" delay="105" />
 		</animation>
 	</action>
 
diff --git a/graphics/sprites/monsters/monster-zombie.png b/graphics/sprites/monsters/zombie.png
index bf1f1818..bf1f1818 100644
--- a/graphics/sprites/monsters/monster-zombie.png
+++ b/graphics/sprites/monsters/zombie.png
diff --git a/graphics/sprites/monsters/monster-zombie.xml b/graphics/sprites/monsters/zombie.xml
index bb930af7..fda5fff7 100644
--- a/graphics/sprites/monsters/monster-zombie.xml
+++ b/graphics/sprites/monsters/zombie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-zombie.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/zombie.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/npcs/npc-beerguyghost.png b/graphics/sprites/npcs/npc-beerguyghost.png
index c45cdb7b..c45cdb7b 100755..100644
--- a/graphics/sprites/npcs/npc-beerguyghost.png
+++ b/graphics/sprites/npcs/npc-beerguyghost.png
diff --git a/graphics/sprites/npcs/npc-beerguyghost.xml b/graphics/sprites/npcs/npc-beerguyghost.xml
index ab73c8fb..ab73c8fb 100755..100644
--- a/graphics/sprites/npcs/npc-beerguyghost.xml
+++ b/graphics/sprites/npcs/npc-beerguyghost.xml
diff --git a/graphics/sprites/npcs/npc-casket.xml b/graphics/sprites/npcs/npc-casket.xml
index cc81923c..cc81923c 100755..100644
--- a/graphics/sprites/npcs/npc-casket.xml
+++ b/graphics/sprites/npcs/npc-casket.xml
diff --git a/graphics/sprites/npcs/npc-chronos.png b/graphics/sprites/npcs/npc-chronos.png
index ac4abf17..ac4abf17 100755..100644
--- a/graphics/sprites/npcs/npc-chronos.png
+++ b/graphics/sprites/npcs/npc-chronos.png
diff --git a/graphics/sprites/npcs/npc-chronos.xml b/graphics/sprites/npcs/npc-chronos.xml
index 58f7e378..58f7e378 100755..100644
--- a/graphics/sprites/npcs/npc-chronos.xml
+++ b/graphics/sprites/npcs/npc-chronos.xml
diff --git a/graphics/sprites/npcs/npc-cryingchild.png b/graphics/sprites/npcs/npc-cryingchild.png
index d9c33acd..d9c33acd 100755..100644
--- a/graphics/sprites/npcs/npc-cryingchild.png
+++ b/graphics/sprites/npcs/npc-cryingchild.png
diff --git a/graphics/sprites/npcs/npc-cryingchild.xml b/graphics/sprites/npcs/npc-cryingchild.xml
index c5a15567..c5a15567 100755..100644
--- a/graphics/sprites/npcs/npc-cryingchild.xml
+++ b/graphics/sprites/npcs/npc-cryingchild.xml
diff --git a/graphics/sprites/npcs/npc-dice.png b/graphics/sprites/npcs/npc-dice.png
index ddc3c47b..ddc3c47b 100755..100644
--- a/graphics/sprites/npcs/npc-dice.png
+++ b/graphics/sprites/npcs/npc-dice.png
diff --git a/graphics/sprites/npcs/npc-dice.xml b/graphics/sprites/npcs/npc-dice.xml
index ee2e031a..ee2e031a 100755..100644
--- a/graphics/sprites/npcs/npc-dice.xml
+++ b/graphics/sprites/npcs/npc-dice.xml
diff --git a/graphics/sprites/npcs/npc-gate-closed.xml b/graphics/sprites/npcs/npc-gate-closed.xml
index 786cdded..786cdded 100755..100644
--- a/graphics/sprites/npcs/npc-gate-closed.xml
+++ b/graphics/sprites/npcs/npc-gate-closed.xml
diff --git a/graphics/sprites/npcs/npc-gate-open.xml b/graphics/sprites/npcs/npc-gate-open.xml
index 6445c4fd..6445c4fd 100755..100644
--- a/graphics/sprites/npcs/npc-gate-open.xml
+++ b/graphics/sprites/npcs/npc-gate-open.xml
diff --git a/graphics/sprites/npcs/npc-gate_224x192.png b/graphics/sprites/npcs/npc-gate_224x192.png
index 6fcbfd8c..6fcbfd8c 100755..100644
--- a/graphics/sprites/npcs/npc-gate_224x192.png
+++ b/graphics/sprites/npcs/npc-gate_224x192.png
diff --git a/graphics/sprites/npcs/npc-ghostinnkeeper.png b/graphics/sprites/npcs/npc-ghostinnkeeper.png
index 4e98964e..4e98964e 100755..100644
--- a/graphics/sprites/npcs/npc-ghostinnkeeper.png
+++ b/graphics/sprites/npcs/npc-ghostinnkeeper.png
diff --git a/graphics/sprites/npcs/npc-ghostinnkeeper.xml b/graphics/sprites/npcs/npc-ghostinnkeeper.xml
index 91eb8d42..91eb8d42 100755..100644
--- a/graphics/sprites/npcs/npc-ghostinnkeeper.xml
+++ b/graphics/sprites/npcs/npc-ghostinnkeeper.xml
diff --git a/graphics/sprites/npcs/npc-guard.png b/graphics/sprites/npcs/npc-guard.png
index 96318851..96318851 100755..100644
--- a/graphics/sprites/npcs/npc-guard.png
+++ b/graphics/sprites/npcs/npc-guard.png
diff --git a/graphics/sprites/npcs/npc-guard.xml b/graphics/sprites/npcs/npc-guard.xml
index c5201658..c5201658 100755..100644
--- a/graphics/sprites/npcs/npc-guard.xml
+++ b/graphics/sprites/npcs/npc-guard.xml
diff --git a/graphics/sprites/npcs/npc-headhang.png b/graphics/sprites/npcs/npc-headhang.png
index 28f6419c..28f6419c 100755..100644
--- a/graphics/sprites/npcs/npc-headhang.png
+++ b/graphics/sprites/npcs/npc-headhang.png
diff --git a/graphics/sprites/npcs/npc-headhang.xml b/graphics/sprites/npcs/npc-headhang.xml
index 0e50b1d8..0e50b1d8 100755..100644
--- a/graphics/sprites/npcs/npc-headhang.xml
+++ b/graphics/sprites/npcs/npc-headhang.xml
diff --git a/graphics/sprites/npcs/npc-headless.png b/graphics/sprites/npcs/npc-headless.png
index aa1913b8..aa1913b8 100755..100644
--- a/graphics/sprites/npcs/npc-headless.png
+++ b/graphics/sprites/npcs/npc-headless.png
diff --git a/graphics/sprites/npcs/npc-headless.xml b/graphics/sprites/npcs/npc-headless.xml
index ee3ce700..ee3ce700 100755..100644
--- a/graphics/sprites/npcs/npc-headless.xml
+++ b/graphics/sprites/npcs/npc-headless.xml
diff --git a/graphics/sprites/npcs/npc-lightman.png b/graphics/sprites/npcs/npc-lightman.png
index 21763b94..21763b94 100755..100644
--- a/graphics/sprites/npcs/npc-lightman.png
+++ b/graphics/sprites/npcs/npc-lightman.png
diff --git a/graphics/sprites/npcs/npc-lightman.xml b/graphics/sprites/npcs/npc-lightman.xml
index fc42aab0..fc42aab0 100755..100644
--- a/graphics/sprites/npcs/npc-lightman.xml
+++ b/graphics/sprites/npcs/npc-lightman.xml
diff --git a/graphics/sprites/npcs/npc-receptionist.png b/graphics/sprites/npcs/npc-receptionist.png
index f5a95ca4..f5a95ca4 100755..100644
--- a/graphics/sprites/npcs/npc-receptionist.png
+++ b/graphics/sprites/npcs/npc-receptionist.png
diff --git a/graphics/sprites/npcs/npc-receptionist.xml b/graphics/sprites/npcs/npc-receptionist.xml
index 4bea215e..4bea215e 100755..100644
--- a/graphics/sprites/npcs/npc-receptionist.xml
+++ b/graphics/sprites/npcs/npc-receptionist.xml
diff --git a/graphics/sprites/npcs/npc-undeadbanker.png b/graphics/sprites/npcs/npc-undeadbanker.png
index c2a9930c..c2a9930c 100755..100644
--- a/graphics/sprites/npcs/npc-undeadbanker.png
+++ b/graphics/sprites/npcs/npc-undeadbanker.png
diff --git a/graphics/sprites/npcs/npc-undeadbanker.xml b/graphics/sprites/npcs/npc-undeadbanker.xml
index 3d050166..3d050166 100755..100644
--- a/graphics/sprites/npcs/npc-undeadbanker.xml
+++ b/graphics/sprites/npcs/npc-undeadbanker.xml
diff --git a/graphics/sprites/npcs/npc2.xml b/graphics/sprites/npcs/npc2.xml
index a6fbc68a..a6fbc68a 100755..100644
--- a/graphics/sprites/npcs/npc2.xml
+++ b/graphics/sprites/npcs/npc2.xml
diff --git a/graphics/sprites/npcs/npcs2.png b/graphics/sprites/npcs/npcs2.png
index 2f32ca80..7c4bf33c 100755..100644
--- a/graphics/sprites/npcs/npcs2.png
+++ b/graphics/sprites/npcs/npcs2.png
diff --git a/graphics/sprites/player_male_base.png b/graphics/sprites/player_male_base.png
index 57e66d9d..57e66d9d 100755..100644
--- a/graphics/sprites/player_male_base.png
+++ b/graphics/sprites/player_male_base.png
diff --git a/graphics/sprites/weapon-axe-blacksmith.png b/graphics/sprites/weapon-axe-blacksmith.png
index 7fe6cada..7fe6cada 100755..100644
--- a/graphics/sprites/weapon-axe-blacksmith.png
+++ b/graphics/sprites/weapon-axe-blacksmith.png
diff --git a/graphics/sprites/weapon-axe-blacksmith.xml b/graphics/sprites/weapon-axe-blacksmith.xml
index 6df37aeb..6df37aeb 100755..100644
--- a/graphics/sprites/weapon-axe-blacksmith.xml
+++ b/graphics/sprites/weapon-axe-blacksmith.xml
diff --git a/graphics/sprites/weapon-polearm-spear.png b/graphics/sprites/weapon-polearm-spear.png
index 7fe6cada..7fe6cada 100755..100644
--- a/graphics/sprites/weapon-polearm-spear.png
+++ b/graphics/sprites/weapon-polearm-spear.png
diff --git a/graphics/sprites/weapon-polearm-spear.xml b/graphics/sprites/weapon-polearm-spear.xml
index 26f93a7a..26f93a7a 100755..100644
--- a/graphics/sprites/weapon-polearm-spear.xml
+++ b/graphics/sprites/weapon-polearm-spear.xml
diff --git a/graphics/sprites/weapon-sword-sword.png b/graphics/sprites/weapon-sword-sword.png
index 7fe6cada..7fe6cada 100755..100644
--- a/graphics/sprites/weapon-sword-sword.png
+++ b/graphics/sprites/weapon-sword-sword.png
diff --git a/graphics/sprites/weapon-sword-sword.xml b/graphics/sprites/weapon-sword-sword.xml
index 9bed5068..9bed5068 100755..100644
--- a/graphics/sprites/weapon-sword-sword.xml
+++ b/graphics/sprites/weapon-sword-sword.xml