Merge branch 'master' of git@gitorious.org:tmwdata/mainline

1 files changed, 69 insertions, 2 deletions

diff --git a/items.xml b/items.xml
index 534e4409..076a3572 100644
--- a/items.xml
+++ b/items.xml
@@ -2520,7 +2520,7 @@
     </item>
     <item id="767"
         image="armor-chest-terranite.png"
-        name="Terranite Chest"
+        name="Terranite Chest Armor"
         description="A nice piece of armor made out of terranite ore."
         effect="+30% Defense"
         type="equip-torso"
@@ -2793,13 +2793,80 @@
     <item id="1220"
         image="armor-head-parsley-earplugs.png"
         name="Bunch of Parsley"
-        description="A bunch of parsley, useful for salads and many other dishes.  In a pinch, it doubles as earplugs."
+        description="A bunch of parsley, useful for salads and many other dishes. In a pinch, it doubles as earplugs."
         effect="+1% Defense"
         type="equip-head"
         defense="1"
         weight="1">
         <sprite>head-parsley-earplugs.xml</sprite>
     </item>
+    <item id="1221"
+        image="armor-head-skullmask.png"
+        name="Skull Mask"
+        description="A mask made out of bones."
+        effect="+2% Defense"
+        type="equip-head"
+        defense="2"
+        weight="1">
+        <sprite>head-skullmask.xml</sprite>
+    </item>
+    <item id="1222"
+        image="generic-claylump_small.png"
+        name="Small Piece of Clay"
+        description="A small piece of clay, used to make different shapes."
+        effect=""
+        type="generic"
+        weight="5"
+        max-per-slot="10"/>
+    <item id="1223"
+        image="generic-claylump_big.png"
+        name="Big Piece of White Clay"
+        description="A big piece of white clay, used to make bigger shapes."
+        effect=""
+        type="generic"
+        weight="10"
+        max-per-slot="5"/>
+    <item id="1224"
+        image="generic-scroll.png"
+        name="Scroll of Paper"
+        description="A scroll made of fine paper."
+        effect=""
+        type="generic"
+        weight="1"
+        max-per-slot="10"/>
+    <item id="1225"
+        image="use-firescroll.png"
+        name="Fire Scroll"
+        description="A scroll on which is written an ancient formula giving birth to fire."
+        effect=""
+        type="generic"
+        weight="1"
+        max-per-slot="10"/>
+    <item id="1226"
+        image="use-silverbell.png"
+        name="Silver Bell"
+        description="A tiny bell made of silver."
+        type="generic"
+        weight="25"
+        max-per-slot="3"/>
+    <item id="1227"
+        image="armor-neck-enchanter.png"
+        name="Enchanter's Amulet"
+        description="An amulet made for true enchanters."
+        effect="+5 Intelligence"
+        type="equip-neck"
+        weight="1"
+        max-per-slot="1"
+        intelligence="5"/>
+    <item id="1228"
+        image="armor-neck-silver4leaf.png"
+        name="Silver Four-Leaf Amulet"
+        description="An amulet made for people bringing luck wherever they go."
+        effect="+5 Luck"
+        type="equip-neck"
+        weight="1"
+        max-per-slot="1"
+        luck="5"/>
 
     <!-- The 2XXY IDs are used for recolored items on eAthena.
         XX = item