From ee86a3f2dc29b4310f756245db2c90bffe0f6c9d Mon Sep 17 00:00:00 2001
From: Scott Ellis <quiche_on_a_leash@hotmail.co.uk>
Date: Wed, 28 May 2008 17:29:15 +0000
Subject: Added music to map 25 Added an Orange, by EJ Added Warlord plate
 armour, by Saphy Re added female style 7, to reduce any confusion since it
 was lacking. Mantis: #311

---
 graphics/items/armor-chest-warlordplate.png    | Bin 0 -> 1033 bytes
 graphics/items/use-food-orange.png             | Bin 0 -> 3146 bytes
 graphics/sprites/chest-warlordplate-female.png | Bin 0 -> 19223 bytes
 graphics/sprites/chest-warlordplate-female.xml | 104 +++++++++++++++++++++++++
 graphics/sprites/chest-warlordplate-male.png   | Bin 0 -> 19631 bytes
 graphics/sprites/chest-warlordplate-male.xml   | 104 +++++++++++++++++++++++++
 graphics/sprites/hairstyle7-female.png         | Bin 0 -> 1089 bytes
 items.xml                                      |  64 ++++++++++++---
 maps/new_25-1.tmx                              |   1 +
 9 files changed, 262 insertions(+), 11 deletions(-)
 create mode 100644 graphics/items/armor-chest-warlordplate.png
 create mode 100644 graphics/items/use-food-orange.png
 create mode 100644 graphics/sprites/chest-warlordplate-female.png
 create mode 100644 graphics/sprites/chest-warlordplate-female.xml
 create mode 100644 graphics/sprites/chest-warlordplate-male.png
 create mode 100644 graphics/sprites/chest-warlordplate-male.xml
 create mode 100644 graphics/sprites/hairstyle7-female.png

diff --git a/graphics/items/armor-chest-warlordplate.png b/graphics/items/armor-chest-warlordplate.png
new file mode 100644
index 00000000..127fd752
Binary files /dev/null and b/graphics/items/armor-chest-warlordplate.png differ
diff --git a/graphics/items/use-food-orange.png b/graphics/items/use-food-orange.png
new file mode 100644
index 00000000..48435f48
Binary files /dev/null and b/graphics/items/use-food-orange.png differ
diff --git a/graphics/sprites/chest-warlordplate-female.png b/graphics/sprites/chest-warlordplate-female.png
new file mode 100644
index 00000000..bedd5e09
Binary files /dev/null and b/graphics/sprites/chest-warlordplate-female.png differ
diff --git a/graphics/sprites/chest-warlordplate-female.xml b/graphics/sprites/chest-warlordplate-female.xml
new file mode 100644
index 00000000..23a27611
--- /dev/null
+++ b/graphics/sprites/chest-warlordplate-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-warlordplate-female.png|W" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/chest-warlordplate-male.png b/graphics/sprites/chest-warlordplate-male.png
new file mode 100644
index 00000000..2b884ebc
Binary files /dev/null and b/graphics/sprites/chest-warlordplate-male.png differ
diff --git a/graphics/sprites/chest-warlordplate-male.xml b/graphics/sprites/chest-warlordplate-male.xml
new file mode 100644
index 00000000..cc698912
--- /dev/null
+++ b/graphics/sprites/chest-warlordplate-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-warlordplate-male.png|W" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/hairstyle7-female.png b/graphics/sprites/hairstyle7-female.png
new file mode 100644
index 00000000..ccfdf31c
Binary files /dev/null and b/graphics/sprites/hairstyle7-female.png differ
diff --git a/items.xml b/items.xml
index c7050e3a..c5e2697b 100644
--- a/items.xml
+++ b/items.xml
@@ -39,7 +39,7 @@
     </item>
     <item id="-7" type="hairsprite">
         <sprite gender="male">hairstyle7-male.xml</sprite>
-        <sprite gender="female">hairstyle7-male.xml</sprite><!-- haven't got one yet -->
+        <sprite gender="female">hairstyle7-female.xml</sprite><!-- haven't got one yet -->
     </item>
 
     <!-- treating the base sprite as equipment too will be useful when we
@@ -203,8 +203,8 @@
         <sprite>head-cowboyblack.xml</sprite>
     </item>
     <item id="45">
-        <sprite gender="male">chest-lightplatemail-male.xml|#884422,ddaa22,ffff22</sprite>
-        <sprite gender="female">chest-lightplatemail-female.xml|#884422,ddaa22,ffff22</sprite>
+        <sprite gender="male">chest-lightplatemail-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">chest-lightplatemail-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
     </item>
     <item id="46">
         <sprite>head-crown.xml</sprite>
@@ -342,6 +342,15 @@
         <sprite gender="male">chest-tnecksweater-male.xml</sprite>
         <sprite gender="female">chest-tnecksweater-female.xml</sprite>
     </item>
+    
+    <item id="80">
+        <sprite gender="male">chest-warlordplate-male.xml|#5c5c5c,ffffff</sprite>
+        <sprite gender="female">chest-warlordplate-female.xml|#5c5c5c,ffffff</sprite>
+    </item>
+    <item id="81">
+        <sprite gender="male">chest-warlordplate-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">chest-warlordplate-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+    </item>
 
     <item id="501"
         image="use-potion-cactusdrink.png"
@@ -1588,14 +1597,14 @@
     <item id="635"
         image="generic-santacookie.png"
         name="Santa Cookie"
-        description="This isn't for you to eat. It is for Santa Clause."
+        description="This isn't for you to eat. It is for Santa Claus."
         effect=""
         type="generic"
         weight="1"
         max-per-slot="1"/>
     <item id="636"
         image="armor-head-warlordhelm.png"
-        name="A Warlord Helmet"
+        name="Warlord Helmet"
         description="Worn by great warriors"
         effect="Defense: +25"
         type="equip-head"
@@ -1605,7 +1614,7 @@
     </item>
     <item id="637"
         image="armor-head-knighthelm.png"
-        name="A Knight's Helmet"
+        name="Knight's Helmet"
         description="Helmet with two small wings on it"
         effect="Defense: +20"
         type="equip-head"
@@ -1615,7 +1624,7 @@
     </item>
     <item id="638"
         image="armor-head-infantryhelm.png"
-        name="A Infantry Helmet"
+        name="Infantry Helmet"
         description="For soldiers and guards"
         effect="Defense: +20"
         type="equip-head"
@@ -1625,7 +1634,7 @@
     </item>
     <item id="639"
         image="armor-head-crusadehelm.png"
-        name="A Crusade Helmet"
+        name="Crusade Helmet"
         description="Start your own crusade"
         effect="Defense: +25"
         type="equip-head"
@@ -1679,15 +1688,15 @@
         <sprite>head-cowboyblack.xml</sprite>
     </item>
     <item id="645"
-        image="armor-chest-lightplatemail.png|W:#884422,ddaa22,ffff22"
+        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."
         effect="Defense: +25"
         type="equip-torso"
         defense="25"
         weight="240">
-        <sprite gender="male">chest-lightplatemail-male.xml|#884422,ddaa22,ffff22</sprite>
-        <sprite gender="female">chest-lightplatemail-female.xml|#884422,ddaa22,ffff22</sprite>
+        <sprite gender="male">chest-lightplatemail-male.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">chest-lightplatemail-female.xml|#573f10,9c8226,d3c04b,ffffff</sprite>
     </item>
     <item id="646"
         image="armor-head-crown.png"
@@ -1793,6 +1802,39 @@
         max-per-slot="1">
         <sprite>head-serf.xml</sprite>
     </item>
+    <item id="657"
+        image="use-food-orange.png"
+        name="Orange"
+        description="A juicy orange."
+        effect="+60 HP"
+        type="usable"
+        hp="60"
+        weight="80"
+        max-per-slot="10"/>
+    <item id="658"
+        image="armor-chest-warlordplate.png|W:#5c5c5c,ffffff"
+        name="Warlord Plate"
+        description="Strong and decrotive armor."
+        effect="Defense: +27"
+        type="equip-torso"
+        weight="275"
+        defense="27"
+        max-per-slot="1">
+        <sprite gender="male">chest-warlordplate-male.xml|W:#5c5c5c,ffffff</sprite>
+        <sprite gender="female">chest-warlordplate-female.xml|W:#5c5c5c,ffffff</sprite>
+    </item>
+        <item id="659"
+        image="armor-chest-warlordplate.png|W:#573f10,9c8226,d3c04b,ffffff"
+        name="Golden Warlord Plate"
+        description="Strong and decrotive armor made from gold."
+        effect="Defense: +27"
+        type="equip-torso"
+        weight="275"
+        defense="27"
+        max-per-slot="1">
+        <sprite gender="male">chest-warlordplate-male.xml|W:#573f10,9c8226,d3c04b,ffffff</sprite>
+        <sprite gender="female">chest-warlordplate-female.xml|W:#573f10,9c8226,d3c04b,ffffff</sprite>
+    </item>
     <item id="1199"
         image="weapon-arrow-arrow.png"
         name="Arrow"
diff --git a/maps/new_25-1.tmx b/maps/new_25-1.tmx
index 1d0f8636..5caf6b91 100644
--- a/maps/new_25-1.tmx
+++ b/maps/new_25-1.tmx
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <map version="0.99b" orientation="orthogonal" width="150" height="150" tilewidth="32" tileheight="32">
  <properties>
+  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
   <property name="minimap" value="graphics/images/minimap_new_25-1.png"/>
  </properties>
  <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
-- 
cgit v1.2.3-70-g09d2