add GP and Kg units

11 files changed, 80 insertions, 212 deletions

diff --git a/charcreation.xml b/charcreation.xml
index de63cd7e..b56702a2 100644
--- a/charcreation.xml
+++ b/charcreation.xml
@@ -6,7 +6,7 @@ Copyright (C) 2011-2012 ManaPlus -->
     <haircolor min="0" max="20"/>
     <hairstyle min="1" max="28"/>
     <look min="0" max="2"/>
-    <race min="0" max="6"/>
+    <race min="0" max="0"/>
     <stat min="1" max="9" sum="30"/>
     <item id="1300"/>
     <item id="2200"/>
diff --git a/graphics/items/equipment/weapons/boneknife.png b/graphics/items/equipment/weapons/boneknife.png
new file mode 100644
index 00000000..1e32aeee
--- /dev/null
+++ b/graphics/items/equipment/weapons/boneknife.png
diff --git a/graphics/items/equipment/weapons/dagger.png b/graphics/items/equipment/weapons/dagger.png
new file mode 100644
index 00000000..cdfc3708
--- /dev/null
+++ b/graphics/items/equipment/weapons/dagger.png
diff --git a/graphics/items/equipment/weapons/forestbow.png b/graphics/items/equipment/weapons/forestbow.png
new file mode 100644
index 00000000..fb3580b8
--- /dev/null
+++ b/graphics/items/equipment/weapons/forestbow.png
diff --git a/graphics/items/equipment/weapons/rockknive.png b/graphics/items/equipment/weapons/rockknive.png
new file mode 100644
index 00000000..423171aa
--- /dev/null
+++ b/graphics/items/equipment/weapons/rockknive.png
diff --git a/graphics/items/equipment/weapons/sharpknife.png b/graphics/items/equipment/weapons/sharpknife.png
new file mode 100644
index 00000000..eed9780f
--- /dev/null
+++ b/graphics/items/equipment/weapons/sharpknife.png
diff --git a/graphics/items/equipment/weapons/smallknive.png b/graphics/items/equipment/weapons/smallknive.png
new file mode 100644
index 00000000..52c1294f
--- /dev/null
+++ b/graphics/items/equipment/weapons/smallknive.png
diff --git a/graphics/items/generic/crystallizedmaggot.png b/graphics/items/generic/crystallizedmaggot.png
new file mode 100644
index 00000000..1326feb8
--- /dev/null
+++ b/graphics/items/generic/crystallizedmaggot.png
diff --git a/items.xml b/items.xml
index d12db25e..83a37160 100644
--- a/items.xml
+++ b/items.xml
@@ -1349,7 +1349,13 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="generic"

         weight="0"

         maxFloorOffset="20"/>

-

+    <item id="819"

+        image="generic/crystallizedmaggot.png"

+        name="Crystallized Maggot"

+        description=""

+        type="generic"

+        weight="10"

+        maxFloorOffset="20"/>

     <!-- Necklaces -->

     <item id="1000"

         image="equipment/amulet/bromenalfourleafamulet.png"

@@ -1834,8 +1840,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         level="15"

         type="equip-torso"

         weight="5">

-        <sprite gender="unisex">equipment/chest/silkrobe-male.xml</sprite>

-        <sprite gender="female">equipment/chest/silkrobe-female.xml</sprite>

+  <sprite gender="unisex">equipment/chest/silkrobe-male.xml|#831f2d,f07401,f8cc8b</sprite>

+        <sprite gender="female">equipment/chest/silkrobe-female.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>

     </item>

     <item id="1317"

         image="equipment/chest/sorcererrobe.png"

@@ -2829,7 +2835,21 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sound event="hit">weapons/piouslayer/hit1.ogg</sound>

         <sound event="miss">weapons/piouslayer/miss1.ogg</sound>

     </item>

+    <item id="3505"

+        image="equipment/weapons/sharpknife.png"

+        name="Sharp Knife"

+        description="a ssharp knife pefect for cut meat."

+        attack="100"

+        attack-range="1"

+        level="5"

+        type="equip-1hand"

+        attack-action="attack"

 

+        weight="50">

+        <sprite>equipment/weapons/knife.xml</sprite>

+        <sound event="hit">weapons/knife/hit1.ogg</sound>

+        <sound event="miss">weapons/knife/miss1.ogg</sound>

+    </item>

     <!-- Pets -->

     <item id="4000"

         image="usable/piouegg.png"

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>
diff --git a/units.xml b/units.xml
index 5f6e59fc..280e9fa4 100644
--- a/units.xml
+++ b/units.xml
@@ -3,9 +3,9 @@
 Copyright (C) 2010-2013 Evol Online -->
 
 <units>
-    <unit type="currency" base=" E" round="0" separator=" "/>
-    <unit type="weight" base=" Florin" round="0" separator=" ">
-        <level symbol=" KF" count="1000" round="2"/>
+    <unit type="currency" base=" GP" round="0" separator=" "/>
+    <unit type="weight" base=" g" round="0" separator=" ">
+        <level symbol=" Kg" count="1000" round="2"/>
     </unit>
     <currency>
         <unit name="points" base=" Points" round="0" separator=" "/>