merging from previous test repo: ta-client-testing

1 files changed, 35 insertions, 31 deletions

diff --git a/items.xml b/items.xml
index 8b1e36f9..4c37f43b 100644
--- a/items.xml
+++ b/items.xml
@@ -882,7 +882,7 @@
         image="weapon-dagger-rockknive.png"
         name="Rock Knife"
         description="A knife made of stone."
-        effect="??? Damage, ??? Range"
+        effect="+110 Damage, +3 Vitality"
         type="equip-1hand"
         weapon-type="knife"
         attack-action="attack"
@@ -1050,7 +1050,11 @@
         image="weapon-polearm-spear.png"
         name="Spear"
         description="A light spear with a wooden pole."
+<<<<<<< HEAD
         effect="+40 Damage, 1 Range"
+=======
+        effect="+50 Damage"
+>>>>>>> c9008a1f4b6b7616056fb593dad2e5a32589f596
         type="equip-2hand"
 		weapon_type="11"
         weapon-type="polearm"
@@ -4919,7 +4923,7 @@
         image="equipment/head/wizard-hat.png|W:#580000,a40000,c02020,ff6060"
         name="Red wizard hat"
         description="A wizard hat, bright red."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -4930,7 +4934,7 @@
         image="equipment/head/wizard-hat.png|W:#115511,22aa22,99dd99"
         name="Green wizard hat"
         description="A wizard hat, warm green."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -4941,7 +4945,7 @@
         image="equipment/head/wizard-hat.png|W:#222255,6666ff"
         name="Dark blue wizard hat"
         description="A wizard hat, iridescent dark blue."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -4952,7 +4956,7 @@
         image="equipment/head/wizard-hat.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow wizard hat"
         description="A wizard hat, soft yellow."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -4963,7 +4967,7 @@
         image="equipment/head/wizard-hat.png|W:#16486e,498ec5,e4f2fc"
         name="Light blue wizard hat"
         description="A wizard hat, light blue."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -4974,7 +4978,7 @@
         image="equipment/head/wizard-hat.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink wizard hat"
         description="A wizard hat, bright pink."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -4985,7 +4989,7 @@
         image="equipment/head/wizard-hat.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black wizard hat"
         description="A wizard hat, deep black."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -4996,7 +5000,7 @@
         image="equipment/head/wizard-hat.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange wizard hat"
         description="A wizard hat, bright orange."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -5004,10 +5008,10 @@
         <sprite>equipment/head/wizard-hat.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2208"
-        image="equipment/head/wizard-hat|W:#4f0a76,8010c0,d699f7"
+        image="equipment/head/wizard-hat.png|W:#4f0a76,8010c0,d699f7"
         name="Purple wizard hat"
         description="A wizard hat, strong purple."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -5018,7 +5022,7 @@
         image="equipment/head/wizard-hat.png|W:#104010,208020,30c030"
         name="Dark green wizard hat"
         description="A wizard hat, dark green."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
@@ -5068,7 +5072,7 @@
     <item id="4006"
         image="generic-gemstone-b.png|W:#ccb534,f1ea8e,ffffaa"
         name="Topaz"
-        description="A raw topaz gemstone"
+        description="A raw topaz gemstone."
         type="generic"
         weight="20"/>
     <item id="4007"
@@ -5080,49 +5084,49 @@
     <item id="4008"
         image="armor-ring-gem-generic.png"
         name="Diamond Ring"
-        description="A diamond ring"
+        description="A diamond ring, +1 Vitality."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4009"
         image="armor-ring-gem-generic.png|W:#580000,A40000,C02020,ff6060"
         name="Ruby Ring"
-        description="A ruby ring"
+        description="A ruby ring, +1 Strength."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4010"
         image="armor-ring-gem-generic.png|W:#1f9c1f,89d689"
         name="Emerald Ring"
-        description="An emerald ring"
+        description="An emerald ring, +1 Luck."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4011"
         image="armor-ring-gem-generic.png|W:#4b4bbd,888af4"
         name="Sapphire Ring"
-        description="A sapphire ring"
+        description="A sapphire ring, +1 Intelligence."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4012"
         image="armor-ring-gem-generic.png|W:#ccb534,f1ea8e,ffffaa"
         name="Topaz Ring"
-        description="A topaz ring"
+        description="A topaz ring, +1 Agility."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4013"
         image="armor-ring-gem-generic.png|W:#530a7c,b362e1,ca87ef"
         name="Amethyst Ring"
-        description="An amethyst ring"
+        description="An amethyst ring, +1 Dexterity."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
     <item id="4014"
         image="armor-ring-simple.png"
         name="Simple Ring"
-        description="A simple ring"
+        description="A simple ring."
         type="equip-ring"
         weight="1"
         max-per-slot="1"/>
@@ -5191,14 +5195,6 @@
         type="generic"
         weight="10"
         max-per-slot="10"/>
-    <item id="4022"
-        image="generic-whitepresentbox.png"
-        name="White Present Box"
-        description="Something mysterious inside."
-        effect=""
-        type="generic"
-        weight="10"
-        max-per-slot="10"/>
     <item id="4023"
         image="generic-animal-bones.png"
         name="Animal Bones"
@@ -5235,7 +5231,7 @@
         image="equipment/head/yeti-mask.png"
         name="Yeti Mask"
         description="A mask made from the yeti's head."
-        effect="+ 4% Defense"
+        effect=""
         type="equip-head"
         defense="4"
         weight="10"
@@ -5246,13 +5242,21 @@
         image="equipment/head/wizard-hat.png"
         name="Wizard hat"
         description="A wizard hat."
-        effect="+5% Defense"
+        effect="+3 Intelligence"
         defense="5"
         type="equip-head"
         weight="15"
         max-per-slot="1">
         <sprite>equipment/head/wizard-hat.xml</sprite>
-     </item>
+    </item>
+	<item id="4029"
+        image="use-potion-e.png|G:#BB0000;R:#FF0000;"
+        name="Grimace of Dementia"
+        description="A feared potion. If done wrong... what did you say?"
+        effect=""
+        type="generic"
+        weight="50"
+        max-per-slot="10"/>
     <item id="3000"
         image="generic-jackolantern.png"
         name="Jack-o-Lantern"