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

10 files changed, 46 insertions, 46 deletions

diff --git a/graphics/tiles/Forest.png b/graphics/tiles/Forest.png
new file mode 100644
index 00000000..6d9cd6af
--- /dev/null
+++ b/graphics/tiles/Forest.png
diff --git a/graphics/tiles/Forest_cover.png b/graphics/tiles/Forest_cover.png
new file mode 100644
index 00000000..b97c80ed
--- /dev/null
+++ b/graphics/tiles/Forest_cover.png
diff --git a/graphics/tiles/Forest_water.png b/graphics/tiles/Forest_water.png
new file mode 100644
index 00000000..59254195
--- /dev/null
+++ b/graphics/tiles/Forest_water.png
diff --git a/graphics/tiles/Forest_x2.png b/graphics/tiles/Forest_x2.png
new file mode 100644
index 00000000..9b3f41cc
--- /dev/null
+++ b/graphics/tiles/Forest_x2.png
diff --git a/graphics/tiles/Forest_x3.png b/graphics/tiles/Forest_x3.png
new file mode 100644
index 00000000..e08d7cd7
--- /dev/null
+++ b/graphics/tiles/Forest_x3.png
diff --git a/graphics/tiles/Forest_x4.png b/graphics/tiles/Forest_x4.png
new file mode 100644
index 00000000..2a77d8d4
--- /dev/null
+++ b/graphics/tiles/Forest_x4.png
diff --git a/graphics/tiles/Forest_x5.png b/graphics/tiles/Forest_x5.png
new file mode 100644
index 00000000..ce1cf389
--- /dev/null
+++ b/graphics/tiles/Forest_x5.png
diff --git a/graphics/tiles/Forest_x8.png b/graphics/tiles/Forest_x8.png
new file mode 100644
index 00000000..d63246b1
--- /dev/null
+++ b/graphics/tiles/Forest_x8.png
diff --git a/graphics/tiles/Pots_x2.png b/graphics/tiles/Pots_x2.png
new file mode 100644
index 00000000..bd6273ce
--- /dev/null
+++ b/graphics/tiles/Pots_x2.png
diff --git a/items.xml b/items.xml
index 11629b74..48bd3024 100644
--- a/items.xml
+++ b/items.xml
@@ -283,7 +283,7 @@
     <item id="522"
         image="weapon-dagger-sharpknife.png"
         name="Sharp Knife"
-        description="A really sharp knife Don't hurt yourself!"
+        description="A really sharp knife. Don't hurt yourself!"
         effect="+10 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
@@ -408,7 +408,7 @@
     <item id="533"
         image="use-food-roastedmaggot.png"
         name="Roasted Maggot"
-        description="Maggot roasted on fire."
+        description="A maggot roasted on fire."
         effect="+150 HP"
         type="usable"
         hp="150"
@@ -504,7 +504,7 @@
     <item id="543"
         image="armor-head-standardheadband.png|W:#291e16,99784c,d8bd86,ffffff"
         name="Standard Headband"
-        description="Just a standard headband."
+        description="A standard headband."
         effect="+3% Defense"
         type="equip-head"
         weight="45"
@@ -526,7 +526,7 @@
     <item id="545"
         image="weapon-bow-forestbow.png"
         name="Forest Bow"
-        description="A bow usually used to hunt."
+        description="A bow usually used for hunting."
         effect="+70 Damage, 5 Range"
         type="equip-2hand"
         weapon_type="10"
@@ -688,7 +688,7 @@
     <item id="563"
         image="armor-hands-gloves.png|W:#a0a0a0,d0d0d0,ffffff,ffffff"
         name="Winter Gloves"
-        description="Soft and warm gloves."
+        description="A pair of soft, warm gloves."
         effect="+3% Defense"
         type="equip-arms"
         weight="15"
@@ -700,7 +700,7 @@
     <item id="564"
         image="armor-chest-tnecksweater.png|W:#b0b0b0,ffffff"
         name="Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40"
@@ -819,7 +819,7 @@
     <item id="577"
         image="weapon-thrown-bonedarts.png"
         name="Bone Darts"
-        description="Some darts made of bones."
+        description="Darts made of bones."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="thrown"
@@ -1028,7 +1028,7 @@
     <item id="600"
         image="armor-shield-britshield.png"
         name="Brit Shield"
-        description="Legendary shield that is said to save queens and rule waves."
+        description="A legendary shield that is said to save queens and rule waves."
         effect="-50 Cooking"
         type="equip-shield"
         weight="10"
@@ -1068,7 +1068,7 @@
     <item id="605"
         image="weapon-axe-meatcleaver.png"
         name="Meat Cleaver"
-        description="A butchers tool that also makes a nice one handed battle axe."
+        description="A butcher's tool that also makes a nice one handed battle axe."
         effect="??? Damage, ??? Range"
         type="equip-1hand"
         weapon-type="axe"
@@ -1132,7 +1132,7 @@
     <item id="612"
         image="generic-cavesnakelamp.png"
         name="Cave Snake Lamp"
-        description="Feeler of a lamp snake that glows in the dark."
+        description="The feeler of a lamp snake that glows in the dark."
         effect=""
         type="generic"
         weight="10"
@@ -1258,7 +1258,7 @@
     <item id="624"
         image="armor-chest-vnecksweater.png|W:#ffffff"
         name="V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45"
@@ -1270,7 +1270,7 @@
     <item id="625"
         image="armor-chest-chainmail.png"
         name="Chainmail Shirt"
-        description="A shirt made of chains. It weights a lot but offers excellent protection."
+        description="A shirt made of chains. It weighs a lot but offers excellent protection."
         effect="+20% Defense"
         type="equip-torso"
         weight="120"
@@ -1282,7 +1282,7 @@
     <item id="626"
         image="armor-chest-lightplatemail.png|W:#ddeeff"
         name="Light Platemail"
-        description="A light cuirass with shoulder pads made of iron. A cheap and plain but efficient armor usually worn by foot soldiers."
+        description="A light cuirass with shoulder pads made of iron, usually worn by foot soldiers."
         effect="+25% Defense"
         type="equip-torso"
         weight="240"
@@ -1379,7 +1379,7 @@
     <item id="635"
         image="generic-santacookie.png"
         name="Santa Cookie"
-        description="This isn't for you to eat. It is for Santa Claus."
+        description="This isn't for you to eat, it is for Santa Claus!"
         effect=""
         type="generic"
         weight="1"
@@ -1387,7 +1387,7 @@
     <item id="636"
         image="armor-head-warlordhelm.png"
         name="Warlord Helmet"
-        description="Worn by great warriors"
+        description="Worn by great warriors."
         effect="+18% Defense"
         type="equip-head"
         defense="25"
@@ -1397,7 +1397,7 @@
     <item id="637"
         image="armor-head-knighthelm.png"
         name="Knight's Helmet"
-        description="Helmet with two small wings on it"
+        description="A helmet with two small wings on it."
         effect="+15% Defense"
         type="equip-head"
         defense="20"
@@ -1407,7 +1407,7 @@
     <item id="638"
         image="armor-head-infantryhelm.png"
         name="Infantry Helmet"
-        description="For soldiers and guards"
+        description="A helmet for soldiers and guards."
         effect="+15% Defense"
         type="equip-head"
         defense="20"
@@ -1417,7 +1417,7 @@
     <item id="639"
         image="armor-head-crusadehelm.png"
         name="Crusade Helmet"
-        description="Start your own crusade"
+        description="Start your own crusade."
         effect="+18% Defense"
         type="equip-head"
         defense="25"
@@ -1427,7 +1427,7 @@
     <item id="640"
         image="generic-ironore.png"
         name="Iron Ore"
-        description="A lump of Iron Ore."
+        description="A lump of iron ore."
         effect=""
         type="generic"
         weight="40"/>
@@ -1472,7 +1472,7 @@
     <item id="645"
         image="armor-chest-lightplatemail.png|W:#573f10,9c8226,d3c04b,ffffff"
         name="Golden Platemail"
-        description="A plate mail made from gold which can only be afforded by the richest of the richest."
+        description="A plate mail made from gold, which only the richest of the richest can afford."
         effect="+25% Defense"
         type="equip-torso"
         defense="25"
@@ -1792,28 +1792,28 @@
     <item id="680"
         image="generic-herb.png|W:#e0b0ff"
         name="Mauve Herb"
-        description="An ingredient for brewing healing potions"
+        description="An ingredient for brewing healing potions."
         type="generic"
         weight="1"
         max-per-slot="10"/>
     <item id="681"
         image="generic-herb.png|W:#0047ab"
         name="Cobalt Herb"
-        description="An ingredient for brewing healing potions"
+        description="An ingredient for brewing healing potions."
         type="generic"
         weight="1"
         max-per-slot="10"/>
     <item id="682"
         image="generic-herb.png|W:#ef9b0f"
         name="Gamboge Herb"
-        description="An ingredient for brewing healing potions"
+        description="An ingredient for brewing healing potions."
         type="generic"
         weight="1"
         max-per-slot="10"/>
     <item id="683"
         image="generic-herb.png|W:#e32636"
         name="Alizarin Herb"
-        description="An ingredient for brewing healing potions"
+        description="An ingredient for brewing healing potions."
         type="generic"
         weight="1"
         max-per-slot="10"/>
@@ -2330,7 +2330,7 @@
     <item id="1201"
         image="weapon-dagger-knive.png"
         name="Knife"
-        description="A small knife, the perfect weapon for a beginner."
+        description="A small knife; the perfect weapon for a beginner."
         effect="+5 Damage, 1 Range"
         type="equip-1hand"
         weapon_type="1"
@@ -2359,7 +2359,7 @@
     <item id="1203"
         image="armor-head-rangerhat.png"
         name="Ranger Hat"
-        description="A leather hat traditionally worn by Rangers."
+        description="A leather hat traditionally worn by rangers."
         effect="+2% Defense"
         type="equip-head"
         weight="55"
@@ -2619,7 +2619,7 @@
     <item id="2060"
         image="armor-chest-vnecksweater.png|W:#441111,aa3333,dd6666"
         name="Red V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2629,7 +2629,7 @@
     <item id="2061"
         image="armor-chest-vnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2639,7 +2639,7 @@
     <item id="2062"
         image="armor-chest-vnecksweater.png|W:#222255,6666ff"
         name="Dark Blue V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2649,7 +2649,7 @@
     <item id="2063"
         image="armor-chest-vnecksweater.png|W:#887722,ddcc66,ffffaa"
         name="Yellow V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2659,7 +2659,7 @@
     <item id="2064"
         image="armor-chest-vnecksweater.png|W:#223355,99aadd,bbccff"
         name="Light Blue V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2669,7 +2669,7 @@
     <item id="2065"
         image="armor-chest-vnecksweater.png|W:#552255,ff66ff,ffffff"
         name="Pink V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2679,7 +2679,7 @@
     <item id="2066"
         image="armor-chest-vnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2689,7 +2689,7 @@
     <item id="2067"
         image="armor-chest-vnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2699,7 +2699,7 @@
     <item id="2068"
         image="armor-chest-vnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2709,7 +2709,7 @@
     <item id="2069"
         image="armor-chest-vnecksweater.png|W:#155515,206620,409940"
         name="Dark Green V-Neck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+8% Defense"
         type="equip-torso"
         weight="45">
@@ -2720,7 +2720,7 @@
     <item id="2070"
         image="armor-chest-tnecksweater.png|W:#441111,aa3333,dd6666"
         name="Red Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2730,7 +2730,7 @@
     <item id="2071"
         image="armor-chest-tnecksweater.png|W:#115511,22aa22,99dd99"
         name="Green Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2740,7 +2740,7 @@
     <item id="2072"
         image="armor-chest-tnecksweater.png|W:#222255,6666ff"
         name="Dark Blue Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2750,7 +2750,7 @@
     <item id="2073"
         image="armor-chest-tnecksweater.png|W:#887722,ddcc66,ffffaa"
         name="Yellow Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2760,7 +2760,7 @@
     <item id="2074"
         image="armor-chest-tnecksweater.png|W:#223355,99aadd,bbccff"
         name="Light Blue Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2770,7 +2770,7 @@
     <item id="2075"
         image="armor-chest-tnecksweater.png|W:#552255,ff66ff,ffffff"
         name="Pink Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2780,7 +2780,7 @@
     <item id="2076"
         image="armor-chest-tnecksweater.png|W:#111111,222222,333333,444444,555555,aaaaaa"
         name="Black Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2790,7 +2790,7 @@
     <item id="2077"
         image="armor-chest-tnecksweater.png|W:#80280f,b04810,ef681f,ffb830"
         name="Orange Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2800,7 +2800,7 @@
     <item id="2078"
         image="armor-chest-tnecksweater.png|W:#4f0a76,8010c0,d699f7"
         name="Purple Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">
@@ -2810,7 +2810,7 @@
     <item id="2079"
         image="armor-chest-tnecksweater.png|W:#155515,206620,409940"
         name="Dark Green Turtleneck Sweater"
-        description="A soft and warm sweater."
+        description="A soft, warm sweater."
         effect="+6% Defense"
         type="equip-torso"
         weight="40">