add GP and Kg units

1 files changed, 53 insertions, 205 deletions

diff --git a/maps/005-1.tmx b/maps/005-1.tmx
index 03b6a5f4..0b7fe394 100644
--- a/maps/005-1.tmx
+++ b/maps/005-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextobjectid="67">
+<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextobjectid="88">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -1305,264 +1305,112 @@
     <property name="dest_y" value="28"/>
    </properties>
   </object>
-  <object id="3" name="Tortuga" type="spawn" x="704" y="576" width="416" height="640">
-   <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1004"/>
-    <property name="spawn" value="16000"/>
-   </properties>
-  </object>
-  <object id="4" name="Tortuga" type="spawn" x="771" y="2624" width="2240" height="928">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="4"/>
-    <property name="monster_id" value="1004"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="5" name="Tortuga" type="spawn" x="2144" y="1952" width="320" height="800">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1004"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="6" name="Tortuga" type="spawn" x="1536" y="1696" width="320" height="1120">
+  <object id="29" name="graphics/particles/panels.xml" type="particle_effect" x="2848" y="928" width="32" height="32"/>
+  <object id="30" name="graphics/particles/panels.xml" type="particle_effect" x="2080" y="2272" width="32" height="32"/>
+  <object id="50" name="to Saxso House" type="warp" x="994" y="2561" width="32" height="32">
    <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1004"/>
-    <property name="spawn" value="35000"/>
+    <property name="dest_map" value="005-2"/>
+    <property name="dest_x" value="33"/>
+    <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="7" name="Tortuga" type="spawn" x="832" y="1248" width="736" height="352">
+  <object id="51" name="to Storage House" type="warp" x="1116" y="2392" width="32" height="32">
    <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1004"/>
-    <property name="spawn" value="35000"/>
+    <property name="dest_map" value="005-3"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="8" name="Tortuga" type="spawn" x="1056" y="96" width="640" height="1088">
+  <object id="52" name="to Shop" type="warp" x="1540" y="2266" width="32" height="32">
    <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1004"/>
-    <property name="spawn" value="35000"/>
+    <property name="dest_map" value="005-4"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="9" name="Tortuga" type="spawn" x="2400" y="128" width="800" height="768">
+  <object id="53" name="to storage" type="warp" x="1250" y="2176" width="32" height="32">
    <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1004"/>
-    <property name="spawn" value="35000"/>
+    <property name="dest_map" value="005-5"/>
+    <property name="dest_x" value="25"/>
+    <property name="dest_y" value="41"/>
    </properties>
   </object>
-  <object id="11" name="Little Blub" type="spawn" x="1728" y="1024" width="480" height="704">
+  <object id="58" name="to big house" type="warp" x="704" y="2914" width="32" height="32">
    <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1007"/>
-    <property name="spawn" value="25000"/>
+    <property name="dest_map" value="005-5"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="41"/>
    </properties>
   </object>
-  <object id="12" name="Little Blub" type="spawn" x="1664" y="-32" width="704" height="320">
+  <object id="66" name="to Shop" type="warp" x="1377" y="2401" width="32" height="32">
    <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1007"/>
-    <property name="spawn" value="25000"/>
+    <property name="dest_map" value="005-6"/>
+    <property name="dest_x" value="33"/>
+    <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="13" name="Blub" type="spawn" x="2656" y="1408" width="288" height="256">
+  <object id="71" name="CloverPatch" type="spawn" x="1088" y="1248" width="192" height="96">
    <properties>
-    <property name="death" value="120000"/>
+    <property name="death" value="300000"/>
     <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1008"/>
-    <property name="spawn" value="60000"/>
-   </properties>
-  </object>
-  <object id="15" name="Little Blub" type="spawn" x="2272" y="864" width="928" height="640">
-   <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1007"/>
+    <property name="monster_id" value="1028"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="21" name="Plushroom Field" type="spawn" x="1728" y="1280" width="64" height="192">
+  <object id="74" name="IronFragments" type="spawn" x="704" y="1793" width="96" height="64">
    <properties>
-    <property name="death" value="150000"/>
+    <property name="death" value="300000"/>
     <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1011"/>
+    <property name="monster_id" value="1058"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="25" name="Croc" type="spawn" x="1696" y="192" width="672" height="224">
+  <object id="76" name="Maggot" type="spawn" x="1792" y="2496" width="480" height="448">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1006"/>
+    <property name="max_beings" value="8"/>
+    <property name="monster_id" value="1030"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="26" name="Croc" type="spawn" x="2400" y="1440" width="128" height="96">
+  <object id="78" name="CandorScorpion" type="spawn" x="2368" y="2496" width="576" height="640">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1006"/>
+    <property name="max_beings" value="8"/>
+    <property name="monster_id" value="1073"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="27" name="Croc" type="spawn" x="1536" y="1696" width="320" height="1120">
+  <object id="80" name="Piou" type="spawn" x="960" y="3264" width="416" height="256">
    <properties>
     <property name="death" value="300000"/>
     <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1006"/>
+    <property name="monster_id" value="1002"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="28" name="Croc" type="spawn" x="2144" y="1632" width="320" height="320">
+  <object id="82" name="CandorScorpion" type="spawn" x="2048" y="576" width="1056" height="1024">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1006"/>
+    <property name="max_beings" value="16"/>
+    <property name="monster_id" value="1073"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="29" name="graphics/particles/panels.xml" type="particle_effect" x="2848" y="928" width="32" height="32"/>
-  <object id="30" name="graphics/particles/panels.xml" type="particle_effect" x="2080" y="2272" width="32" height="32"/>
-  <object id="33" name="Crocotree" type="spawn" x="2496" y="2976">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="35" name="Crocotree" type="spawn" x="1824" y="2624">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="36" name="Crocotree" type="spawn" x="1248" y="2880">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="37" name="Crocotree" type="spawn" x="2144" y="2272">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="38" name="Crocotree" type="spawn" x="1696" y="1760">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="39" name="Crocotree" type="spawn" x="2048" y="1312">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="40" name="Crocotree" type="spawn" x="992" y="1504">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="41" name="Crocotree" type="spawn" x="1408" y="704">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="42" name="Crocotree" type="spawn" x="2240" y="352">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="43" name="Crocotree" type="spawn" x="2688" y="1408">
-   <properties>
-    <property name="death" value="240000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1010"/>
-    <property name="spawn" value="420000"/>
-   </properties>
-  </object>
-  <object id="50" name="to Saxso House" type="warp" x="994" y="2561" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="005-2"/>
-    <property name="dest_x" value="33"/>
-    <property name="dest_y" value="42"/>
-   </properties>
-  </object>
-  <object id="51" name="to Storage House" type="warp" x="1116" y="2392" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="005-3"/>
-    <property name="dest_x" value="25"/>
-    <property name="dest_y" value="42"/>
-   </properties>
-  </object>
-  <object id="52" name="to Shop" type="warp" x="1540" y="2266" width="32" height="32">
+  <object id="84" name="ManaBug" type="spawn" x="1376" y="928" width="1824" height="672">
    <properties>
-    <property name="dest_map" value="005-4"/>
-    <property name="dest_x" value="25"/>
-    <property name="dest_y" value="42"/>
-   </properties>
-  </object>
-  <object id="53" name="to storage" type="warp" x="1250" y="2176" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="005-5"/>
-    <property name="dest_x" value="25"/>
-    <property name="dest_y" value="41"/>
-   </properties>
-  </object>
-  <object id="54" name="Maggot" type="spawn" x="1070" y="2614" width="224" height="384">
-   <properties>
-    <property name="death" value="120000"/>
-    <property name="max_beings" value="50"/>
-    <property name="monster_id" value="1030"/>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1075"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="58" name="to big house" type="warp" x="704" y="2914" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="005-5"/>
-    <property name="dest_x" value="24"/>
-    <property name="dest_y" value="41"/>
-   </properties>
-  </object>
-  <object id="66" name="to Shop" type="warp" x="1377" y="2401" width="32" height="32">
+  <object id="87" name="Scorpion" type="spawn" x="576" y="800" width="860" height="928">
    <properties>
-    <property name="dest_map" value="005-6"/>
-    <property name="dest_x" value="33"/>
-    <property name="dest_y" value="42"/>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1071"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
  </objectgroup>