From 35bb704157d551456b86d20d01b41d2d09521844 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 15 Jun 2021 21:51:26 -0300 Subject: Fix a bunch of NPC bugs introduced by me, due a faulty regex earlier --- npcs.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/npcs.xml b/npcs.xml index fac665ee..3193cade 100644 --- a/npcs.xml +++ b/npcs.xml @@ -269,6 +269,7 @@ equipment/hands/generic.xml|#4e2e18,c8752f + npcs/npc-creepysurgeon.xml model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -290,6 +291,7 @@ equipment/override/adult-outfits.xml + npcs/npc-lumberjack.xml model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -524,6 +526,7 @@ equipment/hands/assassin-female.xml + npcs/npc-dice.xml model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -571,8 +574,12 @@ + npcs/signs.xml + npcs/signs.xml + npcs/signs.xml + npcs/signs.xml model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -836,24 +843,34 @@ equipment/chest/warlordplate.xml + npcs/npc-beerguyghost.xml + npcs/npc-chronos.xml + npcs/npc-cryingchild.xml + npcs/npc-ghostinnkeeper.xml + npcs/npc-guard.xml + npcs/npc-headhang.xml + npcs/npc-headless.xml + npcs/npc-lightman.xml + npcs/npc-receptionist.xml + npcs/npc-undeadbanker.xml model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -956,6 +973,7 @@ graphics/particles/soulmenhir.particle.xml + npcs/sittingsage.xml model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -1084,6 +1102,7 @@ equipment/head/wizard-hat.xml|#070707,121212,663399 + npcs/npc-mirak.xml graphics/particles/demonfire.particle.xml @@ -1095,6 +1114,7 @@ model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 hairstyles/hairstyle11.xml|#dbd41e,867f1a,a49c2e,b2aa4f,c6c170,d9d394,e0dcb3 equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99;#FFF528 + npcs/weaver-wheel.xml model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -1108,16 +1128,22 @@ model/unique.xml + npcs/christmastree.xml + npcs/snowtree.xml + npcs/xmastree-nosnow.xml + npcs/tree.xml + npcs/xmas-palm.xml + npcs/palm-tree.xml model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -1127,6 +1153,7 @@ graphics/particles/sphere-white.particle.xml + npcs/present.xml|#ec2843;#1e8c1e model/talpan-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#FF2615 @@ -1136,14 +1163,23 @@ equipment/head/moubootaurhead.xml + npcs/tree-large.xml + npcs/koga.xml + npcs/signs.xml + npcs/signs.xml + npcs/signs.xml + npcs/signs.xml + npcs/signs.xml + npcs/signs.xml + npcs/signs.xml @@ -1201,6 +1237,7 @@ equipment/chest/leather.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1 + npcs/npc-reaper.xml monsters/skeleton.xml @@ -1275,8 +1312,10 @@ graphics/particles/angel.particle.xml + npcs/switch-offline.xml + npcs/switch-online.xml graphics/particles/pentagram-blacklinedraw.particle.xml @@ -1284,6 +1323,7 @@ graphics/particles/power-circle.particle.xml + npcs/anon.xml model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 @@ -1297,8 +1337,10 @@ graphics/particles/angel.particle.xml + npcs/tal.xml + npcs/airship.xml model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5 -- cgit v1.2.3-70-g09d2