From b1ecfd6a3cec72aa9fbab7e8af52e144a5290559 Mon Sep 17 00:00:00 2001
From: Ledmitz <smoothshifter@tuta.io>
Date: Mon, 17 Apr 2023 18:49:24 -0300
Subject: Changed ID to avoid later conflict

---
 monsters/monster1172_Emo.xml | 20 --------------------
 monsters/monster1174_Emo.xml | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 monsters/monster1172_Emo.xml
 create mode 100644 monsters/monster1174_Emo.xml

diff --git a/monsters/monster1172_Emo.xml b/monsters/monster1172_Emo.xml
deleted file mode 100644
index a282a1eb..00000000
--- a/monsters/monster1172_Emo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<monsters offset="0">
-  <monster id="1172" name="Emo">
-    <sprite gender="male">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
-    <sprite>hairstyles/hairstyle27.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
-    <sprite>equipment/chest/leather.xml|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
-    <sprite>equipment/legs/pants.xml|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
-    <sprite>equipment/head/shades.xml|#104010,208020,30c030</sprite>
-    <sprite>equipment/feet/boots.xml|#212121,555555</sprite>
-    <sprite>equipment/hands/generic.xml|#4e2e18,c8752f</sprite>
-    <sprite>equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite>equipment/shields/wooden.xml</sprite>
-    <sound event="die">env/spawn_burst.ogg</sound>
-    <sound event="hit">weapons/swords/longsword-hit1.ogg</sound>
-    <sound event="hit">weapons/swords/longsword-hit2.ogg</sound>
-    <sound event="miss">weapons/miss1.ogg</sound>
-    <sound event="miss">weapons/miss2.ogg</sound>
-    <sound event="miss">weapons/miss3.ogg</sound>
-  </monster>
-</monsters>
diff --git a/monsters/monster1174_Emo.xml b/monsters/monster1174_Emo.xml
new file mode 100644
index 00000000..471d81d9
--- /dev/null
+++ b/monsters/monster1174_Emo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<monsters offset="0">
+  <monster id="1174" name="Emo">
+    <sprite gender="male">model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle27.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+    <sprite>equipment/chest/leather.xml|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
+    <sprite>equipment/legs/pants.xml|W:#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite>
+    <sprite>equipment/head/shades.xml|#104010,208020,30c030</sprite>
+    <sprite>equipment/feet/boots.xml|#212121,555555</sprite>
+    <sprite>equipment/hands/generic.xml|#4e2e18,c8752f</sprite>
+    <sprite>equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite>equipment/shields/wooden.xml</sprite>
+    <sound event="die">env/spawn_burst.ogg</sound>
+    <sound event="hit">weapons/swords/longsword-hit1.ogg</sound>
+    <sound event="hit">weapons/swords/longsword-hit2.ogg</sound>
+    <sound event="miss">weapons/miss1.ogg</sound>
+    <sound event="miss">weapons/miss2.ogg</sound>
+    <sound event="miss">weapons/miss3.ogg</sound>
+  </monster>
+</monsters>
-- 
cgit v1.2.3-60-g2f50