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

1 files changed, 189 insertions, 48 deletions

diff --git a/items.xml b/items.xml
index 076a3572..cc2aebd3 100644
--- a/items.xml
+++ b/items.xml
@@ -349,7 +349,7 @@
         weight="300"
         max-per-slot="10"/>
     <item id="528"
-        image="armor-feet-boots.png|W:#4f2d29,c89078"
+        image="equipment/feet/armor-feet-boots.png|W:#4f2d29,c89078"
         name="Boots"
         description="Some robust boots, ideal for travelling."
         effect="+2% Defense"
@@ -357,8 +357,8 @@
         weight="15"
         defense="2"
         max-per-slot="1">
-        <sprite gender="male">feet-boots-male.xml|#623a34,f0c2b4</sprite>
-        <sprite gender="female">feet-boots-female.xml|#623a34,f0c2b4</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#623a34,f0c2b4</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#623a34,f0c2b4</sprite>
     </item>
     <item id="529"
         image="weapon-arrow-iron.png"
@@ -1569,7 +1569,7 @@
         <sprite>head-cap.xml|#d94800</sprite>
     </item>
     <item id="655"
-        image="armor-feet-furboots.png"
+        image="equipment/feet/armor-feet-furboots.png"
         name="Fur Boots"
         description="A pair of warm winter boots."
         effect="+3% Defense"
@@ -1577,8 +1577,8 @@
         weight="25"
         defense="3"
         max-per-slot="1">
-        <sprite gender="male">feet-furboots-male.xml</sprite>
-        <sprite gender="female">feet-furboots-female.xml</sprite>
+        <sprite gender="male">equipment/feet/feet-furboots-male.xml</sprite>
+        <sprite gender="female">equipment/feet/feet-furboots-female.xml</sprite>
     </item>
     <item id="656"
         image="armor-head-serf.png"
@@ -2083,9 +2083,16 @@
         effect=""
         type="generic"
         weight="1"/>
-
-    <!-- PLACEHOLDER FOR ITEM 719 -->
-
+    <item id="719"
+        image="use-food-apple.png|R:#73E600;Y:#C1F102;G:#66CC33"
+        name="Green Apple"
+        description="A healthy green apple."
+        effect="+50 HP"
+        script="apple.lua"
+        type="usable"
+        hp="50"
+        weight="70"
+        max-per-slot="10"/>
     <item id="720"
         image="armor-chest-robe.png|W:#ffffff"
         name="Silk Robe"
@@ -2217,7 +2224,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="734"
-        image="armor-feet-boots.png|W:#505050"
+        image="equipment/feet/armor-feet-boots.png|W:#505050"
         name="Black Boots"
         description="Steel toe capped boots, designed to keep your feet very well protected."
         effect="+4% Defense"
@@ -2225,19 +2232,19 @@
         weight="35"
         defense="4"
         max-per-slot="1">
-        <sprite gender="male">feet-boots-male.xml|#505050</sprite>
-        <sprite gender="female">feet-boots-female.xml|#505050</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#505050</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#505050</sprite>
     </item>
     <item id="735"
-        image="armor-feet-boots.png|#A4B2B2,FFFFFF"
+        image="equipment/feet/armor-feet-boots.png|#A4B2B2,FFFFFF"
         name="Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-head"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#A4B2B2,FFFFFF</sprite>
-        <sprite gender="female">feet-boots-female.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#A4B2B2,FFFFFF</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#A4B2B2,FFFFFF</sprite>
     </item>
     <item id="736"
         image="use-cake-a.png|R:#EDE5B2,FFF7BF;G:#CCCCCC,FFFFFF"
@@ -2419,7 +2426,7 @@
         <sprite gender="female">hands-gloves-assassin-female.xml</sprite>
     </item>
     <item id="757"
-        image="armor-feet-assassinboots.png"
+        image="equipment/feet/armor-feet-assassinboots.png"
         name="Assassin Boots"
         description="Boots for a master assassin."
         effect="+5% Defense, +5 Agility"
@@ -2427,8 +2434,8 @@
         weight="10"
         defense="5"
         max-per-slot="1">
-        <sprite gender="male">feet-assassin-male.xml</sprite>
-        <sprite gender="female">feet-assassin-female.xml</sprite>
+        <sprite gender="male">equipment/feet/feet-assassin-male.xml</sprite>
+        <sprite gender="female">equipment/feet/feet-assassin-female.xml</sprite>
     </item>
     <item id="758"
         image="weapon-staff-woodstaff.png"
@@ -2564,6 +2571,20 @@
         max-per-slot="1">
         <sprite>head-fairy_hat.xml</sprite>
     </item>
+    <item id="771"
+        image="armor-legs-miniskirt.png|W:#a4b2b2,ffffff"
+        name="Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#a4b2b2,ffffff</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#a4b2b2,ffffff</sprite>
+    </item>
+
+    <!-- PLACEHOLDER for Item 772: Silk Thread to be committed by Fate -->
 
     <!-- HERE ARE SOME UNUSED ITEM IDS -->
 
@@ -3934,114 +3955,114 @@
     </item>
 
     <item id="2150"
-        image="armor-feet-boots.png|W:#580000,A40000,C02020,ff6060"
+        image="equipment/feet/armor-feet-boots.png|W:#580000,A40000,C02020,ff6060"
         name="Red Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#580000,A40000,C02020,ff6060</sprite>
-        <sprite gender="female">feet-boots-female.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#580000,A40000,C02020,ff6060</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#580000,A40000,C02020,ff6060</sprite>
     </item>
     <item id="2151"
-        image="armor-feet-boots.png|W:#115511,22aa22,99dd99"
+        image="equipment/feet/armor-feet-boots.png|W:#115511,22aa22,99dd99"
         name="Green Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#115511,22aa22,99dd99</sprite>
-        <sprite gender="female">feet-boots-female.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#115511,22aa22,99dd99</sprite>
     </item>
     <item id="2152"
-        image="armor-feet-boots.png|W:#222255,6666ff"
+        image="equipment/feet/armor-feet-boots.png|W:#222255,6666ff"
         name="Dark Blue Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#222255,6666ff</sprite>
-        <sprite gender="female">feet-boots-female.xml|#222255,6666ff</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#222255,6666ff</sprite>
     </item>
     <item id="2153"
-        image="armor-feet-boots.png|W:#846211,dab333,fffb93,ffffff"
+        image="equipment/feet/armor-feet-boots.png|W:#846211,dab333,fffb93,ffffff"
         name="Yellow Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#846211,dab333,fffb93,ffffff</sprite>
-        <sprite gender="female">feet-boots-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#846211,dab333,fffb93,ffffff</sprite>
     </item>
     <item id="2154"
-        image="armor-feet-boots.png|W:#16486e,498ec5,e4f2fc"
+        image="equipment/feet/armor-feet-boots.png|W:#16486e,498ec5,e4f2fc"
         name="Light Blue Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#16486e,498ec5,e4f2fc</sprite>
-        <sprite gender="female">feet-boots-female.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#16486e,498ec5,e4f2fc</sprite>
     </item>
     <item id="2155"
-        image="armor-feet-boots.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+        image="equipment/feet/armor-feet-boots.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
         name="Pink Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
-        <sprite gender="female">feet-boots-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
     </item>
     <item id="2156"
-        image="armor-feet-boots.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        image="equipment/feet/armor-feet-boots.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
-        <sprite gender="female">feet-boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
     </item>
     <item id="2157"
-        image="armor-feet-boots.png|W:#80280f,b04810,ef681f,ffb830"
+        image="equipment/feet/armor-feet-boots.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
-        <sprite gender="female">feet-boots-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
     </item>
     <item id="2158"
-        image="armor-feet-boots.png|W:#4f0a76,8010c0,d699f7"
+        image="equipment/feet/armor-feet-boots.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#4f0a76,8010c0,d699f7</sprite>
-        <sprite gender="female">feet-boots-female.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#4f0a76,8010c0,d699f7</sprite>
     </item>
     <item id="2159"
-        image="armor-feet-boots.png|W:#104010,208020,30c030"
+        image="equipment/feet/armor-feet-boots.png|W:#104010,208020,30c030"
         name="Dark Green Cotton Boots"
         description="A pair of quality cotton boots."
         effect="+1% Defense"
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">feet-boots-male.xml|#104010,208020,30c030</sprite>
-        <sprite gender="female">feet-boots-female.xml|#104010,208020,30c030</sprite>
+        <sprite gender="male">equipment/feet/feet-boots-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">equipment/feet/feet-boots-female.xml|#104010,208020,30c030</sprite>
     </item>
 
     <item id="2160"
@@ -4154,4 +4175,124 @@
         <sprite gender="male">hands-gloves-generic-male.xml|#104010,208020,30c030</sprite>
         <sprite gender="female">hands-gloves-generic-female.xml|#104010,208020,30c030</sprite>
     </item>
+    <item id="2170"
+        image="armor-legs-miniskirt.png|W:#580000,a40000,c02020,ff6060"
+        name="Red Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#580000,a40000,c02020,ff6060</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#580000,a40000,c02020,ff6060</sprite>
+    </item>
+    <item id="2171"
+        image="armor-legs-miniskirt.png|W:#115511,22aa22,99dd99"
+        name="Green Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#115511,22aa22,99dd99</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#115511,22aa22,99dd99</sprite>
+    </item>
+    <item id="2172"
+        image="armor-legs-miniskirt.png|W:#222255,6666ff"
+        name="Dark Blue Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#222255,6666ff</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#222255,6666ff</sprite>
+    </item>
+    <item id="2173"
+        image="armor-legs-miniskirt.png|W:#846211,dab333,fffb93,ffffff"
+        name="Yellow Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#846211,dab333,fffb93,ffffff</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#846211,dab333,fffb93,ffffff</sprite>
+    </item>
+    <item id="2174"
+        image="armor-legs-miniskirt.png|W:#16486e,498ec5,e4f2fc"
+        name="Light Blue Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#16486e,498ec5,e4f2fc</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#16486e,498ec5,e4f2fc</sprite>
+    </item>
+    <item id="2175"
+        image="armor-legs-miniskirt.png|W:#56002f,930050,fe70bd,feb7de,ffffff"
+       name="Pink Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#56002f,930050,fe70bd,feb7de,ffffff</sprite>
+    </item>
+    <item id="2176"
+        image="armor-legs-miniskirt.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+        name="Black Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+       type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+    </item>
+    <item id="2177"
+        image="armor-legs-miniskirt.png|W:#80280f,b04810,ef681f,ffb830"
+        name="Orange Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+    </item>
+    <item id="2178"
+        image="armor-legs-miniskirt.png|W:#4f0a76,8010c0,d699f7"
+        name="Purple Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#4f0a76,8010c0,d699f7</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#4f0a76,8010c0,d699f7</sprite>
+    </item>
+    <item id="2179"
+        image="armor-legs-miniskirt.png|W:#104010,208020,30c030"
+        name="Dark Green Miniskirt"
+        description="A short skirt for hot summer days."
+        effect="+4% Defense"
+        defense="4"
+        type="equip-legs"
+        weight="30"
+        max-per-slot="1">
+        <sprite gender="male">leg-miniskirt-male.xml|#104010,208020,30c030</sprite>
+        <sprite gender="female">leg-miniskirt-female.xml|#104010,208020,30c030</sprite>
+    </item>
 </items>