Fix some new CI bugs introduced by a reckless conversion

2 files changed, 33 insertions, 66 deletions

diff --git a/items/equip-1hand.xml b/items/equip-1hand.xml
index 8d8cdeea..95f74592 100644
--- a/items/equip-1hand.xml
+++ b/items/equip-1hand.xml
@@ -84,10 +84,8 @@
         
     <sprite gender="unisex">equipment/weapons/xmas-bow-slingshot.xml</sprite>
     <sprite gender="female">equipment/weapons/xmas-bow-slingshot.xml</sprite>
-    <sound event="hit">
-    weapons/projectiles/snowball/hit1.ogg</sound>
-    <sound event="miss">
-    weapons/projectiles/snowball/miss1.ogg</sound>
+    <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound>
+    <sound event="miss">weapons/projectiles/snowball/miss1.ogg</sound>
   </item>
   <item id="536"
         image="equipment/weapon/dagger-shortsword.png"
@@ -141,12 +139,9 @@
         sellProtected="true">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="hit">
-    weapons/knives/setzer/setzer-hit1.ogg</sound>
-    <sound event="hit">
-    weapons/knives/setzer/setzer-hit2.ogg</sound>
-    <sound event="hit">
-    weapons/knives/setzer/setzer-hit3.ogg</sound>
+    <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
+    <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound>
+    <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound>
     <sound event="strike">weapons/miss1.ogg</sound>
     <sound event="strike">weapons/miss2.ogg</sound>
     <sound event="strike">weapons/miss3.ogg</sound>
@@ -165,12 +160,9 @@
         weight="2000"
         sellProtected="true">
     <sprite gender="unisex">equipment/weapons/beheader.xml</sprite>
-    <sound event="strike">
-    weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss3.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
     <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound>
     <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound>
     <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound>
@@ -259,16 +251,11 @@
         weight="1000">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sound event="hit">
-    weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound>
-    <sound event="hit">
-    weapons/swords/ice_gladius/ice_gladius-hit2.ogg</sound>
-    <sound event="hit">
-    weapons/swords/ice_gladius/ice_gladius-hit3.ogg</sound>
-    <sound event="hit">
-    weapons/swords/ice_gladius/ice_gladius-hit4.ogg</sound>
-    <sound event="hit">
-    weapons/swords/ice_gladius/ice_gladius-hit5.ogg</sound>
+    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound>
+    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit2.ogg</sound>
+    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit3.ogg</sound>
+    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit4.ogg</sound>
+    <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit5.ogg</sound>
     <sound event="strike">weapons/swords/sword-miss1.ogg</sound>
   </item>
 </items>
diff --git a/items/equip-2hand.xml b/items/equip-2hand.xml
index 4e0902ef..29ed505e 100644
--- a/items/equip-2hand.xml
+++ b/items/equip-2hand.xml
@@ -27,8 +27,7 @@
         missile-particle="graphics/particles/arrow.particle.xml">
     <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">
-    weapons/bows/short/short-miss1.ogg</sound>
+    <sound event="strike">weapons/bows/short/short-miss1.ogg</sound>
     <sound event="hit">weapons/bows/short/short-hit1.ogg</sound>
   </item>
   <item id="545"
@@ -43,8 +42,7 @@
         missile-particle="graphics/particles/arrow.particle.xml">
     <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">
-    weapons/bows/forest/forest-miss1.ogg</sound>
+    <sound event="strike">weapons/bows/forest/forest-miss1.ogg</sound>
     <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
   </item>
   <item id="548"
@@ -58,18 +56,12 @@
         weight="1400">
     <sprite gender="unisex">equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="hit">
-    weapons/other/halberd/halberd-hit1.ogg</sound>
-    <sound event="hit">
-    weapons/other/halberd/halberd-hit2.ogg</sound>
-    <sound event="hit">
-    weapons/other/halberd/halberd-hit3.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss3.ogg</sound>
+    <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
+    <sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
+    <sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
   </item>
   <item id="588"
         image="equipment/weapon/sword-bastardsword.png"
@@ -143,12 +135,9 @@
         sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">
-    weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss3.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
     <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound>
     <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound>
     <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound>
@@ -167,12 +156,9 @@
         weight="1000">
     <sprite gender="unisex">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="strike">
-    weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="strike">
-    weapons/other/staff/staff-miss3.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+    <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
     <sound event="hit">weapons/other/staff/staff-hit1.ogg</sound>
     <sound event="hit">weapons/other/staff/staff-hit2.ogg</sound>
     <sound event="hit">weapons/other/staff/staff-hit3.ogg</sound>
@@ -194,18 +180,12 @@
         sellProtected="true">
     <sprite gender="unisex">equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1</sprite>
     <sprite gender="female">equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1</sprite>
-    <sound event="strike">
-    weapons/bows/banshee/banshee-miss1.ogg</sound>
-    <sound event="strike">
-    weapons/bows/banshee/banshee-miss2.ogg</sound>
-    <sound event="strike">
-    weapons/bows/banshee/banshee-miss3.ogg</sound>
-    <sound event="hit">
-    weapons/bows/banshee/banshee-hit1.ogg</sound>
-    <sound event="hit">
-    weapons/bows/banshee/banshee-hit2.ogg</sound>
-    <sound event="hit">
-    weapons/bows/banshee/banshee-hit3.ogg</sound>
+    <sound event="strike">weapons/bows/banshee/banshee-miss1.ogg</sound>
+    <sound event="strike">weapons/bows/banshee/banshee-miss2.ogg</sound>
+    <sound event="strike">weapons/bows/banshee/banshee-miss3.ogg</sound>
+    <sound event="hit">weapons/bows/banshee/banshee-hit1.ogg</sound>
+    <sound event="hit">weapons/bows/banshee/banshee-hit2.ogg</sound>
+    <sound event="hit">weapons/bows/banshee/banshee-hit3.ogg</sound>
   </item>
   <item id="903"
         image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d"