Port new heal, damage and defense values from item_db.

1 files changed, 26 insertions, 26 deletions

diff --git a/items.xml b/items.xml
index fc6080f0..ce61d578 100644
--- a/items.xml
+++ b/items.xml
@@ -155,7 +155,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/acorn.png"
         name="Acorn"
         description="Squichy's food which could taste good in a cake."
-        effect="+15 HP"
+        effect="Heal 12-18 HP"
         type="usable"
         weight="3"
         maxFloorOffset="10"/>
@@ -163,7 +163,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/bread.png"
         name="Bread"
         description="Home-made bread."
-        effect="+30 HP"
+        effect="Heal 25-40 HP"
         type="usable"
         weight="25"
         maxFloorOffsetX="6"
@@ -172,7 +172,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/fungus.png"
         name="Fungus"
         description="A non-toxic mushroom growing in moist places."
-        effect="+25 HP"
+        effect="Damage -5%; Defense +5%; Heal 25-35 HP"
         type="usable"
         weight="8"
         maxFloorOffset="9"/>
@@ -180,7 +180,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/cheese.png"
         name="Cheese"
         description="A ratto's meal left-overs."
-        effect="+40 HP"
+        effect="Heal 30-50 HP"
         type="usable"
         weight="3"
         maxFloorOffsetX="9"
@@ -189,7 +189,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/pioulegs.png"
         name="Piou Legs"
         description="Tasty and well spiced piou legs."
-        effect="+10 HP"
+        effect="Heal 7-13 HP"
         type="usable"
         weight="4"
         maxFloorOffsetX="7"
@@ -198,7 +198,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/lettuceleaf.png"
         name="Lettuce Leaf"
         description="The perfect food if you're hungry but want to lose weight."
-        effect="+15 HP"
+        effect="Heal 15-25 HP"
         type="usable"
         weight="1"
         maxFloorOffsetX="7"
@@ -207,7 +207,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/piberries.png"
         name="Piberries"
         description="The famous staining fruit."
-        effect="+20 HP"
+        effect="Heal 12-23 HP"
         type="usable"
         weight="2"
         maxFloorOffsetX="9"
@@ -216,7 +216,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/drops.png|S:#898989,7287a0,aeaeae,96abc6,cecece,bccce0,e5e5e5,dce4ee"
         name="Sea Drops"
         description="Some water drops from the sea. Maybe you shouldn't drink them."
-        effect="+15 HP / Headache"
+        effect="Headache; Heal 10-20 HP"
         type="usable"
         weight="4"
         maxFloorOffsetX="6"
@@ -225,7 +225,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/aquada.png"
         name="Aquada"
         description="A strange sea fruit. The blue part seems edible."
-        effect="+60 HP"
+        effect="Heal 75-100 HP"
         type="usable"
         weight="16"
         maxFloorOffsetX="8"
@@ -234,7 +234,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/blobime.png|S:#686868,695977,919191,9f79a9,bababa,d69ec0,dcdcdc,eccddf"
         name="Pink Blobime"
         description="Some pink residue dropped by a little blub."
-        effect="+4 HP / Headache"
+        effect="Headache; Heal 2-6 HP"
         type="usable"
         weight="10"
         maxFloorOffsetX="8"
@@ -243,7 +243,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/blobime.png|S:#686868,to,919191,to,bababa,to,dcdcdc,to"
         name="Purple Blobime"
         description="Some purple residue dropped by a blub."
-        effect="+4 HP / Headache"
+        effect="Headache; Heal 3-9 HP"
         type="usable"
         weight="10"
         maxFloorOffsetX="8"
@@ -252,7 +252,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/croconut-half.png"
         name="Half Croconut"
         description="Its inside seems delicious."
-        effect="+40 HP"
+        effect="Heal 65-90 HP"
         type="usable"
         weight="55"
         maxFloorOffset="10"/>
@@ -275,7 +275,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/plushroom.png"
         name="Plushroom"
         description="This mushroom, with a skin as soft as fur, seems to wriggle in your hands!"
-        effect="+25 HP"
+        effect="Damage +5%; Defense -5%; Heal 20-30 HP"
         type="usable"
         weight="8"
         maxFloorOffsetX="12"
@@ -284,13 +284,13 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/pumpkinseeds.png"
         name="Pumpkin Seeds"
         description="Doesn't seem very appetizing..."
-        effect="+1 HP / Headache"
+        effect="Headache; Heal 1 HP"
         type="usable"
         weight="1"/>
     <item id="517"
         image="usable/deliciouscookie.png"
         name="Delicious Cookie"
-        description="A biscuit full of cream."
+        description="Reward from the Cookie Master, beware before to use it, effects are unknown..."
         effect="Unknown"
         type="usable"
         weight="2"/>
@@ -482,7 +482,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/chest/cottonshirt.png|S:#3c3c3c,3e3c38,4d4d4d,514d47,686868,706662,919191,99917b,b6b6b6,c0b698,dfdfdf,e4dfca"
         name="Creased Shirt"
         description="An old shirt given to you by a sailor. It isn't very fashionable..."
-        effect="+2 Defense"
+        effect="Defense +5"
         type="equip-torso"
         weight="17"
         maxFloorOffsetX="8"
@@ -494,7 +494,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/chest/tanktop.png|W"
         name="%Color% Sailor Tank Top"
         description="A %color% tank top used by sailors and seamen."
-        effect="+3 Defense"
+        effect="Defense +10"
         type="equip-torso"
         weight="11"
         colors="simple"
@@ -506,7 +506,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/chest/sailorshirt.png"
         name="Sailor Shirt"
         description="Proof that ye be in the crew, matey!"
-        effect="+4 Defense"
+        effect="Defense +13"
         type="equip-torso"
         weight="22"
         maxFloorOffsetX="8"
@@ -520,7 +520,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/feet/boots.png|S:#3c3c3c,40332d,4d4d4d,5e4a3d,686868,705740,919191,a1825d,b6b6b6,b59767,dfdfdf,dbbf88"
         name="Lousy Moccasins"
         description="Orc-made moccasins. Not sure from which skin these shoes were made."
-        effect="+2 Defense"
+        effect="Defense +6"
         type="equip-feet"
         weight="18"
         maxFloorOffset="8">
@@ -533,7 +533,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/hands/armbands.png"
         name="Armbands"
         description="Small armbands made of wood and iron."
-        effect="+3 Defense"
+        effect="Defense +4"
         type="equip-arms"
         weight="8"
         maxFloorOffset="16">
@@ -546,7 +546,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/legs/shorts.png|S:#4d4d4d,514d47,686868,706662,919191,99917b,b6b6b6,c0b698,dfdfdf,e4dfca"
         name="Creased Shorts"
         description="An old pair of shorts given to you by a sailor. They smell awful."
-        effect="+2 Defense"
+        effect="Defense +5"
         type="equip-legs"
         weight="20"
         maxFloorOffset="9">
@@ -581,7 +581,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/head/bandana.png"
         name="Bandana"
         description="A striped bandana worn by some sailors."
-        effect="+2 Defense"
+        effect="Defense +4"
         type="equip-head"
         weight="4"
         maxFloorOffsetX="8"
@@ -606,7 +606,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/head/pumpkinhat.png"
         name="Pumpkin Hat"
         description="A carved pumpkin, the face will scare your enemy off."
-        effect="+3 Defense"
+        effect="Defense +2"
         type="equip-head"
         weight="50">
         <sprite>equipment/head/pumpkinhat.xml</sprite>
@@ -616,7 +616,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/head/fancyhat.png"
         name="Fancy Hat"
         description="A fancy hat, what else?"
-        effect="+1 Defense"
+        effect="Defense +2"
         type="equip-head"
         weight="11">
         <sprite>equipment/head/fancyhat.xml</sprite>
@@ -646,7 +646,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         effect="+5 Damage"
         type="equip-1hand"
         weapon-type="knife"
-        attack-action="attack"
+        attack-action="Damage +5"
         weight="6"
         maxFloorOffsetX="9"
         maxFloorOffsetY="12">
@@ -658,7 +658,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/piouslayer.png"
         name="Piou Slayer"
         description="A short sword for novice fighters, more useful in the kitchen than in a real fight..."
-        effect="+13 Damage"
+        effect="Damage +15"
         type="equip-1hand"
         weapon-type="sword"
         attack-action="attack"