From 054cd9a8fe0a4433a7e83aa0de42db02033f59de Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Mon, 11 Dec 2006 12:54:12 +0000
Subject: Added new sweaters by Saphy. Info for server admins: Item IDs are 564
 for turtleneck (should already be in there) and 624 for v-neck. The visible
 sprite IDs are 19 for turtleneck and 20 for v-neck. By the way, I would have
 liked to rename armor-chest-woolsweater.png to armor-chest-tnecksweater.png
 instead of deleting and adding it, but sourceforge didn't allowed it (got a
 403 error).

---
 equipment.xml                                  |  11 +++
 graphics/items/CMakeLists.txt                  |   5 +-
 graphics/items/Makefile.am                     |   3 +-
 graphics/items/armor-chest-tnecksweater.png    | Bin 0 -> 940 bytes
 graphics/items/armor-chest-vnecksweater.png    | Bin 0 -> 1109 bytes
 graphics/items/armor-chest-woolsweater.png     | Bin 940 -> 0 bytes
 graphics/sprites/CMakeLists.txt                |   8 ++
 graphics/sprites/Makefile.am                   |   8 ++
 graphics/sprites/chest-tnecksweater-female.png | Bin 0 -> 40801 bytes
 graphics/sprites/chest-tnecksweater-female.xml | 104 +++++++++++++++++++++++++
 graphics/sprites/chest-tnecksweater-male.png   | Bin 0 -> 39738 bytes
 graphics/sprites/chest-tnecksweater-male.xml   | 104 +++++++++++++++++++++++++
 graphics/sprites/chest-vnecksweater-female.png | Bin 0 -> 37386 bytes
 graphics/sprites/chest-vnecksweater-female.xml | 104 +++++++++++++++++++++++++
 graphics/sprites/chest-vnecksweater-male.png   | Bin 0 -> 34222 bytes
 graphics/sprites/chest-vnecksweater-male.xml   | 104 +++++++++++++++++++++++++
 items.xml                                      |   3 +-
 17 files changed, 450 insertions(+), 4 deletions(-)
 create mode 100644 graphics/items/armor-chest-tnecksweater.png
 create mode 100644 graphics/items/armor-chest-vnecksweater.png
 delete mode 100644 graphics/items/armor-chest-woolsweater.png
 create mode 100644 graphics/sprites/chest-tnecksweater-female.png
 create mode 100644 graphics/sprites/chest-tnecksweater-female.xml
 create mode 100644 graphics/sprites/chest-tnecksweater-male.png
 create mode 100644 graphics/sprites/chest-tnecksweater-male.xml
 create mode 100644 graphics/sprites/chest-vnecksweater-female.png
 create mode 100644 graphics/sprites/chest-vnecksweater-female.xml
 create mode 100644 graphics/sprites/chest-vnecksweater-male.png
 create mode 100644 graphics/sprites/chest-vnecksweater-male.xml

diff --git a/equipment.xml b/equipment.xml
index 60a8aae9..26398627 100644
--- a/equipment.xml
+++ b/equipment.xml
@@ -55,4 +55,15 @@
 	<equipment id="17" slot = "0">
 		<sprite>item017.xml</sprite>
 	</equipment>
+	<equipment id="18" slot = "0">
+		<sprite>item018.xml</sprite>
+	</equipment>
+	<equipment id="19" slot = "0">
+		<sprite gender="male">chest-vnecksweater-male.xml</sprite>
+		<sprite gender="female">chest-vnecksweater-female.xml</sprite>
+	</equipment>
+	<equipment id="20" slot = "0">
+		<sprite gender="male">chest-tnecksweater-male.xml</sprite>
+		<sprite gender="female">chest-tnecksweater-female.xml</sprite>
+	</equipment>
 </equipments>
\ No newline at end of file
diff --git a/graphics/items/CMakeLists.txt b/graphics/items/CMakeLists.txt
index 40a7539d..ff5f3e79 100644
--- a/graphics/items/CMakeLists.txt
+++ b/graphics/items/CMakeLists.txt
@@ -2,7 +2,8 @@ SET(FILES
     armor-chest-cottonshirt.png
     armor-chest-desertshirt.png
     armor-chest-leathershirt.png
-    armor-chest-woolsweater.png
+    armor-chest-tnecksweater.png
+    armor-chest-vnecksweater.png
     armor-feet-boots.png
     armor-hands-leathergloves.png
     armor-hands-minergloves.png
@@ -127,4 +128,4 @@ SET(FILES
     weapon-thrown-bonedarts.png
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/items)
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/items)
\ No newline at end of file
diff --git a/graphics/items/Makefile.am b/graphics/items/Makefile.am
index fbf5e4c9..56c3aecb 100644
--- a/graphics/items/Makefile.am
+++ b/graphics/items/Makefile.am
@@ -4,7 +4,8 @@ itemsdir = $(pkgdatadir)/data/graphics/items
 items_DATA = armor-chest-cottonshirt.png \
 	     armor-chest-desertshirt.png \
 	     armor-chest-leathershirt.png \
-	     armor-chest-woolsweater.png \
+    	 armor-chest-tnecksweater.png \
+    	 armor-chest-vnecksweater.png \
 	     armor-feet-boots.png \
 	     armor-hands-leathergloves.png \
 	     armor-hands-minergloves.png \
diff --git a/graphics/items/armor-chest-tnecksweater.png b/graphics/items/armor-chest-tnecksweater.png
new file mode 100644
index 00000000..80ecdf7f
Binary files /dev/null and b/graphics/items/armor-chest-tnecksweater.png differ
diff --git a/graphics/items/armor-chest-vnecksweater.png b/graphics/items/armor-chest-vnecksweater.png
new file mode 100644
index 00000000..85092f4e
Binary files /dev/null and b/graphics/items/armor-chest-vnecksweater.png differ
diff --git a/graphics/items/armor-chest-woolsweater.png b/graphics/items/armor-chest-woolsweater.png
deleted file mode 100644
index 80ecdf7f..00000000
Binary files a/graphics/items/armor-chest-woolsweater.png and /dev/null differ
diff --git a/graphics/sprites/CMakeLists.txt b/graphics/sprites/CMakeLists.txt
index 27885a13..68702d43 100644
--- a/graphics/sprites/CMakeLists.txt
+++ b/graphics/sprites/CMakeLists.txt
@@ -3,6 +3,14 @@ SET(FILES
 	chest-leather-male.xml
 	chest-leather-female.png
 	chest-leather-female.xml
+    chest-tnecksweater-male.png
+    chest-tnecksweater-male.xml
+    chest-tnecksweater-female.png
+    chest-tnecksweater-female.xml
+    chest-vnecksweater-male.png
+    chest-vnecksweater-male.xml
+    chest-vnecksweater-female.png
+    chest-vnecksweater-female.xml
 	emotions.png
 	error.png
     hairstyle1.png
diff --git a/graphics/sprites/Makefile.am b/graphics/sprites/Makefile.am
index 2d9c8d74..466d58ea 100644
--- a/graphics/sprites/Makefile.am
+++ b/graphics/sprites/Makefile.am
@@ -6,6 +6,14 @@ sprites_DATA =				\
 	chest-leather-male.xml	\
 	chest-leather-female.png	\
 	chest-leather-female.xml	\
+    chest-tnecksweater-male.png	\
+    chest-tnecksweater-male.xml	\
+    chest-tnecksweater-female.png	\
+    chest-tnecksweater-female.xml	\
+    chest-vnecksweater-male.png	\
+    chest-vnecksweater-male.xml	\
+    chest-vnecksweater-female.png	\
+    chest-vnecksweater-female.xml	\
 	emotions.png			\
 	error.xml				\
 	hairstyle1.png			\
diff --git a/graphics/sprites/chest-tnecksweater-female.png b/graphics/sprites/chest-tnecksweater-female.png
new file mode 100644
index 00000000..f810fa07
Binary files /dev/null and b/graphics/sprites/chest-tnecksweater-female.png differ
diff --git a/graphics/sprites/chest-tnecksweater-female.xml b/graphics/sprites/chest-tnecksweater-female.xml
new file mode 100644
index 00000000..ec67bbc3
--- /dev/null
+++ b/graphics/sprites/chest-tnecksweater-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-tnecksweater-female.png" 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-tnecksweater-male.png b/graphics/sprites/chest-tnecksweater-male.png
new file mode 100644
index 00000000..e9b0d268
Binary files /dev/null and b/graphics/sprites/chest-tnecksweater-male.png differ
diff --git a/graphics/sprites/chest-tnecksweater-male.xml b/graphics/sprites/chest-tnecksweater-male.xml
new file mode 100644
index 00000000..68d01ec4
--- /dev/null
+++ b/graphics/sprites/chest-tnecksweater-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-tnecksweater-male.png" 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-vnecksweater-female.png b/graphics/sprites/chest-vnecksweater-female.png
new file mode 100644
index 00000000..65fec74d
Binary files /dev/null and b/graphics/sprites/chest-vnecksweater-female.png differ
diff --git a/graphics/sprites/chest-vnecksweater-female.xml b/graphics/sprites/chest-vnecksweater-female.xml
new file mode 100644
index 00000000..e388d987
--- /dev/null
+++ b/graphics/sprites/chest-vnecksweater-female.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-vnecksweater-female.png" 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-vnecksweater-male.png b/graphics/sprites/chest-vnecksweater-male.png
new file mode 100644
index 00000000..e9b04e6d
Binary files /dev/null and b/graphics/sprites/chest-vnecksweater-male.png differ
diff --git a/graphics/sprites/chest-vnecksweater-male.xml b/graphics/sprites/chest-vnecksweater-male.xml
new file mode 100644
index 00000000..ac5dfca3
--- /dev/null
+++ b/graphics/sprites/chest-vnecksweater-male.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-vnecksweater-male.png" 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/items.xml b/items.xml
index 446db136..d701ac62 100644
--- a/items.xml
+++ b/items.xml
@@ -63,7 +63,7 @@
     <item id="561" image="weapon-sword-sabre.png" art="0" name="Sabre" description="A sword with a very sharp, curved, single-edged blade" effect="" type="0" weight="10" slot="0"/>
     <item id="562" image="use-food-chickenleg.png" art="0" name="Chicken leg" description="A well cooked chicken leg" effect="" type="0" weight="10" slot="0"/>
     <item id="563" image="armor-hands-wintergloves.png" art="0" name="Winter gloves" description="Soft and warm gloves" effect="" type="0" weight="10" slot="0"/>
-    <item id="564" image="armor-chest-woolsweater.png" art="0" name="Wool sweater" description="Soft and warm sweater" effect="" type="0" weight="10" slot="0"/>
+    <item id="564" image="armor-chest-tnecksweater.png" art="0" name="Turtlenck sweater" description="Soft and warm sweater" effect="" type="0" weight="10" slot="0"/>
     <item id="565" image="generic-petal.png" art="0" name="Petal" description="A petal from an evil flower" effect="" type="0" weight="10" slot="0"/>
     <item id="566" image="generic-smallmushroom.png" art="0" name="Small mushroom" description="A mushroom" effect="" type="0" weight="10" slot="0"/>
     <item id="567" image="use-potion-ironpotion.png" art="0" name="Iron potion" description="Increases your attack strenght" effect="" type="0" weight="10" slot="0"/>
@@ -123,6 +123,7 @@
 	<item id="621" image="armor-head-eyepatch.png" art="0" name="Eyepatch" description="What really makes you a pirate." effect="Defense: +3" type="0" weight="10" slot="0"/>
 	<item id="622" image="armor-head-bandana.png" art="0" name="Bandana" description="A striped bandana." effect="Defense: +3" type="0" weight="10" slot="0"/>
 	<item id="623" image="weapon-polearm-scythe.png" art="0" name="Scythe" description="Usually used for farming but also useable as a weapon." effect="Damage: +25 / Range: 1" type="0" weight="10" slot="0"/>
+    <item id="624" image="armor-chest-vnecksweater.png" art="0" name="V-neck Sweater" description="Soft and warm sweater" effect="" type="0" weight="10" slot="0"/>
     <item id="1199" image="weapon-arrow-arrow.png" art="0" name="Arrow" description="A standard arrow" effect="Damage: +25" type="0" weight="10" slot="0"/>
     <item id="1200" image="weapon-bow-bow.png" art="0" name="Bow" description="A distance weapon" effect="Damage: +15 / Range: 5" type="0" weight="10" slot="0"/>
     <item id="1201" image="weapon-dagger-knive.png" art="0" name="Knife" description="A small knife, the perfect weapon for a beginner" effect="Damage: 5 / Range: 1" type="0" weight="10" slot="0"/>
-- 
cgit v1.2.3-60-g2f50