Commit various mantis tasks, and other changes

1 files changed, 81 insertions, 73 deletions

diff --git a/npcs.xml b/npcs.xml
index 4c629470..9a0a073c 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -7,79 +7,87 @@
     IDs 100-199 should be used for unanimated NPCs (100 is added for 0.0 client compatibility)
 -->
 <npcs>
- <npc id="100"><sprite variant="0">npc.xml</sprite></npc><!-- Fat guy with scissors -->
- <npc id="101"><sprite variant="1">npc.xml</sprite></npc><!-- Oriental trader -->
- <npc id="102"><sprite variant="2">npc.xml</sprite></npc><!-- Boy with white hair -->
- <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 with rod -->
- <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 variant="36">npc.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><!-- empty (reserved for future NPCs) -->
- <npc id="146"><sprite variant="46">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="147"><sprite variant="47">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="148"><sprite variant="48">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="149"><sprite variant="49">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="150"><sprite variant="50">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="151"><sprite variant="51">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="152"><sprite variant="52">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="153"><sprite variant="53">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="154"><sprite variant="54">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
- <npc id="155"><sprite variant="55">npc.xml</sprite></npc><!-- empty (reserved for future NPCs) -->
-
- <npc id="200">
- 	<sprite>npc-test.xml</sprite>
-	<particlefx>graphics/particles/circle.particle.xml</particlefx>
- </npc>
- <npc id="201">
- 	<!-- This entry demonstrates that an NPC can be constructed from multiple preexisting
- 	spritesets. While using the default player sprite and normal player equipment can save
- 	time it is usually better to create a new NPC as one graphic from scratch. -->
- 	<sprite>player_female_base.xml</sprite>
- 	<sprite>leg-chaps-female.xml</sprite>
- 	<sprite>hairstyle4-female.xml|#bb2222,ffee33</sprite>
- </npc>
- <npc id="202">
- 	<!-- An NPC made only from a particle effect. -->
- 	<particlefx>graphics/particles/hellblaze.particle.xml</particlefx>
- </npc>
+<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 variant="36">npc.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 vairant="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="200">
+   <sprite>npc-test.xml</sprite>
+   <particlefx>graphics/particles/circle.particle.xml</particlefx>
+</npc>
+<npc id="201">
+   <!-- This entry demonstrates that an NPC can be constructed from multiple preexisting
+   spritesets. While using the default player sprite and normal player equipment can save
+   time it is usually better to create a new NPC as one graphic from scratch. -->
+   <sprite>player_female_base.xml</sprite>
+   <sprite>leg-chaps-female.xml</sprite>
+   <sprite>hairstyle4-female.xml|#bb2222,ffee33</sprite>
+</npc>
+<npc id="202">
+   <!-- An NPC made only from a particle effect. -->
+   <particlefx>graphics/particles/hellblaze.particle.xml</particlefx>
+</npc>
 
 </npcs>