Fix a bunch of NPC bugs introduced by me, due a faulty regex earlier

1 files changed, 42 insertions, 0 deletions

diff --git a/npcs.xml b/npcs.xml
index fac665ee..3193cade 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -269,6 +269,7 @@
     <sprite>equipment/hands/generic.xml|#4e2e18,c8752f</sprite>
   </npc>
   <npc id="136">
+    <sprite>npcs/npc-creepysurgeon.xml</sprite>
   </npc>
   <npc id="137">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -290,6 +291,7 @@
     <sprite variant="8">equipment/override/adult-outfits.xml</sprite>
   </npc>
   <npc id="141">
+    <sprite>npcs/npc-lumberjack.xml</sprite>
   </npc>
   <npc id="142">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -524,6 +526,7 @@
     <sprite>equipment/hands/assassin-female.xml</sprite>
   </npc>
   <npc id="176">
+    <sprite>npcs/npc-dice.xml</sprite>
   </npc>
   <npc id="177">
     <sprite>model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -571,8 +574,12 @@
   <npc id="185" nameOffsetX="16" targetOffsetX="16" targetCursor="large">
 </npc>
   <npc id="186">
+    <sprite variant="0">npcs/signs.xml</sprite>
+    <sprite variant="17">npcs/signs.xml</sprite>
   </npc>
   <npc id="187">
+    <sprite variant="0">npcs/signs.xml</sprite>
+    <sprite variant="8">npcs/signs.xml</sprite>
   </npc>
   <npc id="188">
     <sprite>model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -836,24 +843,34 @@
     <sprite>equipment/chest/warlordplate.xml</sprite>
   </npc>
   <npc id="312">
+    <sprite>npcs/npc-beerguyghost.xml</sprite>
   </npc>
   <npc id="313">
+    <sprite>npcs/npc-chronos.xml</sprite>
   </npc>
   <npc id="314">
+    <sprite>npcs/npc-cryingchild.xml</sprite>
   </npc>
   <npc id="315">
+    <sprite>npcs/npc-ghostinnkeeper.xml</sprite>
   </npc>
   <npc id="316">
+    <sprite>npcs/npc-guard.xml</sprite>
   </npc>
   <npc id="317">
+    <sprite>npcs/npc-headhang.xml</sprite>
   </npc>
   <npc id="318">
+    <sprite>npcs/npc-headless.xml</sprite>
   </npc>
   <npc id="319">
+    <sprite>npcs/npc-lightman.xml</sprite>
   </npc>
   <npc id="320">
+    <sprite>npcs/npc-receptionist.xml</sprite>
   </npc>
   <npc id="321">
+    <sprite>npcs/npc-undeadbanker.xml</sprite>
   </npc>
   <npc id="322">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -956,6 +973,7 @@
     <particlefx>graphics/particles/soulmenhir.particle.xml</particlefx>
   </npc>
   <npc id="354">
+    <sprite>npcs/sittingsage.xml</sprite>
   </npc>
   <npc id="355">
     <sprite>model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -1084,6 +1102,7 @@
     <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite>
   </npc>
   <npc id="372">
+    <sprite>npcs/npc-mirak.xml</sprite>
   </npc>
   <npc id="374">
     <particlefx>graphics/particles/demonfire.particle.xml</particlefx>
@@ -1095,6 +1114,7 @@
     <sprite>model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
     <sprite>hairstyles/hairstyle11.xml|#dbd41e,867f1a,a49c2e,b2aa4f,c6c170,d9d394,e0dcb3</sprite>
     <sprite>equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99;#FFF528</sprite>
+    <sprite variant="0">npcs/weaver-wheel.xml</sprite>
   </npc>
   <npc id="377">
     <sprite>model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -1108,16 +1128,22 @@
     <sprite variant="9">model/unique.xml</sprite>
   </npc>
   <npc id="379" targetSelection="false">
+    <sprite>npcs/christmastree.xml</sprite>
   </npc>
   <npc id="380" targetSelection="false">
+    <sprite variant="1">npcs/snowtree.xml</sprite>
   </npc>
   <npc id="381" targetSelection="false">
+    <sprite variant="0">npcs/xmastree-nosnow.xml</sprite>
   </npc>
   <npc id="382" targetSelection="false">
+    <sprite variant="3">npcs/tree.xml</sprite>
   </npc>
   <npc id="383" targetSelection="false">
+    <sprite variant="0">npcs/xmas-palm.xml</sprite>
   </npc>
   <npc id="384" targetSelection="false">
+    <sprite variant="1">npcs/palm-tree.xml</sprite>
   </npc>
   <npc id="385">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -1127,6 +1153,7 @@
     <particlefx>graphics/particles/sphere-white.particle.xml</particlefx>
   </npc>
   <npc id="386">
+    <sprite>npcs/present.xml|#ec2843;#1e8c1e</sprite>
   </npc>
   <npc id="393">
     <sprite>model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#FF2615</sprite>
@@ -1136,14 +1163,23 @@
     <sprite>equipment/head/moubootaurhead.xml</sprite>
   </npc>
   <npc id="394" targetSelection="false">
+    <sprite variant="0">npcs/tree-large.xml</sprite>
   </npc>
   <npc id="395" targetCursor="large">
+    <sprite variant="0">npcs/koga.xml</sprite>
   </npc>
   <npc id="396">
+    <sprite variant="0">npcs/signs.xml</sprite>
+    <sprite variant="9">npcs/signs.xml</sprite>
   </npc>
   <npc id="397">
+    <sprite variant="1">npcs/signs.xml</sprite>
+    <sprite variant="9">npcs/signs.xml</sprite>
   </npc>
   <npc id="398">
+    <sprite variant="1">npcs/signs.xml</sprite>
+    <sprite variant="9">npcs/signs.xml</sprite>
+    <sprite variant="6">npcs/signs.xml</sprite>
   </npc>
   <npc id="399" hoverCursor="action"/>
   <!-- ID 400 reserved - NPC_NO_SPRITE -->
@@ -1201,6 +1237,7 @@
     <sprite>equipment/chest/leather.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
   </npc>
   <npc id="408">
+    <sprite>npcs/npc-reaper.xml</sprite>
   </npc>
   <npc id="409">
     <sprite>monsters/skeleton.xml</sprite>
@@ -1275,8 +1312,10 @@
     <particlefx>graphics/particles/angel.particle.xml</particlefx>
   </npc>
   <npc id="422">
+    <sprite>npcs/switch-offline.xml</sprite>
   </npc>
   <npc id="423">
+    <sprite>npcs/switch-online.xml</sprite>
   </npc>
   <npc id="424">
     <particlefx>graphics/particles/pentagram-blacklinedraw.particle.xml</particlefx>
@@ -1284,6 +1323,7 @@
     <particlefx>graphics/particles/power-circle.particle.xml</particlefx>
   </npc>
   <npc id="425">
+    <sprite variant="0">npcs/anon.xml</sprite>
   </npc>
   <npc id="426">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
@@ -1297,8 +1337,10 @@
     <particlefx>graphics/particles/angel.particle.xml</particlefx>
   </npc>
   <npc id="427">
+    <sprite variant="0">npcs/tal.xml</sprite>
   </npc>
   <npc id="428">
+    <sprite variant="0">npcs/airship.xml</sprite>
   </npc>
   <npc id="429">
     <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>