From cc378072ee528746a14cad4004a3d36fe004d6a7 Mon Sep 17 00:00:00 2001
From: Saulc <lucashelaine14@gmail.com>
Date: Sat, 25 Apr 2020 11:20:59 +0000
Subject: Fix sword calls

---
 monsters.xml | 14 +++++++-------
 npcs.xml     | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/monsters.xml b/monsters.xml
index e7203586..45d1293f 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1175,7 +1175,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
     <sprite>equipment/feet/assassinboots-male.xml</sprite>
 
     <sprite>equipment/hands/assassingloves-male.xml</sprite>
-    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/weapons/shortgladius.xml</sprite>
 	<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	<sound event="miss">monsters/flower/miss.ogg</sound>
 	<sound event="die">monsters/frostiana/hit1.ogg</sound>
@@ -1259,7 +1259,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
     <sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
 
     <sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/weapons/shortgladius.xml</sprite>
 	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
 	<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	<sound event="miss">monsters/flower/miss.ogg</sound>
@@ -1275,7 +1275,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
     <sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
 
     <sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/weapons/shortgladius.xml</sprite>
 	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
 	<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	<sound event="miss">monsters/flower/miss.ogg</sound>
@@ -1291,7 +1291,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
     <sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
 
     <sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/weapons/shortgladius.xml</sprite>
 	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
 	<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	<sound event="miss">monsters/flower/miss.ogg</sound>
@@ -1307,7 +1307,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
     <sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
 
     <sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/weapons/shortgladius.xml</sprite>
 	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
 	<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	<sound event="miss">monsters/flower/miss.ogg</sound>
@@ -1323,7 +1323,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
     <sprite>equipment/feet/boots-female.xml|#594d36,b49b6c,f4d293</sprite>
 
     <sprite>equipment/hands/armbands-female.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/weapons/shortgladius.xml</sprite>
 	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
 	<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	<sound event="miss">monsters/flower/miss.ogg</sound>
@@ -1336,7 +1336,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
     <sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
     <sprite>equipment/chest/trainingshirt-male.xml</sprite>
     <sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/weapons/shortgladius.xml</sprite>
     <sprite>hairstyles/hairstyle28.xml|#2b2b2b,311623,3f3f3f,451a25,585858,602222,858585,7d2b26,a7a7a7,9a3416,d6d6d6,ca7e55,ffffff,e2b88f</sprite>
 	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
   </monster>
diff --git a/npcs.xml b/npcs.xml
index 29d6a1a3..e5193c75 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -869,7 +869,7 @@ IDs 900-999 = Special
 		<sprite>equipment/feet/boots-male.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
 		<sprite>equipment/chest/copperarmor-male.xml</sprite>
 		<sprite>equipment/hands/armbands-male.xml</sprite>
-		<sprite>equipment/weapons/traininggladius.xml</sprite>
+		<sprite>equipment/weapons/shortgradius.xml</sprite>
 		<sprite>hairstyles/hairstyle04.xml|#2b2b2b,4b3e44,3f3f3f,59494c,585858,887565,858585,a29171,a7a7a7,ccbb9b,d6d6d6,e7debd,ffffff,faf8f1</sprite>
 		<menu name="Talk" command="talk 'NAME'"/>
 	</npc>
@@ -880,7 +880,7 @@ IDs 900-999 = Special
 		<sprite>equipment/feet/boots-male.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
 		<sprite>equipment/chest/trainingshirt-male.xml</sprite>
 		<sprite>equipment/hands/armbands-male.xml|#663d38,4b6167,8f5c52,708892,ad7c65,a5bebf,d9c9b2,a5bebf</sprite>
-		<sprite>equipment/weapons/traininggladius.xml</sprite>
+		<sprite>equipment/weapons/shortgradius.xml</sprite>
 		<sprite>hairstyles/hairstyle23.xml|#2b2b2b,471c26,3f3f3f,591f20,585858,8f2f2c,858585,a63e25,a7a7a7,c85a2f,d6d6d6,f39855,ffffff,ffe3b6</sprite>
 		<menu name="Talk" command="talk 'NAME'"/>
 	</npc>
@@ -891,7 +891,7 @@ IDs 900-999 = Special
 		<sprite>equipment/feet/boots-female.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
 		<sprite>equipment/chest/copperarmor-female.xml</sprite>
 		<sprite>equipment/hands/armbands-female.xml|#663d38,4b6167,8f5c52,708892,ad7c65,a5bebf,d9c9b2,a5bebf</sprite>
-		<sprite>equipment/weapons/piouslayer.xml</sprite>
+		<sprite>equipment/weapons/bugslayer.xml</sprite>
 		<sprite>hairstyles/hairstyle12.xml|#4b3e44,59494c,887565,a29171,ccbb9b,e7debd,faf8f1</sprite>
 		<menu name="Talk" command="talk 'NAME'"/>
 	</npc>
@@ -902,7 +902,7 @@ IDs 900-999 = Special
 		<sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
 		<sprite>equipment/chest/trainingshirt-male.xml</sprite>
 		<sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-		<sprite>equipment/weapons/traininggladius.xml</sprite>
+		<sprite>equipment/weapons/shortgradius.xml</sprite>
 		<sprite>hairstyles/hairstyle28.xml|#2b2b2b,311623,3f3f3f,451a25,585858,602222,858585,7d2b26,a7a7a7,9a3416,d6d6d6,ca7e55,ffffff,e2b88f</sprite>
 		<menu name="Talk" command="talk 'NAME'"/>
 	</npc>
@@ -913,7 +913,7 @@ IDs 900-999 = Special
 		<sprite>equipment/feet/boots-female.xml|#2b384d,4b6167,a5bebf,d8e7df,e2fdf6</sprite>
 		<sprite>equipment/chest/copperarmor-female.xml</sprite>
 		<sprite>equipment/hands/armbands-female.xml|#663d38,4b6167,8f5c52,708892,ad7c65,a5bebf,d9c9b2,a5bebf</sprite>
-		<sprite>equipment/weapons/traininggladius.xml</sprite>
+		<sprite>equipment/weapons/shortgradius.xml</sprite>
 		<sprite>hairstyles/hairstyle24.xml|#2b2b2b,51341e,3f3f3f,664224,585858,91642f,858585,a67b32,a7a7a7,ccad4d,d6d6d6,e8de6c,ffffff,feffe6</sprite>
 		<menu name="Talk" command="talk 'NAME'"/>
 	</npc>
-- 
cgit v1.2.3-60-g2f50