Conflict resolution 1floyd_book

12 files changed, 15 insertions, 17 deletions

diff --git a/monsters/monster1050_HouseMaggot.xml b/monsters/monster1050_HouseMaggot.xml
index dbfdecd8..ac6b479f 100644
--- a/monsters/monster1050_HouseMaggot.xml
+++ b/monsters/monster1050_HouseMaggot.xml
@@ -4,7 +4,7 @@
     <sprite>monsters/cave-maggot.xml|#4d422d,826242,d8c282,ffffff</sprite>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
     <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
-    <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
+    <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> -->
     <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1056_CaveMaggot.xml b/monsters/monster1056_CaveMaggot.xml
index 3aa24901..75deb799 100644
--- a/monsters/monster1056_CaveMaggot.xml
+++ b/monsters/monster1056_CaveMaggot.xml
@@ -4,7 +4,7 @@
     <sprite>monsters/cave-maggot.xml|</sprite>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
     <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
-    <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
+    <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> -->
     <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1119_Thug.xml b/monsters/monster1119_Thug.xml
index 9b3e8130..175e84a0 100644
--- a/monsters/monster1119_Thug.xml
+++ b/monsters/monster1119_Thug.xml
@@ -7,7 +7,7 @@
     <sprite>equipment/feet/boots.xml</sprite>
     <sprite>equipment/chest/tanktop.xml</sprite>
     <sprite>equipment/legs/pants.xml</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">weapons/punch1.ogg</sound>
     <sound event="hit">weapons/punch2.ogg</sound>
     <sound event="hit">weapons/punch3.ogg</sound>
diff --git a/monsters/monster1121_Grenadier.xml b/monsters/monster1121_Grenadier.xml
index 7eec61e7..50e6872a 100644
--- a/monsters/monster1121_Grenadier.xml
+++ b/monsters/monster1121_Grenadier.xml
@@ -8,7 +8,7 @@
     <sprite>equipment/head/piratehat.xml</sprite>
     <sprite>equipment/hands/generic.xml</sprite>
     <sprite>equipment/feet/boots.xml|#212121,444444</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">system/crit.ogg</sound>
     <sound event="miss">system/crit.ogg</sound>
     <attack id="1" critical-hit-effect-id="30" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
diff --git a/monsters/monster1122_TheDreadPirateMarley.xml b/monsters/monster1122_TheDreadPirateMarley.xml
index ddac0e84..83e66e32 100644
--- a/monsters/monster1122_TheDreadPirateMarley.xml
+++ b/monsters/monster1122_TheDreadPirateMarley.xml
@@ -8,7 +8,7 @@
     <sprite>equipment/head/eyepatch.xml</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
     <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
diff --git a/monsters/monster1123_TheDreadPirateMarley.xml b/monsters/monster1123_TheDreadPirateMarley.xml
index 939e88e0..a4135a8e 100644
--- a/monsters/monster1123_TheDreadPirateMarley.xml
+++ b/monsters/monster1123_TheDreadPirateMarley.xml
@@ -8,7 +8,7 @@
     <sprite>equipment/head/eyepatch.xml</sprite>
     <sprite>equipment/feet/assassin-boots.xml</sprite>
     <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
-    <sound event="die">system/spawn_burst.ogg</sound>
+    <sound event="die">env/spawn_burst.ogg</sound>
     <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
     <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
     <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/>
diff --git a/monsters/monster1127_GeneralKrukan.xml b/monsters/monster1127_GeneralKrukan.xml
index f9948562..67c6b11f 100644
--- a/monsters/monster1127_GeneralKrukan.xml
+++ b/monsters/monster1127_GeneralKrukan.xml
@@ -4,11 +4,11 @@
     <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
     <sprite>equipment/legs/chaps.xml</sprite>
     <sprite>equipment/chest/warlordplate.xml</sprite>
-    <sprite>equipment/head/bull.xml</sprite>
+    <sprite>equipment/head/dark-helm.xml</sprite>
     <sound event="die">monsters/fallen/fallen-die2.ogg</sound>
-    <sound event="hit">monsters/skeleton/skell-hit1.ogg</sound>
-    <sound event="hit">monsters/skeleton/skell-hit2.ogg</sound>
-    <sound event="hit">monsters/skeleton/skell-hit3.ogg</sound>
+    <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound>
+    <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound>
+    <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound>
     <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound>
     <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound>
     <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound>
diff --git a/monsters/monster1128_GeneralRazha.xml b/monsters/monster1128_GeneralRazha.xml
index 51d9eded..86434534 100644
--- a/monsters/monster1128_GeneralRazha.xml
+++ b/monsters/monster1128_GeneralRazha.xml
@@ -5,7 +5,7 @@
     <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite>
     <sprite>equipment/hands/generic.xml|#242424,626262</sprite>
     <sprite>equipment/chest/demonwarlordplate.xml|#ea0000,979797</sprite>
-    <sprite>equipment/head/bull.xml</sprite>
+    <sprite>equipment/head/underworld-mask.xml</sprite>
     <sprite>equipment/weapons/dagger.xml|#181619,1c1b00,1b1a31,54438a,5b5660,827e85,9596e0</sprite>
     <sound event="die">monsters/fallen/fallen-die2.ogg</sound>
     <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
diff --git a/monsters/monster1129_GeneralTerogan.xml b/monsters/monster1129_GeneralTerogan.xml
index f6cde526..d10848fa 100644
--- a/monsters/monster1129_GeneralTerogan.xml
+++ b/monsters/monster1129_GeneralTerogan.xml
@@ -10,7 +10,7 @@
     <sound event="hit">magic/confringo1.ogg</sound>
     <sound event="hit">magic/confringo2.ogg</sound>
     <sound event="hit">magic/confringo3.ogg</sound>
-    <sound event="hurt">monsters/fallen/skel-hurt1.ogg</sound>
+    <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound>
     <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound>
     <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/>
   </monster>
diff --git a/monsters/monster1135_LovelyMaggot.xml b/monsters/monster1135_LovelyMaggot.xml
index 523f509d..33349f72 100644
--- a/monsters/monster1135_LovelyMaggot.xml
+++ b/monsters/monster1135_LovelyMaggot.xml
@@ -4,7 +4,7 @@
     <sprite>monsters/lovely-maggot.xml|S:#524b51,8463a0,6f706f,af006d</sprite>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
     <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
-    <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
+    <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> -->
     <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1138_ManaGuardian.xml b/monsters/monster1138_ManaGuardian.xml
index 6f8082d0..5c865fad 100644
--- a/monsters/monster1138_ManaGuardian.xml
+++ b/monsters/monster1138_ManaGuardian.xml
@@ -9,9 +9,7 @@
     <!-- No folder for this -->
     <sprite>equipment/angel-wings.xml</sprite>
     <sprite>equipment/head/aureole.xml</sprite>
-    <sound event="hit">weapons/punch1.ogg</sound>
-    <sound event="hit">weapons/punch2.ogg</sound>
-    <sound event="hit">weapons/punch3.ogg</sound>
+    <sound event="hit">env/flame.ogg</sound>
     <sound event="miss">weapons/miss1.ogg</sound>
     <sound event="miss">weapons/miss2.ogg</sound>
     <sound event="miss">weapons/miss3.ogg</sound>
diff --git a/monsters/monster1156_VoidMaggot.xml b/monsters/monster1156_VoidMaggot.xml
index 8871e4c0..6399c2a9 100644
--- a/monsters/monster1156_VoidMaggot.xml
+++ b/monsters/monster1156_VoidMaggot.xml
@@ -4,7 +4,7 @@
     <sprite>monsters/void-maggot.xml</sprite>
     <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
     <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
-    <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
+    <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> -->
     <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
   </monster>
 </monsters>