From 6a25aedff608a90a7240bb36348fa1bbbfcd0dc5 Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Sat, 4 Nov 2006 23:56:30 +0000 Subject: 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. --- graphics/sprites/CMakeLists.txt | 8 +++++-- graphics/sprites/Makefile.am | 8 +++++-- graphics/sprites/weapon-bow.xml | 26 +++++++++++++++++++++ graphics/sprites/weapon-dagger.xml | 27 ++++++++++++++++++++++ graphics/sprites/weapon-fist.xml | 7 ++++++ graphics/sprites/weapon-scythe.xml | 26 +++++++++++++++++++++ graphics/sprites/weapon0.png | Bin 3622 -> 2016 bytes graphics/sprites/weapon2.png | Bin 0 -> 3622 bytes graphics/sprites/weapons.xml | 46 ------------------------------------- 9 files changed, 98 insertions(+), 50 deletions(-) create mode 100644 graphics/sprites/weapon-bow.xml create mode 100644 graphics/sprites/weapon-dagger.xml create mode 100644 graphics/sprites/weapon-fist.xml create mode 100644 graphics/sprites/weapon-scythe.xml create mode 100644 graphics/sprites/weapon2.png delete mode 100644 graphics/sprites/weapons.xml (limited to 'graphics/sprites') 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/weapon-dagger.xml b/graphics/sprites/weapon-dagger.xml new file mode 100644 index 00000000..7bd9dcb7 --- /dev/null +++ b/graphics/sprites/weapon-dagger.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/graphics/sprites/weapon0.png b/graphics/sprites/weapon0.png index f787ebe4..f691ef3f 100644 Binary files a/graphics/sprites/weapon0.png and b/graphics/sprites/weapon0.png differ diff --git a/graphics/sprites/weapon2.png b/graphics/sprites/weapon2.png new file mode 100644 index 00000000..f787ebe4 Binary files /dev/null and b/graphics/sprites/weapon2.png differ diff --git a/graphics/sprites/weapons.xml b/graphics/sprites/weapons.xml deleted file mode 100644 index 95fb933f..00000000 --- a/graphics/sprites/weapons.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3-70-g09d2