From e082bdd8b7423c0053bfecca8fde75460bb03aa2 Mon Sep 17 00:00:00 2001
From: Bertram <bertram@cegetel.net>
Date: Fri, 9 Oct 2009 12:17:50 +0200
Subject: Moved NPCs to a npcs/ subfolders.

---
 graphics/sprites/npc-creepysurgeon.png      | Bin 26194 -> 0 bytes
 graphics/sprites/npc-creepysurgeon.xml      |  28 -----
 graphics/sprites/npc-savannahman.png        | Bin 9513 -> 0 bytes
 graphics/sprites/npc-savannahman.xml        |  36 ------
 graphics/sprites/npc-test.png               | Bin 27664 -> 0 bytes
 graphics/sprites/npc-test.xml               |  32 ------
 graphics/sprites/npc-treasurebox.png        | Bin 5096 -> 0 bytes
 graphics/sprites/npc-treasurebox.xml        |   9 --
 graphics/sprites/npc.xml                    |  10 --
 graphics/sprites/npcs.png                   | Bin 158625 -> 0 bytes
 graphics/sprites/npcs/npc-creepysurgeon.png | Bin 0 -> 26194 bytes
 graphics/sprites/npcs/npc-creepysurgeon.xml |  28 +++++
 graphics/sprites/npcs/npc-savannahman.png   | Bin 0 -> 9513 bytes
 graphics/sprites/npcs/npc-savannahman.xml   |  36 ++++++
 graphics/sprites/npcs/npc-test.png          | Bin 0 -> 27664 bytes
 graphics/sprites/npcs/npc-test.xml          |  32 ++++++
 graphics/sprites/npcs/npc-treasurebox.png   | Bin 0 -> 5096 bytes
 graphics/sprites/npcs/npc-treasurebox.xml   |   9 ++
 graphics/sprites/npcs/npc.xml               |  10 ++
 graphics/sprites/npcs/npcs.png              | Bin 0 -> 158625 bytes
 npcs.xml                                    | 172 ++++++++++++++--------------
 21 files changed, 201 insertions(+), 201 deletions(-)
 delete mode 100644 graphics/sprites/npc-creepysurgeon.png
 delete mode 100644 graphics/sprites/npc-creepysurgeon.xml
 delete mode 100644 graphics/sprites/npc-savannahman.png
 delete mode 100644 graphics/sprites/npc-savannahman.xml
 delete mode 100644 graphics/sprites/npc-test.png
 delete mode 100644 graphics/sprites/npc-test.xml
 delete mode 100644 graphics/sprites/npc-treasurebox.png
 delete mode 100644 graphics/sprites/npc-treasurebox.xml
 delete mode 100644 graphics/sprites/npc.xml
 delete mode 100644 graphics/sprites/npcs.png
 create mode 100644 graphics/sprites/npcs/npc-creepysurgeon.png
 create mode 100644 graphics/sprites/npcs/npc-creepysurgeon.xml
 create mode 100644 graphics/sprites/npcs/npc-savannahman.png
 create mode 100644 graphics/sprites/npcs/npc-savannahman.xml
 create mode 100644 graphics/sprites/npcs/npc-test.png
 create mode 100644 graphics/sprites/npcs/npc-test.xml
 create mode 100644 graphics/sprites/npcs/npc-treasurebox.png
 create mode 100644 graphics/sprites/npcs/npc-treasurebox.xml
 create mode 100644 graphics/sprites/npcs/npc.xml
 create mode 100644 graphics/sprites/npcs/npcs.png

diff --git a/graphics/sprites/npc-creepysurgeon.png b/graphics/sprites/npc-creepysurgeon.png
deleted file mode 100644
index 88fc095c..00000000
Binary files a/graphics/sprites/npc-creepysurgeon.png and /dev/null differ
diff --git a/graphics/sprites/npc-creepysurgeon.xml b/graphics/sprites/npc-creepysurgeon.xml
deleted file mode 100644
index ec63ae25..00000000
--- a/graphics/sprites/npc-creepysurgeon.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/npc-creepysurgeon.png" width="50" height="70" />
-	<action name="stand" imageset="base">
-		<animation direction="default">
-			<!-- Scissor demonstration -->
-			<sequence start="1" end="9" delay="200" />
-			<frame index="10" delay="500"/>
-			<frame index="11" delay="500"/>
-			<frame index="10" delay="500"/>
-			<frame index="11" delay="500"/>
-			<frame index="10" delay="500"/>
-			<frame index="11" delay="500"/>
-			<frame index="10" delay="500"/>
-			<frame index="12" delay="300"/>
-			<frame index="13" delay="1000"/>
-			<sequence start="14" end="16" delay="400" />
-			<frame index="0" delay="3000"/>
-			<!-- blinking -->
-			<frame index="19" delay="500"/>
-			<frame index="0" delay="3000"/>
-			<!-- checking pocket -->
-			<frame index="12" delay="1000"/>
-			<sequence start="14" end="16" delay="400" />
-			<frame index="0" delay="3000"/>
-		</animation>
-	</action>
-</sprite>
diff --git a/graphics/sprites/npc-savannahman.png b/graphics/sprites/npc-savannahman.png
deleted file mode 100644
index 42af6fea..00000000
Binary files a/graphics/sprites/npc-savannahman.png and /dev/null differ
diff --git a/graphics/sprites/npc-savannahman.xml b/graphics/sprites/npc-savannahman.xml
deleted file mode 100644
index 35d3717c..00000000
--- a/graphics/sprites/npc-savannahman.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-	<imageset name="base" src="graphics/sprites/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/npc-test.png
deleted file mode 100644
index eb8f2f22..00000000
Binary files a/graphics/sprites/npc-test.png and /dev/null differ
diff --git a/graphics/sprites/npc-test.xml b/graphics/sprites/npc-test.xml
deleted file mode 100644
index a221dbe6..00000000
--- a/graphics/sprites/npc-test.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version = '1.0'?>
-<sprite action="stand" name="npc" >
-  <imageset width="64" height="64" name="base" src="graphics/sprites/npc-test.png" />
-  <action imageset="base" name="stand" >
-    <animation direction="down" >
-      <frame index="0" />
-    </animation>
-    <animation direction="left" >
-      <frame index="7" />
-    </animation>
-    <animation direction="up" >
-      <frame index="14" />
-    </animation>
-    <animation direction="right" >
-      <frame index="21" />
-    </animation>
-  </action>
-  <action imageset="base" name="walk" >
-    <animation direction="down" >
-      <sequence end="6" delay="75" start="1" />
-    </animation>
-    <animation direction="left" >
-      <sequence end="13" delay="75" start="8" />
-    </animation>
-    <animation direction="up" >
-      <sequence end="20" delay="75" start="15" />
-    </animation>
-    <animation direction="right" >
-      <sequence end="27" delay="75" start="22" />
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/npc-treasurebox.png b/graphics/sprites/npc-treasurebox.png
deleted file mode 100644
index 09e602a8..00000000
Binary files a/graphics/sprites/npc-treasurebox.png and /dev/null differ
diff --git a/graphics/sprites/npc-treasurebox.xml b/graphics/sprites/npc-treasurebox.xml
deleted file mode 100644
index e54d825a..00000000
--- a/graphics/sprites/npc-treasurebox.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version = '1.0'?>
-<sprite action="stand" name="open-treasure-npc" >
-  <imageset width="64" height="64" name="base" src="graphics/sprites/npc-treasurebox.png" />
-  <action imageset="base" name="stand" >
-    <animation stand="default" >
-      <sequence end="6" delay="75" start="0" />
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/npc.xml b/graphics/sprites/npc.xml
deleted file mode 100644
index 90e2926a..00000000
--- a/graphics/sprites/npc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<sprite variants="100" variant_offset="1">
-	<imageset name="base" src="graphics/sprites/npcs.png" width="50" height="80" />
-
-	<action name="stand" imageset="base">
-		<animation direction="default">
-			<frame index="0" />
-		</animation>
-	</action>
-</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs.png b/graphics/sprites/npcs.png
deleted file mode 100644
index df8af7d0..00000000
Binary files a/graphics/sprites/npcs.png and /dev/null differ
diff --git a/graphics/sprites/npcs/npc-creepysurgeon.png b/graphics/sprites/npcs/npc-creepysurgeon.png
new file mode 100644
index 00000000..88fc095c
Binary files /dev/null and b/graphics/sprites/npcs/npc-creepysurgeon.png differ
diff --git a/graphics/sprites/npcs/npc-creepysurgeon.xml b/graphics/sprites/npcs/npc-creepysurgeon.xml
new file mode 100644
index 00000000..894711f3
--- /dev/null
+++ b/graphics/sprites/npcs/npc-creepysurgeon.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<sprite>
+	<imageset name="base" src="graphics/sprites/npcs/npc-creepysurgeon.png" width="50" height="70" />
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<!-- Scissor demonstration -->
+			<sequence start="1" end="9" delay="200" />
+			<frame index="10" delay="500"/>
+			<frame index="11" delay="500"/>
+			<frame index="10" delay="500"/>
+			<frame index="11" delay="500"/>
+			<frame index="10" delay="500"/>
+			<frame index="11" delay="500"/>
+			<frame index="10" delay="500"/>
+			<frame index="12" delay="300"/>
+			<frame index="13" delay="1000"/>
+			<sequence start="14" end="16" delay="400" />
+			<frame index="0" delay="3000"/>
+			<!-- blinking -->
+			<frame index="19" delay="500"/>
+			<frame index="0" delay="3000"/>
+			<!-- checking pocket -->
+			<frame index="12" delay="1000"/>
+			<sequence start="14" end="16" delay="400" />
+			<frame index="0" delay="3000"/>
+		</animation>
+	</action>
+</sprite>
diff --git a/graphics/sprites/npcs/npc-savannahman.png b/graphics/sprites/npcs/npc-savannahman.png
new file mode 100644
index 00000000..42af6fea
Binary files /dev/null and b/graphics/sprites/npcs/npc-savannahman.png differ
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/npcs/npc-test.png b/graphics/sprites/npcs/npc-test.png
new file mode 100644
index 00000000..eb8f2f22
Binary files /dev/null and b/graphics/sprites/npcs/npc-test.png differ
diff --git a/graphics/sprites/npcs/npc-test.xml b/graphics/sprites/npcs/npc-test.xml
new file mode 100644
index 00000000..7de423e5
--- /dev/null
+++ b/graphics/sprites/npcs/npc-test.xml
@@ -0,0 +1,32 @@
+<?xml version = '1.0'?>
+<sprite action="stand" name="npc" >
+  <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" />
+    </animation>
+    <animation direction="left" >
+      <frame index="7" />
+    </animation>
+    <animation direction="up" >
+      <frame index="14" />
+    </animation>
+    <animation direction="right" >
+      <frame index="21" />
+    </animation>
+  </action>
+  <action imageset="base" name="walk" >
+    <animation direction="down" >
+      <sequence end="6" delay="75" start="1" />
+    </animation>
+    <animation direction="left" >
+      <sequence end="13" delay="75" start="8" />
+    </animation>
+    <animation direction="up" >
+      <sequence end="20" delay="75" start="15" />
+    </animation>
+    <animation direction="right" >
+      <sequence end="27" delay="75" start="22" />
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/npcs/npc-treasurebox.png b/graphics/sprites/npcs/npc-treasurebox.png
new file mode 100644
index 00000000..09e602a8
Binary files /dev/null and b/graphics/sprites/npcs/npc-treasurebox.png differ
diff --git a/graphics/sprites/npcs/npc-treasurebox.xml b/graphics/sprites/npcs/npc-treasurebox.xml
new file mode 100644
index 00000000..4bc4d44f
--- /dev/null
+++ b/graphics/sprites/npcs/npc-treasurebox.xml
@@ -0,0 +1,9 @@
+<?xml version = '1.0'?>
+<sprite action="stand" name="open-treasure-npc" >
+  <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" />
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/npcs/npc.xml b/graphics/sprites/npcs/npc.xml
new file mode 100644
index 00000000..80fb1f67
--- /dev/null
+++ b/graphics/sprites/npcs/npc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<sprite variants="100" variant_offset="1">
+	<imageset name="base" src="graphics/sprites/npcs/npcs.png" width="50" height="80" />
+
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<frame index="0" />
+		</animation>
+	</action>
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/npcs.png b/graphics/sprites/npcs/npcs.png
new file mode 100644
index 00000000..df8af7d0
Binary files /dev/null and b/graphics/sprites/npcs/npcs.png differ
diff --git a/npcs.xml b/npcs.xml
index 18c5807f..c67754a3 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -8,95 +8,95 @@
     IDs 100-199 should be used for unanimated NPCs (100 is added for 0.0 client compatibility)
 -->
 <npcs>
-<npc id="48"><sprite variant="61">npc.xml</sprite></npc><!-- Storage Master -->
-<npc id="49"><sprite variant="49">npc.xml</sprite></npc><!-- Storage Master (desert) -->
+<npc id="48"><sprite variant="61">npcs/npc.xml</sprite></npc><!-- Storage Master -->
+<npc id="49"><sprite variant="49">npcs/npc.xml</sprite></npc><!-- Storage Master (desert) -->
 
-<npc id="100"><sprite variant="0">npc.xml</sprite></npc><!-- Desert Barber -->
-<npc id="101"><sprite variant="1">npc.xml</sprite></npc><!-- Oriental trader -->
-<npc id="102"><sprite variant="2">npc.xml</sprite></npc><!-- The Trainer -->
-<npc id="103"><sprite variant="3">npc.xml</sprite></npc><!-- Guy in black cloak -->
-<npc id="104"><sprite variant="4">npc.xml</sprite></npc><!-- Soldier with sword -->
-<npc id="105"><sprite variant="5">npc.xml</sprite></npc><!-- Santa Clause -->
-<npc id="106"><sprite variant="6">npc.xml</sprite></npc><!-- Girl with pink hair and blue top -->
-<npc id="107"><sprite variant="7">npc.xml</sprite></npc><!-- Scholar guy with glasses -->
-<npc id="108"><sprite variant="8">npc.xml</sprite></npc><!-- Woman with green hair and pink dress -->
-<npc id="109"><sprite variant="9">npc.xml</sprite></npc><!-- Miner -->
-<npc id="110"><sprite variant="10">npc.xml</sprite></npc><!-- Soldier with spear -->
-<npc id="111"><sprite variant="11">npc.xml</sprite></npc><!-- Treasure chest -->
-<npc id="112"><sprite variant="12">npc.xml</sprite></npc><!-- Barkeeper -->
-<npc id="113"><sprite variant="13">npc.xml</sprite></npc><!-- Gnome with hat -->
-<npc id="114"><sprite variant="14">npc.xml</sprite></npc><!-- Little blue-haired girl -->
-<npc id="115"><sprite variant="15">npc.xml</sprite></npc><!-- Guy with red hair and green cloak -->
-<npc id="116"><sprite variant="16">npc.xml</sprite></npc><!-- Old geezer -->
-<npc id="117"><sprite variant="17">npc.xml</sprite></npc><!-- Boy with brown hair -->
-<npc id="118"><sprite variant="18">npc.xml</sprite></npc><!-- Nurse without hat -->
-<npc id="119"><sprite variant="19">npc.xml</sprite></npc><!-- Nurse with hat -->
-<npc id="120"><sprite variant="20">npc.xml</sprite></npc><!-- Guy with brown hair in plain clothes -->
-<npc id="121"><sprite variant="21">npc.xml</sprite></npc><!-- Soldier -->
-<npc id="122"><sprite variant="22">npc.xml</sprite></npc><!-- Soldier with sword and shield -->
-<npc id="123"><sprite variant="23">npc.xml</sprite></npc><!-- Soldier with sword, shield, and helmet -->
-<npc id="124"><sprite variant="24">npc.xml</sprite></npc><!-- Guy with black hair in plain clothes -->
-<npc id="125"><sprite variant="25">npc.xml</sprite></npc><!-- Guy with black clothes -->
-<npc id="126"><sprite variant="26">npc.xml</sprite></npc><!-- Guy with black clothes and axe -->
-<npc id="127"><sprite variant="27">npc.xml</sprite></npc><!-- empty (Invisible NPC) -->
-<npc id="128"><sprite variant="28">npc.xml</sprite></npc><!-- Nomad, standing -->
-<npc id="129"><sprite variant="29">npc.xml</sprite></npc><!-- Snowman -->
-<npc id="130"><sprite variant="30">npc.xml</sprite></npc><!-- Paperboy (wtf? how does this one fit in a fantasy game?) -->
-<npc id="131"><sprite variant="31">npc.xml</sprite></npc><!-- Nomad, sitting -->
-<npc id="132"><sprite variant="32">npc.xml</sprite><particlefx>graphics/particles/nomadpipe.particle.xml</particlefx></npc><!-- Nomad, sitting with pipe -->
-<npc id="133"><sprite variant="33">npc.xml</sprite></npc><!-- Captain Kirk -->
-<npc id="134"><sprite variant="34">npc.xml</sprite></npc><!-- Mr. Spock -->
-<npc id="135"><sprite variant="35">npc.xml</sprite></npc><!-- Guy with sword over shoulder -->
-<npc id="136"><sprite>npc-creepysurgeon.xml</sprite></npc><!-- Creepy surgeon guy -->
-<npc id="137"><sprite variant="37">npc.xml</sprite></npc><!-- Metrosexual guy with pink jacket on stool -->
-<npc id="138"><sprite variant="38">npc.xml</sprite></npc><!-- Zombie pirate captain-->
-<npc id="139"><sprite variant="39">npc.xml</sprite></npc><!-- Girl in playboy bunny costume -->
-<npc id="140"><sprite variant="40">npc.xml</sprite></npc><!-- Woman with green dress and apron -->
-<npc id="141"><sprite variant="41">npc.xml</sprite></npc><!-- Lumberjack -->
-<npc id="142"><sprite variant="42">npc.xml</sprite></npc><!-- Farmer -->
-<npc id="143"><sprite variant="43">npc.xml</sprite></npc><!-- Indian Chief-->
-<npc id="144"><sprite variant="44">npc.xml</sprite><particlefx>graphics/particles/soulmenhir.particle.xml</particlefx></npc><!-- Boulder -->
-<npc id="145"><sprite variant="45">npc.xml</sprite></npc><!-- Magic mouth -->
-<npc id="146"><sprite variant="46">npc.xml</sprite></npc><!-- Mechanic -->
-<npc id="147"><sprite variant="47">npc.xml</sprite></npc><!-- Mechanic with tool -->
-<npc id="148"><sprite variant="48">npc.xml</sprite></npc><!-- Chef -->
-<npc id="149"><sprite variant="49">npc.xml</sprite></npc><!-- Desert Banker -->
-<npc id="150"><sprite variant="50">npc.xml</sprite></npc><!-- Investigator -->
-<npc id="151"><sprite variant="51">npc.xml</sprite></npc><!-- Lora Tay -->
-<npc id="152"><sprite variant="52">npc.xml</sprite></npc><!-- Desert Bard -->
-<npc id="153"><sprite variant="53">npc.xml</sprite></npc><!-- Old Wizard -->
-<npc id="154"><sprite variant="54">npc.xml</sprite></npc><!-- Old Woman -->
-<npc id="155"><sprite variant="55">npc.xml</sprite></npc><!-- Construction Worker -->
-<npc id="156"><sprite variant="56">npc.xml</sprite></npc><!-- Desert Barber/Desert Man -->
-<npc id="157"><sprite variant="57">npc.xml</sprite></npc><!-- Trainer 2 -->
-<npc id="158"><sprite variant="58">npc.xml</sprite></npc><!-- Young Male Wizard -->
-<npc id="159"><sprite variant="59">npc.xml</sprite></npc><!-- Old man -->
-<npc id="160"><sprite variant="60">npc.xml</sprite></npc><!-- Generic Man -->
-<npc id="161"><sprite variant="61">npc.xml</sprite></npc><!-- Generic Banker -->
-<npc id="162"><sprite variant="62">npc.xml</sprite></npc><!-- Generic Desert Man -->
-<npc id="163"><sprite variant="63">npc.xml</sprite></npc><!-- Flower Girl -->
-<npc id="164"><sprite variant="64">npc.xml</sprite></npc><!-- Wedding Officiator -->
-<npc id="165"><sprite variant="65">npc.xml</sprite></npc><!-- Dimond/Magician -->
-<npc id="166"><sprite variant="66">npc.xml</sprite><particlefx>graphics/particles/manaseed.particle.xml</particlefx></npc><!-- Mana Seed -->
-<npc id="167"><sprite variant="67">npc.xml</sprite></npc><!-- Young Witch -->
-<npc id="168"><sprite variant="68">npc.xml</sprite></npc><!-- Middle-Aged Wizard -->
-<npc id="169"><sprite variant="69">npc.xml</sprite></npc><!-- Miner -->
-<npc id="170"><sprite variant="70">npc.xml</sprite></npc><!-- Christmas Reinboo -->
-<npc id="171"><sprite variant="71">npc.xml</sprite></npc><!-- Injured Mouboo -->
-<npc id="172"><sprite variant="72">npc.xml</sprite></npc><!-- Katze -->
-<npc id="173"><sprite variant="73">npc.xml</sprite></npc><!-- Easter Bunny -->
-<npc id="174"><sprite variant="74">npc.xml</sprite></npc><!-- Aisha, Omar's daughter -->
-<npc id="175"><sprite variant="75">npc.xml</sprite></npc><!-- Miriam the cat burglar -->
-<npc id="176"><sprite variant="76">npc.xml</sprite></npc><!-- Lou Rette the gambler -->
-<npc id="177"><sprite variant="77">npc.xml</sprite></npc><!-- Old Knight -->
-<npc id="178"><sprite variant="78">npc.xml</sprite></npc><!-- Karoua, Exiled Indian Chief -->
-<npc id="179"><sprite variant="79">npc.xml</sprite></npc><!-- Kesh, Karoua's wife -->
-<npc id="180"><sprite>npc-savannahman.xml</sprite></npc><!-- Blue Savannah Man with idle animation -->
-<npc id="181"><sprite variant="81">npc.xml</sprite></npc><!-- Green Savannah Man -->
-<npc id="182"><sprite variant="82">npc.xml</sprite></npc><!-- Young archer -->
+<npc id="100"><sprite variant="0">npcs/npc.xml</sprite></npc><!-- Desert Barber -->
+<npc id="101"><sprite variant="1">npcs/npc.xml</sprite></npc><!-- Oriental trader -->
+<npc id="102"><sprite variant="2">npcs/npc.xml</sprite></npc><!-- The Trainer -->
+<npc id="103"><sprite variant="3">npcs/npc.xml</sprite></npc><!-- Guy in black cloak -->
+<npc id="104"><sprite variant="4">npcs/npc.xml</sprite></npc><!-- Soldier with sword -->
+<npc id="105"><sprite variant="5">npcs/npc.xml</sprite></npc><!-- Santa Clause -->
+<npc id="106"><sprite variant="6">npcs/npc.xml</sprite></npc><!-- Girl with pink hair and blue top -->
+<npc id="107"><sprite variant="7">npcs/npc.xml</sprite></npc><!-- Scholar guy with glasses -->
+<npc id="108"><sprite variant="8">npcs/npc.xml</sprite></npc><!-- Woman with green hair and pink dress -->
+<npc id="109"><sprite variant="9">npcs/npc.xml</sprite></npc><!-- Miner -->
+<npc id="110"><sprite variant="10">npcs/npc.xml</sprite></npc><!-- Soldier with spear -->
+<npc id="111"><sprite variant="11">npcs/npc.xml</sprite></npc><!-- Treasure chest -->
+<npc id="112"><sprite variant="12">npcs/npc.xml</sprite></npc><!-- Barkeeper -->
+<npc id="113"><sprite variant="13">npcs/npc.xml</sprite></npc><!-- Gnome with hat -->
+<npc id="114"><sprite variant="14">npcs/npc.xml</sprite></npc><!-- Little blue-haired girl -->
+<npc id="115"><sprite variant="15">npcs/npc.xml</sprite></npc><!-- Guy with red hair and green cloak -->
+<npc id="116"><sprite variant="16">npcs/npc.xml</sprite></npc><!-- Old geezer -->
+<npc id="117"><sprite variant="17">npcs/npc.xml</sprite></npc><!-- Boy with brown hair -->
+<npc id="118"><sprite variant="18">npcs/npc.xml</sprite></npc><!-- Nurse without hat -->
+<npc id="119"><sprite variant="19">npcs/npc.xml</sprite></npc><!-- Nurse with hat -->
+<npc id="120"><sprite variant="20">npcs/npc.xml</sprite></npc><!-- Guy with brown hair in plain clothes -->
+<npc id="121"><sprite variant="21">npcs/npc.xml</sprite></npc><!-- Soldier -->
+<npc id="122"><sprite variant="22">npcs/npc.xml</sprite></npc><!-- Soldier with sword and shield -->
+<npc id="123"><sprite variant="23">npcs/npc.xml</sprite></npc><!-- Soldier with sword, shield, and helmet -->
+<npc id="124"><sprite variant="24">npcs/npc.xml</sprite></npc><!-- Guy with black hair in plain clothes -->
+<npc id="125"><sprite variant="25">npcs/npc.xml</sprite></npc><!-- Guy with black clothes -->
+<npc id="126"><sprite variant="26">npcs/npc.xml</sprite></npc><!-- Guy with black clothes and axe -->
+<npc id="127"><sprite variant="27">npcs/npc.xml</sprite></npc><!-- empty (Invisible NPC) -->
+<npc id="128"><sprite variant="28">npcs/npc.xml</sprite></npc><!-- Nomad, standing -->
+<npc id="129"><sprite variant="29">npcs/npc.xml</sprite></npc><!-- Snowman -->
+<npc id="130"><sprite variant="30">npcs/npc.xml</sprite></npc><!-- Paperboy (wtf? how does this one fit in a fantasy game?) -->
+<npc id="131"><sprite variant="31">npcs/npc.xml</sprite></npc><!-- Nomad, sitting -->
+<npc id="132"><sprite variant="32">npcs/npc.xml</sprite><particlefx>graphics/particles/nomadpipe.particle.xml</particlefx></npc><!-- Nomad, sitting with pipe -->
+<npc id="133"><sprite variant="33">npcs/npc.xml</sprite></npc><!-- Captain Kirk -->
+<npc id="134"><sprite variant="34">npcs/npc.xml</sprite></npc><!-- Mr. Spock -->
+<npc id="135"><sprite variant="35">npcs/npc.xml</sprite></npc><!-- Guy with sword over shoulder -->
+<npc id="136"><sprite>npcs/npc-creepysurgeon.xml</sprite></npc><!-- Creepy surgeon guy -->
+<npc id="137"><sprite variant="37">npcs/npc.xml</sprite></npc><!-- Metrosexual guy with pink jacket on stool -->
+<npc id="138"><sprite variant="38">npcs/npc.xml</sprite></npc><!-- Zombie pirate captain-->
+<npc id="139"><sprite variant="39">npcs/npc.xml</sprite></npc><!-- Girl in playboy bunny costume -->
+<npc id="140"><sprite variant="40">npcs/npc.xml</sprite></npc><!-- Woman with green dress and apron -->
+<npc id="141"><sprite variant="41">npcs/npc.xml</sprite></npc><!-- Lumberjack -->
+<npc id="142"><sprite variant="42">npcs/npc.xml</sprite></npc><!-- Farmer -->
+<npc id="143"><sprite variant="43">npcs/npc.xml</sprite></npc><!-- Indian Chief-->
+<npc id="144"><sprite variant="44">npcs/npc.xml</sprite><particlefx>graphics/particles/soulmenhir.particle.xml</particlefx></npc><!-- Boulder -->
+<npc id="145"><sprite variant="45">npcs/npc.xml</sprite></npc><!-- Magic mouth -->
+<npc id="146"><sprite variant="46">npcs/npc.xml</sprite></npc><!-- Mechanic -->
+<npc id="147"><sprite variant="47">npcs/npc.xml</sprite></npc><!-- Mechanic with tool -->
+<npc id="148"><sprite variant="48">npcs/npc.xml</sprite></npc><!-- Chef -->
+<npc id="149"><sprite variant="49">npcs/npc.xml</sprite></npc><!-- Desert Banker -->
+<npc id="150"><sprite variant="50">npcs/npc.xml</sprite></npc><!-- Investigator -->
+<npc id="151"><sprite variant="51">npcs/npc.xml</sprite></npc><!-- Lora Tay -->
+<npc id="152"><sprite variant="52">npcs/npc.xml</sprite></npc><!-- Desert Bard -->
+<npc id="153"><sprite variant="53">npcs/npc.xml</sprite></npc><!-- Old Wizard -->
+<npc id="154"><sprite variant="54">npcs/npc.xml</sprite></npc><!-- Old Woman -->
+<npc id="155"><sprite variant="55">npcs/npc.xml</sprite></npc><!-- Construction Worker -->
+<npc id="156"><sprite variant="56">npcs/npc.xml</sprite></npc><!-- Desert Barber/Desert Man -->
+<npc id="157"><sprite variant="57">npcs/npc.xml</sprite></npc><!-- Trainer 2 -->
+<npc id="158"><sprite variant="58">npcs/npc.xml</sprite></npc><!-- Young Male Wizard -->
+<npc id="159"><sprite variant="59">npcs/npc.xml</sprite></npc><!-- Old man -->
+<npc id="160"><sprite variant="60">npcs/npc.xml</sprite></npc><!-- Generic Man -->
+<npc id="161"><sprite variant="61">npcs/npc.xml</sprite></npc><!-- Generic Banker -->
+<npc id="162"><sprite variant="62">npcs/npc.xml</sprite></npc><!-- Generic Desert Man -->
+<npc id="163"><sprite variant="63">npcs/npc.xml</sprite></npc><!-- Flower Girl -->
+<npc id="164"><sprite variant="64">npcs/npc.xml</sprite></npc><!-- Wedding Officiator -->
+<npc id="165"><sprite variant="65">npcs/npc.xml</sprite></npc><!-- Dimond/Magician -->
+<npc id="166"><sprite variant="66">npcs/npc.xml</sprite><particlefx>graphics/particles/manaseed.particle.xml</particlefx></npc><!-- Mana Seed -->
+<npc id="167"><sprite variant="67">npcs/npc.xml</sprite></npc><!-- Young Witch -->
+<npc id="168"><sprite variant="68">npcs/npc.xml</sprite></npc><!-- Middle-Aged Wizard -->
+<npc id="169"><sprite variant="69">npcs/npc.xml</sprite></npc><!-- Miner -->
+<npc id="170"><sprite variant="70">npcs/npc.xml</sprite></npc><!-- Christmas Reinboo -->
+<npc id="171"><sprite variant="71">npcs/npc.xml</sprite></npc><!-- Injured Mouboo -->
+<npc id="172"><sprite variant="72">npcs/npc.xml</sprite></npc><!-- Katze -->
+<npc id="173"><sprite variant="73">npcs/npc.xml</sprite></npc><!-- Easter Bunny -->
+<npc id="174"><sprite variant="74">npcs/npc.xml</sprite></npc><!-- Aisha, Omar's daughter -->
+<npc id="175"><sprite variant="75">npcs/npc.xml</sprite></npc><!-- Miriam the cat burglar -->
+<npc id="176"><sprite variant="76">npcs/npc.xml</sprite></npc><!-- Lou Rette the gambler -->
+<npc id="177"><sprite variant="77">npcs/npc.xml</sprite></npc><!-- Old Knight -->
+<npc id="178"><sprite variant="78">npcs/npc.xml</sprite></npc><!-- Karoua, Exiled Indian Chief -->
+<npc id="179"><sprite variant="79">npcs/npc.xml</sprite></npc><!-- Kesh, Karoua's wife -->
+<npc id="180"><sprite>npcs/npc-savannahman.xml</sprite></npc><!-- Blue Savannah Man with idle animation -->
+<npc id="181"><sprite variant="81">npcs/npc.xml</sprite></npc><!-- Green Savannah Man -->
+<npc id="182"><sprite variant="82">npcs/npc.xml</sprite></npc><!-- Young archer -->
 
 <npc id="200">
-   <sprite>npc-test.xml</sprite>
+   <sprite>npcs/npc-test.xml</sprite>
    <particlefx>graphics/particles/circle.particle.xml</particlefx>
 </npc>
 <npc id="201">
-- 
cgit v1.2.3-60-g2f50