Merge branch 'contentII' into 'master'

Adding all missing equipment, accessoires, items, and some additional stuff

See merge request evol/clientdata!170

1 files changed, 35 insertions, 3 deletions

diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index ac50dd3e..0ee9968d 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="270" height="230" tilewidth="32" tileheight="32" infinite="0" nextlayerid="60" nextobjectid="34">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="270" height="230" tilewidth="32" tileheight="32" infinite="0" nextlayerid="60" nextobjectid="38">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -2654,8 +2654,8 @@
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1405,1405,1405,0,0,2372,0,0,0,0,0,0,1405,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,2372,2372,2372,2372,0,2373,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,1403,1403,2375,2375,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1403,1403,1403,1403,1403,2372,2372,1403,1403,2372,2372,1403,1405,1405,1405,0,0,0,0,0,0,0,0,2373,1405,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,2372,0,0,0,0,2372,2372,0,0,0,0,0,2372,0,0,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,2372,1403,1403,1403,2372,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,2372,2372,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1405,1405,0,0,0,2375,2375,0,0,0,0,0,0,1405,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,2373,2373,2373,2373,2373,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,2372,2372,2372,2372,2372,
-1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,1403,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,2375,2375,0,0,0,0,0,2373,2373,2373,2373,2373,2373,2373,2373,2373,0,2372,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,2372,0,0,0,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,
-1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1405,1405,0,0,0,0,0,0,0,2372,0,0,0,0,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,1403,1403,0,0,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,
+1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,1403,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,2375,2375,0,0,0,0,0,2373,2373,2373,2373,2373,2373,2373,2373,2373,0,2372,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,2372,0,0,0,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,
+1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1405,1405,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,1405,0,0,1403,1403,0,0,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,0,0,0,0,0,0,0,0,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,2372,2373,2373,2373,2373,2373,2373,1405,1405,1405,1405,1405,1405,2373,2373,2373,2373,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,1403,1403,1403,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,2373,0,0,0,0,0,0,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,2373,2373,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,2373,2373,2373,2373,2373,0,2372,0,0,0,0,0,0,0,0,0,0,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2375,2375,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,0,2375,2375,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1403,1403,2372,2372,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
 1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1405,1405,1405,1405,1405,1403,1403,1403,1403,1403,1403,1403,2372,2372,2372,2372,2372,2372,1403,1403,1403,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,1405,1405,1405,0,2373,2375,2375,2373,0,1405,1405,1405,1405,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,0,2372,2372,2372,2372,2372,2372,2372,2372,2372,2372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2373,2373,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,1405,2373,2373,2373,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2372,0,0,0,0,0,0,0,0,0,1403,1403,1403,1403,1403,1403,1403,1403,1403,2372,1403,1403,1403,1403,1403,2372,2372,1403,1403,1403,
@@ -3291,5 +3291,37 @@
     <property name="spawn" value="3000"/>
    </properties>
   </object>
+  <object id="34" name="Big Frog" type="spawn" x="2304" y="1888" width="2048" height="1792">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1087"/>
+    <property name="spawn" value="6000"/>
+   </properties>
+  </object>
+  <object id="35" name="Small Frog" type="spawn" x="1152" y="2400" width="3200" height="2784">
+   <properties>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="8"/>
+    <property name="monster_id" value="1086"/>
+    <property name="spawn" value="3000"/>
+   </properties>
+  </object>
+  <object id="36" name="Big Frog" type="spawn" x="3456" y="4000" width="2880" height="2592">
+   <properties>
+    <property name="death" value="75000"/>
+    <property name="max_beings" value="5"/>
+    <property name="monster_id" value="1087"/>
+    <property name="spawn" value="6000"/>
+   </properties>
+  </object>
+  <object id="37" name="Small Frog" type="spawn" x="4448" y="5440" width="3200" height="1184">
+   <properties>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="7"/>
+    <property name="monster_id" value="1086"/>
+    <property name="spawn" value="3000"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>