added scythe as a permanent weapon.

When you want to test it: either spawn an item with the id 623 or uncomment the lines 439-441 in being.cpp to use the sharp knive as scythe.

9 files changed, 71 insertions, 23 deletions

diff --git a/graphics/items/weapon-polearm-scythe.png b/graphics/items/weapon-polearm-scythe.png
new file mode 100644
index 00000000..c1d097a3
--- /dev/null
+++ b/graphics/items/weapon-polearm-scythe.png
diff --git a/graphics/sprites/CMakeLists.txt b/graphics/sprites/CMakeLists.txt
index d4e41799..d459b4e8 100644
--- a/graphics/sprites/CMakeLists.txt
+++ b/graphics/sprites/CMakeLists.txt
@@ -104,7 +104,11 @@ SET(FILES
     player_male_base.xml
     weapon0.png
     weapon1.png
-    weapons.xml
+    weapon2.png
+    weapon_bow.xml
+    weapon_dagger.xml
+    weapon_fist.xml
+    weapon_scythe.xml
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprites)
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprites)
\ No newline at end of file
diff --git a/graphics/sprites/Makefile.am b/graphics/sprites/Makefile.am
index 3d10cc57..cee3653b 100644
--- a/graphics/sprites/Makefile.am
+++ b/graphics/sprites/Makefile.am
@@ -107,7 +107,11 @@ sprites_DATA =				\
 	player_male_base.xml			\
 	weapon0.png			\
 	weapon1.png			\
-	weapons.xml
+	weapon2.png		\
+    weapon_bow.xml	\
+    weapon_dagger.xml	\
+    weapon_fist.xml		\
+    weapon_scythe.xml	
 
 EXTRA_DIST =				\
-	$(sprites_DATA)
+	$(sprites_DATA)
\ No newline at end of file
diff --git a/graphics/sprites/weapon-bow.xml b/graphics/sprites/weapon-bow.xml
new file mode 100644
index 00000000..7f1e14e3
--- /dev/null
+++ b/graphics/sprites/weapon-bow.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+	<imageset name="bow" src="graphics/sprites/weapon1.png" width="64" height="64" />
+
+	<action name="default" imageset="bow">
+	</action>
+
+	<action name="attack_bow" imageset="bow">
+		<animation direction="down">
+			<sequence start="0" end="4" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="5" end="9" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="10" end="14" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="15" end="19" delay="75" />
+		 	<end />
+		</animation>
+	</action>
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/weapons.xml b/graphics/sprites/weapon-dagger.xml
index 95fb933f..7bd9dcb7 100644
--- a/graphics/sprites/weapons.xml
+++ b/graphics/sprites/weapon-dagger.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand">
 	<imageset name="dagger" src="graphics/sprites/weapon0.png" width="64" height="64" />
-	<imageset name="bow" src="graphics/sprites/weapon1.png" width="64" height="64" />
 
 	<action name="default" imageset="dagger">
 	</action>
@@ -25,22 +24,4 @@
 		</animation>
 	</action>
 
-	<action name="attack_bow" imageset="bow">
-		<animation direction="down">
-			<sequence start="0" end="4" delay="75" />
-		  	<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="5" end="9" delay="75" />
-		  	<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="10" end="14" delay="75" />
-		  	<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="15" end="19" delay="75" />
-		 	<end />
-		</animation>
-	</action>
 </sprite>
\ No newline at end of file
diff --git a/graphics/sprites/weapon-fist.xml b/graphics/sprites/weapon-fist.xml
new file mode 100644
index 00000000..bfe04948
--- /dev/null
+++ b/graphics/sprites/weapon-fist.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+	<imageset name="dagger" src="graphics/sprites/weapon0.png" width="64" height="64" />
+
+	<action name="default" imageset="dagger">
+	</action>
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/weapon-scythe.xml b/graphics/sprites/weapon-scythe.xml
new file mode 100644
index 00000000..e305af96
--- /dev/null
+++ b/graphics/sprites/weapon-scythe.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+	<imageset name="scythe" src="graphics/sprites/weapon2.png" width="64" height="64" />
+
+	<action name="default" imageset="scythe">
+	</action>
+
+	<action name="attack" imageset="scythe">
+		<animation direction="down">
+			<sequence start="0" end="3" delay="75" />
+		 	<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="4" end="7" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="8" end="11" delay="75" />
+		  	<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="12" end="15" delay="75" />
+		 	 <end />
+		</animation>
+	</action>
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/weapon0.png b/graphics/sprites/weapon0.png
index f787ebe4..f691ef3f 100644
--- a/graphics/sprites/weapon0.png
+++ b/graphics/sprites/weapon0.png
diff --git a/graphics/sprites/weapon2.png b/graphics/sprites/weapon2.png
new file mode 100644
index 00000000..f787ebe4
--- /dev/null
+++ b/graphics/sprites/weapon2.png