From cb40a6a37ddb5a64e02ddc4cd8e0f2bbca6a3890 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 7 Dec 2020 23:01:11 -0300
Subject: Add monsters to 017-0 READY FOR RELEASE (CLIENT SIDE)

---
 maps/017-0.tmx | 76 +++++++++++++++++++++++++++++++++++-----------------------
 monsters.xml   |  4 ++--
 2 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/maps/017-0.tmx b/maps/017-0.tmx
index effd7ac2..e96d7c31 100644
--- a/maps/017-0.tmx
+++ b/maps/017-0.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="340" height="275" tilewidth="32" tileheight="32" infinite="0" nextlayerid="74" nextobjectid="577">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="340" height="275" tilewidth="32" tileheight="32" infinite="0" nextlayerid="74" nextobjectid="579">
  <properties>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/017-0.png"/>
@@ -95,7 +95,7 @@
  <tileset firstgid="2520" name="Forest x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
   <image source="../graphics/tilesets/woodland_x2.png" width="512" height="128"/>
  </tileset>
- <layer id="63" name="Ground" width="340" height="275" visible="0">
+ <layer id="63" name="Ground" width="340" height="275">
   <data encoding="csv">
 2029,2029,2029,2029,2029,2029,2029,2029,2029,2029,2029,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,
 2029,2029,2029,2029,2029,2029,2029,2029,2029,2029,2029,2029,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,2127,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,
@@ -1769,7 +1769,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="71" name="Collision" width="340" height="275" opacity="0.6">
+ <layer id="71" name="Collision" width="340" height="275" visible="0">
   <data encoding="csv">
 725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
 725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
@@ -2360,91 +2360,107 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="565" name="Fluffy" type="spawn" x="6336" y="1312" width="2816" height="3296">
+  <object id="565" name="Wind Fairy" type="spawn" x="6336" y="1312" width="2816" height="3296">
    <properties>
     <property name="death" value="45000"/>
-    <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="max_beings" value="11"/>
+    <property name="monster_id" value="1185"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="566" name="Fluffy" type="spawn" x="6304" y="3360" width="1632" height="3200">
+  <object id="566" name="Nature Fairy" type="spawn" x="6304" y="3360" width="1632" height="3200">
    <properties>
     <property name="death" value="45000"/>
-    <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="max_beings" value="12"/>
+    <property name="monster_id" value="1186"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="567" name="Fluffy" type="spawn" x="5632" y="4256" width="1632" height="3200">
+  <object id="567" name="Forest Mushroom" type="spawn" x="5632" y="4256" width="1632" height="3200">
    <properties>
     <property name="death" value="45000"/>
-    <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="max_beings" value="13"/>
+    <property name="monster_id" value="1060"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="568" name="Fluffy" type="spawn" x="4416" y="5344" width="1632" height="1888">
+  <object id="568" name="Tipiu" type="spawn" x="4416" y="5344" width="1632" height="1888">
    <properties>
     <property name="death" value="45000"/>
     <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="monster_id" value="1015"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="569" name="Fluffy" type="spawn" x="1472" y="3328" width="1696" height="1248">
+  <object id="569" name="Archant" type="spawn" x="1472" y="3328" width="1696" height="1248">
    <properties>
     <property name="death" value="45000"/>
     <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="monster_id" value="1026"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="570" name="Fluffy" type="spawn" x="2656" y="2112" width="1248" height="1248">
+  <object id="570" name="Skeleton" type="spawn" x="2656" y="2112" width="1248" height="1248">
    <properties>
     <property name="death" value="45000"/>
     <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="monster_id" value="1137"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="571" name="Fluffy" type="spawn" x="3808" y="1856" width="1632" height="3200">
+  <object id="571" name="Forain" type="spawn" x="3808" y="1856" width="1632" height="3200">
    <properties>
     <property name="death" value="45000"/>
-    <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="max_beings" value="12"/>
+    <property name="monster_id" value="1061"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="572" name="Fluffy" type="spawn" x="4544" y="2080" width="1696" height="1600">
+  <object id="572" name="Scar" type="spawn" x="4288" y="2080" width="1952" height="1600">
    <properties>
     <property name="death" value="45000"/>
     <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="monster_id" value="1045"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="573" name="Fluffy" type="spawn" x="1792" y="4320" width="2560" height="2784">
+  <object id="573" name="Sea Slime Mother" type="spawn" x="1792" y="4320" width="2560" height="2784">
    <properties>
     <property name="death" value="45000"/>
     <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="monster_id" value="1244"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="574" name="Fluffy" type="spawn" x="2176" y="3136" width="1728" height="1664">
+  <object id="574" name="Bluepar" type="spawn" x="2176" y="3136" width="1728" height="1664">
    <properties>
     <property name="death" value="45000"/>
     <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="monster_id" value="1177"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="575" name="Fluffy" type="spawn" x="6784" y="4032" width="1632" height="1600">
+  <object id="575" name="Red Mushroom" type="spawn" x="6784" y="4032" width="1632" height="1600">
    <properties>
     <property name="death" value="45000"/>
-    <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1022"/>
+    <property name="max_beings" value="18"/>
+    <property name="monster_id" value="1042"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+  <object id="577" name="Wicked Mushroom" type="spawn" x="3808" y="3296" width="1696" height="1600">
+   <properties>
+    <property name="death" value="45000"/>
+    <property name="max_beings" value="12"/>
+    <property name="monster_id" value="1176"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+  <object id="578" name="Vampire Bat" type="spawn" x="3840" y="1440" width="1920" height="3456">
+   <properties>
+    <property name="death" value="45000"/>
+    <property name="max_beings" value="18"/>
+    <property name="monster_id" value="1063"/>
     <property name="spawn" value="60000"/>
    </properties>
   </object>
diff --git a/monsters.xml b/monsters.xml
index 88666e8a..942ea47e 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -281,8 +281,8 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 		<particlefx>graphics/particles/black.particle.xml</particlefx>
 		<particlefx>graphics/particles/black.particle.xml</particlefx>
 	</monster>
-	<monster id="1045" name="Warlord Skull" targetCursor="medium">
-		<sprite>monsters/warlordskull.xml</sprite>
+	<monster id="1045" name="Scar" targetCursor="medium">
+		<sprite>monsters/scar.xml</sprite>
 	</monster>
 	<monster id="1046" name="Red Dragon" targetCursor="large" walkType="fly">
 		<sprite>monsters/reddragon.xml</sprite>
-- 
cgit v1.2.3-60-g2f50