From 9884e95f33913e5772ba7cae7c3f12509e708559 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 14 Dec 2018 13:38:40 -0200
Subject: Correct inconsistencies

---
 mercenaries.xml | 40 +++++++++++++++++++++++++++++++++++++---
 monsters.xml    | 20 ++++++++++----------
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/mercenaries.xml b/mercenaries.xml
index 5ec37f8a..b1af95f5 100644
--- a/mercenaries.xml
+++ b/mercenaries.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Author: 4144
-Copyright (C) 2016 Evol Online -->
+<!-- Author: 4144, Jesusalva
+Copyright (C) 2016 Evol Online
+Copyright (C) 2018 TMW2: Moubootaur Legends -->
 
 <mercenaries>
     <mercenary
-        id="1191"
+        id="3000"
         name="merc"
         startFollowDistance="3"
         followDistance="1"
@@ -27,4 +28,37 @@ Copyright (C) 2016 Evol Online -->
     >
         <sprite>races/human-male.xml</sprite>
     </mercenary>
+    <mercenary
+        id="3001"
+        name="Andrei Sakar"
+        startFollowDistance="3"
+        followDistance="1"
+        warpDistance="11"
+        offsetX="0"
+        offsetY="2"
+        sitOffsetX="1"
+        sitOffsetY="0"
+        moveOffsetX="0"
+        moveOffsetY="5"
+        deadOffsetX="0"
+        deadOffsetY="0"
+        attackOffsetX="0"
+        attackOffsetY="2"
+        thinkTime="100"
+        directionType="2"
+        sitDirectionType="1"
+        deadDirectionType="1"
+        attackDirectionType="4"
+    >
+        <sprite>races/human-male.xml</sprite>
+	    <sprite>hairstyles/hairstyle07.xml|#2b2b2b,3d2613,3f3f3f,4e3117,585858,774c20,858585,8f5d22,a7a7a7,ae772d,d6d6d6,dbae5c,ffffff,f7e1ad</sprite>
+
+	    <sprite>equipment/chest/warlordplate-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+	    <sprite>equipment/legs/bromenalpants-male.xml</sprite>
+	    <sprite>equipment/feet/boots-male.xml|#212121</sprite>
+
+	    <sound event="hit">special/nature-thunder.ogg</sound>
+	    <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+    </mercenary>
 </mercenaries>
diff --git a/monsters.xml b/monsters.xml
index c1e47c52..ced85660 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -562,25 +562,25 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 	<monster id="1115" name="Big Sapphire Bif" targetCursor="medium">
 		<sprite>monsters/bigbif.xml|#4b4bbd,888af4</sprite>
 	</monster>
-	<!-- FIXME broken XML
-	<monster id="1116" name="Demonic Mouboo" targetCursor="medium">
-		<sprite>monsters/demonicmouboo.xml</sprite>
-		<sprite>accessories/demonicmoubooantlers.xml</sprite>
-		<particlefx>graphics/particles/demonicmouboo.particle.xml</particlefx>
-	</monster>
-	-->
-	<monster id="1117" name="Small Magic Bif" targetCursor="small">
+	<monster id="1116" name="Small Magic Bif" targetCursor="small">
 		<sprite>monsters/smallbif.xml|#ffa10c,ff0e93</sprite>
 		<particlefx>graphics/particles/smallmagicbif.particle.xml</particlefx>
 	</monster>
-	<monster id="1118" name="Magic Bif" targetCursor="medium">
+	<monster id="1117" name="Magic Bif" targetCursor="medium">
 		<sprite>monsters/bif.xml|#6a00fc,1c9fff</sprite>
 		<particlefx>graphics/particles/magicbif.particle.xml</particlefx>
 	</monster>
-	<monster id="1119" name="Big Magic Bif" targetCursor="medium">
+	<monster id="1118" name="Big Magic Bif" targetCursor="medium">
 		<sprite>monsters/bigbif.xml|#ff059d,ff0e93</sprite>
 		<particlefx>graphics/particles/bigmagicbif.particle.xml</particlefx>
 	</monster>
+	<!-- FIXME broken XML
+	<monster id="1119" name="Bloody Mouboo" targetCursor="medium">
+		<sprite>monsters/demonicmouboo.xml</sprite>
+		<sprite>accessories/demonicmoubooantlers.xml</sprite>
+		<particlefx>graphics/particles/demonicmouboo.particle.xml</particlefx>
+	</monster>
+	-->
 	<monster id="1120" name="Jack'O" targetCursor="medium">
 		<sprite>monsters/jacko.xml</sprite>
 	</monster>
-- 
cgit v1.2.3-70-g09d2