Merge branch 'master' of git@gitorious.org:tmwdata/mainline

100 files changed, 397 insertions, 83 deletions

diff --git a/graphics/images/spit23loginwallpaper_800x600.png b/graphics/images/spit23loginwallpaper_800x600.png
new file mode 100644
index 00000000..e3a6e492
--- /dev/null
+++ b/graphics/images/spit23loginwallpaper_800x600.png
diff --git a/graphics/items/armor-legs-miniskirt.png b/graphics/items/armor-legs-miniskirt.png
new file mode 100644
index 00000000..50a37ea1
--- /dev/null
+++ b/graphics/items/armor-legs-miniskirt.png
diff --git a/graphics/items/armor-feet-assassinboots.png b/graphics/items/equipment/feet/armor-feet-assassinboots.png
index f3a7db39..f3a7db39 100644
--- a/graphics/items/armor-feet-assassinboots.png
+++ b/graphics/items/equipment/feet/armor-feet-assassinboots.png
diff --git a/graphics/items/armor-feet-boots.png b/graphics/items/equipment/feet/armor-feet-boots.png
index 9f9913ff..9f9913ff 100644
--- a/graphics/items/armor-feet-boots.png
+++ b/graphics/items/equipment/feet/armor-feet-boots.png
diff --git a/graphics/items/armor-feet-furboots.png b/graphics/items/equipment/feet/armor-feet-furboots.png
index 6cb38f80..6cb38f80 100644
--- a/graphics/items/armor-feet-furboots.png
+++ b/graphics/items/equipment/feet/armor-feet-furboots.png
diff --git a/graphics/items/generic-redscorpionstinger.png b/graphics/items/generic-redscorpionstinger.png
deleted file mode 100644
index e2113243..00000000
--- a/graphics/items/generic-redscorpionstinger.png
+++ /dev/null
diff --git a/graphics/items/use-food-steak.png b/graphics/items/use-food-steak.png
index 46191a09..859600f4 100644
--- a/graphics/items/use-food-steak.png
+++ b/graphics/items/use-food-steak.png
diff --git a/graphics/sprites/feet-assassin-female.png b/graphics/sprites/equipment/feet/feet-assassin-female.png
index f44503f5..f44503f5 100644
--- a/graphics/sprites/feet-assassin-female.png
+++ b/graphics/sprites/equipment/feet/feet-assassin-female.png
diff --git a/graphics/sprites/equipment/feet/feet-assassin-female.xml b/graphics/sprites/equipment/feet/feet-assassin-female.xml
new file mode 100644
index 00000000..11535532
--- /dev/null
+++ b/graphics/sprites/equipment/feet/feet-assassin-female.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/feet/feet-assassin-female.png|R" width="64" height="64" />
+
+	<include file="equipment/feet/feet-boots-female.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/feet-assassin-male.png b/graphics/sprites/equipment/feet/feet-assassin-male.png
index 7b0422e4..7b0422e4 100644
--- a/graphics/sprites/feet-assassin-male.png
+++ b/graphics/sprites/equipment/feet/feet-assassin-male.png
diff --git a/graphics/sprites/equipment/feet/feet-assassin-male.xml b/graphics/sprites/equipment/feet/feet-assassin-male.xml
new file mode 100644
index 00000000..14871b72
--- /dev/null
+++ b/graphics/sprites/equipment/feet/feet-assassin-male.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/feet/feet-assassin-male.png|R" width="64" height="64" />
+
+	<include file="equipment/feet/feet-boots-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/feet-boots-female.png b/graphics/sprites/equipment/feet/feet-boots-female.png
index ba984324..ba984324 100644
--- a/graphics/sprites/feet-boots-female.png
+++ b/graphics/sprites/equipment/feet/feet-boots-female.png
diff --git a/graphics/sprites/equipment/feet/feet-boots-female.xml b/graphics/sprites/equipment/feet/feet-boots-female.xml
new file mode 100644
index 00000000..189d13d2
--- /dev/null
+++ b/graphics/sprites/equipment/feet/feet-boots-female.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/feet/feet-boots-female.png|W" width="64" height="64" />
+
+	<include file="equipment/feet/feet-boots-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/feet-boots-male.png b/graphics/sprites/equipment/feet/feet-boots-male.png
index f441c5b0..f441c5b0 100644
--- a/graphics/sprites/feet-boots-male.png
+++ b/graphics/sprites/equipment/feet/feet-boots-male.png
diff --git a/graphics/sprites/feet-boots-male.xml b/graphics/sprites/equipment/feet/feet-boots-male.xml
index 3e9f637b..2455c577 100644
--- a/graphics/sprites/feet-boots-male.xml
+++ b/graphics/sprites/equipment/feet/feet-boots-male.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 
-	<imageset name="base" src="graphics/sprites/feet-boots-male.png|W" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/equipment/feet/feet-boots-male.png|W" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/feet-furboots-female.png b/graphics/sprites/equipment/feet/feet-furboots-female.png
index 2199fb1d..2199fb1d 100644
--- a/graphics/sprites/feet-furboots-female.png
+++ b/graphics/sprites/equipment/feet/feet-furboots-female.png
diff --git a/graphics/sprites/equipment/feet/feet-furboots-female.xml b/graphics/sprites/equipment/feet/feet-furboots-female.xml
new file mode 100644
index 00000000..753e660a
--- /dev/null
+++ b/graphics/sprites/equipment/feet/feet-furboots-female.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/feet/feet-furboots-female.png" width="64" height="64" />
+
+	<include file="equipment/feet/feet-boots-female.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/feet-furboots-male.png b/graphics/sprites/equipment/feet/feet-furboots-male.png
index afc1ff3b..afc1ff3b 100644
--- a/graphics/sprites/feet-furboots-male.png
+++ b/graphics/sprites/equipment/feet/feet-furboots-male.png
diff --git a/graphics/sprites/equipment/feet/feet-furboots-male.xml b/graphics/sprites/equipment/feet/feet-furboots-male.xml
new file mode 100644
index 00000000..8965003d
--- /dev/null
+++ b/graphics/sprites/equipment/feet/feet-furboots-male.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/equipment/feet/feet-furboots-male.png" width="64" height="64" />
+
+	<include file="equipment/feet/feet-boots-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/feet-assassin-female.xml b/graphics/sprites/feet-assassin-female.xml
deleted file mode 100644
index 0efc9eba..00000000
--- a/graphics/sprites/feet-assassin-female.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/feet-assassin-female.png|R" width="64" height="64" />
-
-	<include file="feet-boots-female.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/feet-assassin-male.xml b/graphics/sprites/feet-assassin-male.xml
deleted file mode 100644
index 71aaff47..00000000
--- a/graphics/sprites/feet-assassin-male.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/feet-assassin-male.png|R" width="64" height="64" />
-
-	<include file="feet-boots-male.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/feet-boots-female.xml b/graphics/sprites/feet-boots-female.xml
deleted file mode 100644
index af5977c6..00000000
--- a/graphics/sprites/feet-boots-female.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/feet-boots-female.png|W" width="64" height="64" />
-
-	<include file="feet-boots-male.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/feet-furboots-female.xml b/graphics/sprites/feet-furboots-female.xml
deleted file mode 100644
index 9ce85793..00000000
--- a/graphics/sprites/feet-furboots-female.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/feet-furboots-female.png" width="64" height="64" />
-
-	<include file="feet-boots-female.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/feet-furboots-male.xml b/graphics/sprites/feet-furboots-male.xml
deleted file mode 100644
index 0b921506..00000000
--- a/graphics/sprites/feet-furboots-male.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/feet-furboots-male.png" width="64" height="64" />
-
-	<include file="feet-boots-male.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/leg-miniskirt-female.png b/graphics/sprites/leg-miniskirt-female.png
new file mode 100644
index 00000000..6854c228
--- /dev/null
+++ b/graphics/sprites/leg-miniskirt-female.png
diff --git a/graphics/sprites/leg-miniskirt-female.xml b/graphics/sprites/leg-miniskirt-female.xml
new file mode 100644
index 00000000..d608a9d2
--- /dev/null
+++ b/graphics/sprites/leg-miniskirt-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/leg-miniskirt-female.png|W" 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/leg-miniskirt-male.png b/graphics/sprites/leg-miniskirt-male.png
new file mode 100644
index 00000000..224c7cff
--- /dev/null
+++ b/graphics/sprites/leg-miniskirt-male.png
diff --git a/graphics/sprites/leg-miniskirt-male.xml b/graphics/sprites/leg-miniskirt-male.xml
new file mode 100644
index 00000000..8ef98201
--- /dev/null
+++ b/graphics/sprites/leg-miniskirt-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/leg-miniskirt-male.png|W" 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/monster-skeleton.xml b/graphics/sprites/monster-skeleton.xml
deleted file mode 100644
index 0c91c94f..00000000
--- a/graphics/sprites/monster-skeleton.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/monster-skeleton.png|W" width="64" height="64" />
-
-	<include file="player_male_base.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/monster-bat.png b/graphics/sprites/monsters/monster-bat.png
index f84a1f76..f84a1f76 100644
--- a/graphics/sprites/monster-bat.png
+++ b/graphics/sprites/monsters/monster-bat.png
diff --git a/graphics/sprites/monster-bat.xml b/graphics/sprites/monsters/monster-bat.xml
index f02ed109..66a3ced2 100644
--- a/graphics/sprites/monster-bat.xml
+++ b/graphics/sprites/monsters/monster-bat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-bat.png" width="37" height="58" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-bat.png" width="37" height="58" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-duck.png b/graphics/sprites/monsters/monster-duck.png
new file mode 100644
index 00000000..44319fb9
--- /dev/null
+++ b/graphics/sprites/monsters/monster-duck.png
diff --git a/graphics/sprites/monsters/monster-duck.xml b/graphics/sprites/monsters/monster-duck.xml
new file mode 100644
index 00000000..baf2dcfb
--- /dev/null
+++ b/graphics/sprites/monsters/monster-duck.xml
@@ -0,0 +1,70 @@
+<?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" />

+

+   <action name="stand" imageset="base">

+      <animation direction="down">

+        <frame index="0" />

+      </animation>

+      <animation direction="left">

+        <frame index="10" />

+      </animation>

+      <animation direction="up">

+        <frame index="20" />

+      </animation>

+      <animation direction="right">

+        <frame index="30" />

+      </animation>

+   </action>

+

+   <action name="walk" imageset="base">

+      <animation direction="down">

+         <sequence start="1" end="3" delay="75" />

+      </animation>

+      <animation direction="left">

+         <sequence start="11" end="13" delay="75" />

+      </animation>

+      <animation direction="up">

+         <sequence start="21" end="23" delay="75" />

+      </animation>

+      <animation direction="right">

+         <sequence start="31" end="33" delay="75" />

+      </animation>

+   </action>

+

+   <action name="dead" imageset="base">

+      <animation direction="down">

+        <frame index="9" />

+      </animation>

+      <animation direction="left">

+        <frame index="19" />

+      </animation>

+      <animation direction="up">

+        <frame index="29" />

+      </animation>

+      <animation direction="right">

+        <frame index="39" />

+      </animation>

+   </action>

+

+   <action name="attack" imageset="base">

+      <animation direction="down">

+         <sequence start="5" end="8" delay="75" />

+         <end />

+      </animation>

+      <animation direction="left">

+         <sequence start="15" end="18" delay="75" />

+         <end />

+      </animation>

+      <animation direction="up">

+         <sequence start="25" end="28" delay="75" />

+         <end />

+      </animation>

+      <animation direction="right">

+         <sequence start="35" end="38" delay="75" />

+         <end />

+      </animation>

+   </action>

+

+</sprite>

diff --git a/graphics/sprites/monster-flower.png b/graphics/sprites/monsters/monster-flower.png
index eeedd44a..eeedd44a 100644
--- a/graphics/sprites/monster-flower.png
+++ b/graphics/sprites/monsters/monster-flower.png
diff --git a/graphics/sprites/monster-flower.xml b/graphics/sprites/monsters/monster-flower.xml
index 8e9b36c8..9ac93f22 100644
--- a/graphics/sprites/monster-flower.xml
+++ b/graphics/sprites/monsters/monster-flower.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-flower.png" width="60" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-flower.png" width="60" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-fluffy.png b/graphics/sprites/monsters/monster-fluffy.png
index 8cb26d03..8cb26d03 100644
--- a/graphics/sprites/monster-fluffy.png
+++ b/graphics/sprites/monsters/monster-fluffy.png
diff --git a/graphics/sprites/monster-fluffy.xml b/graphics/sprites/monsters/monster-fluffy.xml
index a3eb8a2e..938051c7 100644
--- a/graphics/sprites/monster-fluffy.xml
+++ b/graphics/sprites/monsters/monster-fluffy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-fluffy.png" width="28" height="32" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-fluffy.png" width="28" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-ghost-pumpkin.png b/graphics/sprites/monsters/monster-ghost-pumpkin.png
index e464c885..e464c885 100644
--- a/graphics/sprites/monster-ghost-pumpkin.png
+++ b/graphics/sprites/monsters/monster-ghost-pumpkin.png
diff --git a/graphics/sprites/monster-ghost-pumpkin.xml b/graphics/sprites/monsters/monster-ghost-pumpkin.xml
index 0b1e9542..27aa7a9f 100644
--- a/graphics/sprites/monster-ghost-pumpkin.xml
+++ b/graphics/sprites/monsters/monster-ghost-pumpkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monster-ghost-pumpkin.png" width="60" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-ghost-pumpkin.png" width="60" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-goblin-fire.png b/graphics/sprites/monsters/monster-goblin-fire.png
index b52d274e..b52d274e 100644
--- a/graphics/sprites/monster-goblin-fire.png
+++ b/graphics/sprites/monsters/monster-goblin-fire.png
diff --git a/graphics/sprites/monster-goblin-fire.xml b/graphics/sprites/monsters/monster-goblin-fire.xml
index 5b3f472a..5b6045c1 100644
--- a/graphics/sprites/monster-goblin-fire.xml
+++ b/graphics/sprites/monsters/monster-goblin-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-goblin-fire.png" width="60" height="43" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-goblin-fire.png" width="60" height="43" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-lizard.png b/graphics/sprites/monsters/monster-lizard.png
index 1d0ff1b7..1d0ff1b7 100644
--- a/graphics/sprites/monster-lizard.png
+++ b/graphics/sprites/monsters/monster-lizard.png
diff --git a/graphics/sprites/monster-lizard.xml b/graphics/sprites/monsters/monster-lizard.xml
index 9a4be0a8..0478e391 100644
--- a/graphics/sprites/monster-lizard.xml
+++ b/graphics/sprites/monsters/monster-lizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-lizard.png|W" width="80" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-lizard.png|W" width="80" height="56" />
 
 
 <action name="stand" imageset="base">
diff --git a/graphics/sprites/monster-logmonster.png b/graphics/sprites/monsters/monster-logmonster.png
index 183faf69..183faf69 100644
--- a/graphics/sprites/monster-logmonster.png
+++ b/graphics/sprites/monsters/monster-logmonster.png
diff --git a/graphics/sprites/monster-logmonster.xml b/graphics/sprites/monsters/monster-logmonster.xml
index f180e235..0c2c3d0e 100644
--- a/graphics/sprites/monster-logmonster.xml
+++ b/graphics/sprites/monsters/monster-logmonster.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monster-logmonster.png" width="45" height="43" />
+  <imageset name="base" src="graphics/sprites/monsters/monster-logmonster.png" width="45" height="43" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" delay="100" />
diff --git a/graphics/sprites/monster-maggot-giant.png b/graphics/sprites/monsters/monster-maggot-giant.png
index a9bf0fb7..a9bf0fb7 100644
--- a/graphics/sprites/monster-maggot-giant.png
+++ b/graphics/sprites/monsters/monster-maggot-giant.png
diff --git a/graphics/sprites/monster-maggot-giant.xml b/graphics/sprites/monsters/monster-maggot-giant.xml
index 7742e44f..a4f77936 100644
--- a/graphics/sprites/monster-maggot-giant.xml
+++ b/graphics/sprites/monsters/monster-maggot-giant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-maggot-giant.png" width="58" height="46" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-maggot-giant.png" width="58" height="46" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-maggot.png b/graphics/sprites/monsters/monster-maggot.png
index 64474f94..64474f94 100644
--- a/graphics/sprites/monster-maggot.png
+++ b/graphics/sprites/monsters/monster-maggot.png
diff --git a/graphics/sprites/monster-maggot.xml b/graphics/sprites/monsters/monster-maggot.xml
index c10a7f9c..f603b8db 100644
--- a/graphics/sprites/monster-maggot.xml
+++ b/graphics/sprites/monsters/monster-maggot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-maggot.png" width="20" height="15" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-maggot.png" width="20" height="15" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-mouboo.png b/graphics/sprites/monsters/monster-mouboo.png
index 813176bf..813176bf 100644
--- a/graphics/sprites/monster-mouboo.png
+++ b/graphics/sprites/monsters/monster-mouboo.png
diff --git a/graphics/sprites/monster-mouboo.xml b/graphics/sprites/monsters/monster-mouboo.xml
index 2c6e59d5..3ab9c3ba 100644
--- a/graphics/sprites/monster-mouboo.xml
+++ b/graphics/sprites/monsters/monster-mouboo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-mouboo.png" width="80" height="80" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-mouboo.png" width="80" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-mushroom-red.png b/graphics/sprites/monsters/monster-mushroom-red.png
index 743d83e7..743d83e7 100644
--- a/graphics/sprites/monster-mushroom-red.png
+++ b/graphics/sprites/monsters/monster-mushroom-red.png
diff --git a/graphics/sprites/monster-mushroom-red.xml b/graphics/sprites/monsters/monster-mushroom-red.xml
index d0954fc1..1e2876a3 100644
--- a/graphics/sprites/monster-mushroom-red.xml
+++ b/graphics/sprites/monsters/monster-mushroom-red.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-mushroom-red.png" width="42" height="33" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-red.png" width="42" height="33" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-mushroom-spiky.png b/graphics/sprites/monsters/monster-mushroom-spiky.png
index 78ac875d..78ac875d 100644
--- a/graphics/sprites/monster-mushroom-spiky.png
+++ b/graphics/sprites/monsters/monster-mushroom-spiky.png
diff --git a/graphics/sprites/monster-mushroom-spiky.xml b/graphics/sprites/monsters/monster-mushroom-spiky.xml
index 7cd29d84..514704a5 100644
--- a/graphics/sprites/monster-mushroom-spiky.xml
+++ b/graphics/sprites/monsters/monster-mushroom-spiky.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-mushroom-spiky.png" width="42" height="40" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-mushroom-spiky.png" width="42" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-pinkie.png b/graphics/sprites/monsters/monster-pinkie.png
index 90b5c97b..90b5c97b 100644
--- a/graphics/sprites/monster-pinkie.png
+++ b/graphics/sprites/monsters/monster-pinkie.png
diff --git a/graphics/sprites/monster-pinkie.xml b/graphics/sprites/monsters/monster-pinkie.xml
index 53ba66e5..a080ea3e 100644
--- a/graphics/sprites/monster-pinkie.xml
+++ b/graphics/sprites/monsters/monster-pinkie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-pinkie.png" width="50" height="42" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-pinkie.png" width="50" height="42" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-scorpion.png b/graphics/sprites/monsters/monster-scorpion.png
index 0bd693fd..0bd693fd 100644
--- a/graphics/sprites/monster-scorpion.png
+++ b/graphics/sprites/monsters/monster-scorpion.png
diff --git a/graphics/sprites/monster-scorpion.xml b/graphics/sprites/monsters/monster-scorpion.xml
index 72a3b848..ab1986a3 100644
--- a/graphics/sprites/monster-scorpion.xml
+++ b/graphics/sprites/monsters/monster-scorpion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-scorpion.png|W" width="48" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-scorpion.png|W" width="48" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-silkworm.png b/graphics/sprites/monsters/monster-silkworm.png
index b5a78964..b5a78964 100644
--- a/graphics/sprites/monster-silkworm.png
+++ b/graphics/sprites/monsters/monster-silkworm.png
diff --git a/graphics/sprites/monster-silkworm.xml b/graphics/sprites/monsters/monster-silkworm.xml
index 06378861..c1388bae 100644
--- a/graphics/sprites/monster-silkworm.xml
+++ b/graphics/sprites/monsters/monster-silkworm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-silkworm.png|W;R" width="32" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-silkworm.png|W;R" width="32" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-skeleton.png b/graphics/sprites/monsters/monster-skeleton.png
index 53438cf3..53438cf3 100644
--- a/graphics/sprites/monster-skeleton.png
+++ b/graphics/sprites/monsters/monster-skeleton.png
diff --git a/graphics/sprites/monsters/monster-skeleton.xml b/graphics/sprites/monsters/monster-skeleton.xml
new file mode 100644
index 00000000..cb468320
--- /dev/null
+++ b/graphics/sprites/monsters/monster-skeleton.xml
@@ -0,0 +1,8 @@
+<?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.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/monster-skull-fire.png b/graphics/sprites/monsters/monster-skull-fire.png
index 843a7a5f..843a7a5f 100644
--- a/graphics/sprites/monster-skull-fire.png
+++ b/graphics/sprites/monsters/monster-skull-fire.png
diff --git a/graphics/sprites/monster-skull-fire.xml b/graphics/sprites/monsters/monster-skull-fire.xml
index 5400a4e3..44751124 100644
--- a/graphics/sprites/monster-skull-fire.xml
+++ b/graphics/sprites/monsters/monster-skull-fire.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-skull-fire.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-skull-fire.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-skull-poison.png b/graphics/sprites/monsters/monster-skull-poison.png
index 5d1b3a48..5d1b3a48 100644
--- a/graphics/sprites/monster-skull-poison.png
+++ b/graphics/sprites/monsters/monster-skull-poison.png
diff --git a/graphics/sprites/monster-skull-poison.xml b/graphics/sprites/monsters/monster-skull-poison.xml
index 9a8064dc..a769e74c 100644
--- a/graphics/sprites/monster-skull-poison.xml
+++ b/graphics/sprites/monsters/monster-skull-poison.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-skull-poison.png" width="50" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-skull-poison.png" width="50" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-slime-rudolph.png b/graphics/sprites/monsters/monster-slime-rudolph.png
index bfd38cc0..bfd38cc0 100644
--- a/graphics/sprites/monster-slime-rudolph.png
+++ b/graphics/sprites/monsters/monster-slime-rudolph.png
diff --git a/graphics/sprites/monster-slime-rudolph.xml b/graphics/sprites/monsters/monster-slime-rudolph.xml
index 8697ee12..7c74e1c6 100644
--- a/graphics/sprites/monster-slime-rudolph.xml
+++ b/graphics/sprites/monsters/monster-slime-rudolph.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-slime-rudolph.png" width="52" height="28" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-slime-rudolph.png" width="52" height="28" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-slime-santa.png b/graphics/sprites/monsters/monster-slime-santa.png
index 4f5897fa..4f5897fa 100644
--- a/graphics/sprites/monster-slime-santa.png
+++ b/graphics/sprites/monsters/monster-slime-santa.png
diff --git a/graphics/sprites/monster-slime-santa.xml b/graphics/sprites/monsters/monster-slime-santa.xml
index 15ba358e..3d0d7fec 100644
--- a/graphics/sprites/monster-slime-santa.xml
+++ b/graphics/sprites/monsters/monster-slime-santa.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-slime-santa.png" width="52" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-slime-santa.png" width="52" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-slime.png b/graphics/sprites/monsters/monster-slime.png
index 877b4a44..877b4a44 100644
--- a/graphics/sprites/monster-slime.png
+++ b/graphics/sprites/monsters/monster-slime.png
diff --git a/graphics/sprites/monster-slime.xml b/graphics/sprites/monsters/monster-slime.xml
index 89be82f7..dbc27e9d 100644
--- a/graphics/sprites/monster-slime.xml
+++ b/graphics/sprites/monsters/monster-slime.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-slime.png|W" width="52" height="24" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-slime.png|W" width="52" height="24" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-snail.png b/graphics/sprites/monsters/monster-snail.png
index 2e974de2..2e974de2 100644
--- a/graphics/sprites/monster-snail.png
+++ b/graphics/sprites/monsters/monster-snail.png
diff --git a/graphics/sprites/monster-snail.xml b/graphics/sprites/monsters/monster-snail.xml
index 54ca1f3f..530345ed 100644
--- a/graphics/sprites/monster-snail.xml
+++ b/graphics/sprites/monsters/monster-snail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/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/monster-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/monster-snake-cave.png b/graphics/sprites/monsters/monster-snake-cave.png
index ea4045d1..ea4045d1 100644
--- a/graphics/sprites/monster-snake-cave.png
+++ b/graphics/sprites/monsters/monster-snake-cave.png
diff --git a/graphics/sprites/monster-snake-cave.xml b/graphics/sprites/monsters/monster-snake-cave.xml
index 798cece4..e7140451 100644
--- a/graphics/sprites/monster-snake-cave.xml
+++ b/graphics/sprites/monsters/monster-snake-cave.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-snake-cave.png" width="96" height="56" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-snake-cave.png" width="96" height="56" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-snake.png b/graphics/sprites/monsters/monster-snake.png
index 2164d69b..2164d69b 100644
--- a/graphics/sprites/monster-snake.png
+++ b/graphics/sprites/monsters/monster-snake.png
diff --git a/graphics/sprites/monster-snake.xml b/graphics/sprites/monsters/monster-snake.xml
index 991f2369..027242f3 100644
--- a/graphics/sprites/monster-snake.xml
+++ b/graphics/sprites/monsters/monster-snake.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-snake.png|W" width="48" height="29" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-snake.png|W" width="48" height="29" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-spider.png b/graphics/sprites/monsters/monster-spider.png
index e1bcacbb..e1bcacbb 100644
--- a/graphics/sprites/monster-spider.png
+++ b/graphics/sprites/monsters/monster-spider.png
diff --git a/graphics/sprites/monster-spider.xml b/graphics/sprites/monsters/monster-spider.xml
index 4ae0c918..55505e78 100644
--- a/graphics/sprites/monster-spider.xml
+++ b/graphics/sprites/monsters/monster-spider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-spider.png" width="24" height="30" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-spider.png" width="24" height="30" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-squirrel.png b/graphics/sprites/monsters/monster-squirrel.png
index 0a1f1d36..0a1f1d36 100644
--- a/graphics/sprites/monster-squirrel.png
+++ b/graphics/sprites/monsters/monster-squirrel.png
diff --git a/graphics/sprites/monster-squirrel.xml b/graphics/sprites/monsters/monster-squirrel.xml
index cd8d0758..2cb4db9a 100644
--- a/graphics/sprites/monster-squirrel.xml
+++ b/graphics/sprites/monsters/monster-squirrel.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monster-squirrel.png" width="32" height="32" />
+  <imageset name="base" src="graphics/sprites/monsters/monster-squirrel.png" width="32" height="32" />
   <action name="stand" imageset="base">
     <animation direction="down">
       <sequence start="16" end="19" delay="75" />
diff --git a/graphics/sprites/monster-terranite-mask.png b/graphics/sprites/monsters/monster-terranite-mask.png
index 3ec1653b..3ec1653b 100644
--- a/graphics/sprites/monster-terranite-mask.png
+++ b/graphics/sprites/monsters/monster-terranite-mask.png
diff --git a/graphics/sprites/monster-terranite-mask.xml b/graphics/sprites/monsters/monster-terranite-mask.xml
index be148556..1c788b9c 100644
--- a/graphics/sprites/monster-terranite-mask.xml
+++ b/graphics/sprites/monsters/monster-terranite-mask.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monster-terranite-mask.png" width="19" height="28" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-terranite-mask.png" width="19" height="28" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monster-wisp.png b/graphics/sprites/monsters/monster-wisp.png
index c0641cae..c0641cae 100644
--- a/graphics/sprites/monster-wisp.png
+++ b/graphics/sprites/monsters/monster-wisp.png
diff --git a/graphics/sprites/monster-wisp.xml b/graphics/sprites/monsters/monster-wisp.xml
index 9dc5f9a2..4ca542b3 100644
--- a/graphics/sprites/monster-wisp.xml
+++ b/graphics/sprites/monsters/monster-wisp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-wisp.png|W" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-wisp.png|W" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
diff --git a/graphics/sprites/monster-zombie.png b/graphics/sprites/monsters/monster-zombie.png
index bf1f1818..bf1f1818 100644
--- a/graphics/sprites/monster-zombie.png
+++ b/graphics/sprites/monsters/monster-zombie.png
diff --git a/graphics/sprites/monster-zombie.xml b/graphics/sprites/monsters/monster-zombie.xml
index 244ba926..bb930af7 100644
--- a/graphics/sprites/monster-zombie.xml
+++ b/graphics/sprites/monsters/monster-zombie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monster-zombie.png" width="64" height="64" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-zombie.png" width="64" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/npcs.png b/graphics/sprites/npcs.png
deleted file mode 100644
index 58debda6..00000000
--- a/graphics/sprites/npcs.png
+++ /dev/null
diff --git a/graphics/sprites/npc-creepysurgeon.png b/graphics/sprites/npcs/npc-creepysurgeon.png
index 88fc095c..88fc095c 100644
--- a/graphics/sprites/npc-creepysurgeon.png
+++ b/graphics/sprites/npcs/npc-creepysurgeon.png
diff --git a/graphics/sprites/npc-creepysurgeon.xml b/graphics/sprites/npcs/npc-creepysurgeon.xml
index ec63ae25..894711f3 100644
--- a/graphics/sprites/npc-creepysurgeon.xml
+++ b/graphics/sprites/npcs/npc-creepysurgeon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/npc-creepysurgeon.png" width="50" height="70" />
+	<imageset name="base" src="graphics/sprites/npcs/npc-creepysurgeon.png" width="50" height="70" />
 	<action name="stand" imageset="base">
 		<animation direction="default">
 			<!-- Scissor demonstration -->
diff --git a/graphics/sprites/npcs/npc-savannahman.png b/graphics/sprites/npcs/npc-savannahman.png
new file mode 100644
index 00000000..42af6fea
--- /dev/null
+++ b/graphics/sprites/npcs/npc-savannahman.png
diff --git a/graphics/sprites/npcs/npc-savannahman.xml b/graphics/sprites/npcs/npc-savannahman.xml
new file mode 100644
index 00000000..e0ba2ca4
--- /dev/null
+++ b/graphics/sprites/npcs/npc-savannahman.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/npc-savannahman.png" width="35" height="58" />
+    <action name="stand" imageset="base">
+        <animation direction="default">
+            <!-- head movements -->
+            <frame index="0" delay="1500"/>
+            <frame index="1" delay="10"/>
+            <frame index="0" delay="300"/>
+            <frame index="1" delay="10"/>
+            <frame index="2" delay="1000"/>
+            <frame index="1" delay="10"/>
+            <frame index="0" delay="500"/>
+            <frame index="1" delay="10"/>
+            <frame index="0" delay="1000"/>
+            <frame index="3" delay="250"/>
+            <frame index="4" delay="300"/>
+            <frame index="5" delay="600"/>
+            <frame index="6" delay="550"/>
+            <frame index="7" delay="10"/>
+            <frame index="6" delay="450"/>
+            <frame index="7" delay="10"/>
+            <frame index="6" delay="500"/>
+            <frame index="4" delay="500"/>
+            <frame index="3" delay="250"/>
+            <frame index="0" delay="450"/>
+            <frame index="1" delay="10"/>
+            <frame index="0" delay="350"/>
+            <frame index="8" delay="350"/>
+            <frame index="9" delay="450"/>
+            <frame index="10" delay="1200"/>
+            <frame index="9" delay="200"/>
+            <frame index="0" delay="200"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npc-test.png b/graphics/sprites/npcs/npc-test.png
index eb8f2f22..eb8f2f22 100644
--- a/graphics/sprites/npc-test.png
+++ b/graphics/sprites/npcs/npc-test.png
diff --git a/graphics/sprites/npc-test.xml b/graphics/sprites/npcs/npc-test.xml
index a221dbe6..7de423e5 100644
--- a/graphics/sprites/npc-test.xml
+++ b/graphics/sprites/npcs/npc-test.xml
@@ -1,6 +1,6 @@
 <?xml version = '1.0'?>
 <sprite action="stand" name="npc" >
-  <imageset width="64" height="64" name="base" src="graphics/sprites/npc-test.png" />
+  <imageset width="64" height="64" name="base" src="graphics/sprites/npcs/npc-test.png" />
   <action imageset="base" name="stand" >
     <animation direction="down" >
       <frame index="0" />
diff --git a/graphics/sprites/npc-treasurebox.png b/graphics/sprites/npcs/npc-treasurebox.png
index 09e602a8..09e602a8 100644
--- a/graphics/sprites/npc-treasurebox.png
+++ b/graphics/sprites/npcs/npc-treasurebox.png
diff --git a/graphics/sprites/npc-treasurebox.xml b/graphics/sprites/npcs/npc-treasurebox.xml
index e54d825a..4bc4d44f 100644
--- a/graphics/sprites/npc-treasurebox.xml
+++ b/graphics/sprites/npcs/npc-treasurebox.xml
@@ -1,6 +1,6 @@
 <?xml version = '1.0'?>
 <sprite action="stand" name="open-treasure-npc" >
-  <imageset width="64" height="64" name="base" src="graphics/sprites/npc-treasurebox.png" />
+  <imageset width="64" height="64" name="base" src="graphics/sprites/npcs/npc-treasurebox.png" />
   <action imageset="base" name="stand" >
     <animation stand="default" >
       <sequence end="6" delay="75" start="0" />
diff --git a/graphics/sprites/npc.xml b/graphics/sprites/npcs/npc.xml
index 90e2926a..80fb1f67 100644
--- a/graphics/sprites/npc.xml
+++ b/graphics/sprites/npcs/npc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite variants="100" variant_offset="1">
-	<imageset name="base" src="graphics/sprites/npcs.png" width="50" height="80" />
+	<imageset name="base" src="graphics/sprites/npcs/npcs.png" width="50" height="80" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
diff --git a/graphics/sprites/npcs/npcs.png b/graphics/sprites/npcs/npcs.png
new file mode 100644
index 00000000..df8af7d0
--- /dev/null
+++ b/graphics/sprites/npcs/npcs.png