From 61aea1c4055036afdf8b63fd432404d84f822c23 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Thu, 30 Aug 2007 16:46:21 +0000 Subject: Merged equipment database with items database and got rid of the unused item art attribute. Removed the now unnecessary multiplication of weapon IDs with 10000. Added a fallback item icon and used it for unknown items or when an item image fails to load. --- equipment.xml | 93 +++-------- graphics/gui/CMakeLists.txt | 5 +- graphics/gui/Makefile.am | 7 +- graphics/gui/unknown-item.png | Bin 0 -> 540 bytes items.xml | 357 +++++++++++++++++++++++++----------------- 5 files changed, 249 insertions(+), 213 deletions(-) create mode 100644 graphics/gui/unknown-item.png diff --git a/equipment.xml b/equipment.xml index cf70bcbd..71afc96b 100644 --- a/equipment.xml +++ b/equipment.xml @@ -4,89 +4,89 @@ animation files. --> - + chest-cotton-male.xml chest-cotton-female.xml - + item002.xml - + chest-leather-male.xml chest-leather-female.xml - + leg-cotton-male.xml leg-cotton-female.xml - + leg-jeans-male.xml leg-jeans-female.xml - + item006.xml - + item007.xml - + item008.xml - + item009.xml - + item010.xml - + item011.xml - + item012.xml - + item013.xml - + item014.xml - + item015.xml - + item016.xml - + item017.xml - + item018.xml - + chest-vnecksweater-male.xml chest-vnecksweater-female.xml - + chest-tnecksweater-male.xml chest-tnecksweater-female.xml - + head-rangerhat.xml - + head-antlerhat.xml - + head-christmastree.xml - + head-santabeardhat.xml - + chest-chainmail-male.xml chest-chainmail-female.xml - + chest-lightplatemail-male.xml chest-lightplatemail-female.xml @@ -98,54 +98,13 @@ weapon-scythe.xml - weapon-bow.xml bow_shoot_1.ogg - - weapon-bow.xml - bow_shoot_1.ogg - - - weapon-bow.xml - bow_shoot_1.ogg - - weapon-dagger.xml short-sword-miss1.ogg short-sword-hit1.ogg - - weapon-dagger.xml - short-sword-miss1.ogg - short-sword-hit1.ogg - - - weapon-dagger.xml - short-sword-miss1.ogg - short-sword-hit1.ogg - - - weapon-dagger.xml - short-sword-miss1.ogg - short-sword-hit1.ogg - - - - - weapon-dagger.xml - - - weapon-bow.xml - - - weapon-scythe.xml - - diff --git a/graphics/gui/CMakeLists.txt b/graphics/gui/CMakeLists.txt index 2ef4b460..208ae547 100644 --- a/graphics/gui/CMakeLists.txt +++ b/graphics/gui/CMakeLists.txt @@ -27,6 +27,8 @@ SET (FILES menuitemP.png radioin.png radioout.png + resize.png + rpgfont_wider.png selection.png sansserif8.png slider.png @@ -37,6 +39,7 @@ SET (FILES target-cursor-red-m.png target-cursor-red-s.png thickborder.png + unknown-item.png vscroll_blue.png vscroll_down_default.png vscroll_down_highlight.png @@ -46,8 +49,6 @@ SET (FILES vscroll_up_default.png vscroll_up_highlight.png vscroll_up_pressed.png - rpgfont_wider.png - resize.png ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/gui) diff --git a/graphics/gui/Makefile.am b/graphics/gui/Makefile.am index 6b82843d..6f33dbed 100644 --- a/graphics/gui/Makefile.am +++ b/graphics/gui/Makefile.am @@ -30,6 +30,8 @@ gui_DATA = \ menuitemP.png \ radioin.png \ radioout.png \ + resize.png \ + rpgfont_wider.png \ selection.png \ sansserif8.png \ slider.png \ @@ -40,6 +42,7 @@ gui_DATA = \ target-cursor-red-m.png \ target-cursor-red-s.png \ thickborder.png \ + unknown-item.png \ vscroll_blue.png \ vscroll_down_default.png \ vscroll_down_highlight.png \ @@ -48,9 +51,7 @@ gui_DATA = \ vscroll_red.png \ vscroll_up_default.png \ vscroll_up_highlight.png \ - vscroll_up_pressed.png \ - rpgfont_wider.png \ - resize.png + vscroll_up_pressed.png EXTRA_DIST = \ $(gui_DATA) diff --git a/graphics/gui/unknown-item.png b/graphics/gui/unknown-item.png new file mode 100644 index 00000000..9201d688 Binary files /dev/null and b/graphics/gui/unknown-item.png differ diff --git a/items.xml b/items.xml index cf1cb2c0..81329ec4 100644 --- a/items.xml +++ b/items.xml @@ -1,144 +1,219 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + item010.xml + + + + + + + + + + + + weapon-dagger.xml + short-sword-miss1.ogg + short-sword-hit1.ogg + + + + chest-leather-male.xml + chest-leather-female.xml + + + item008.xml + + + item009.xml + + + + + + + + + + + + + + + + + + + + item007.xml + + + item006.xml + + + + item002.xml + + + + + + + + + + + + + + + + + + + + chest-tnecksweater-male.xml + chest-tnecksweater-female.xml + + + + + + + + + + + + + + + + + + + + + + + + leg-cotton-male.xml + leg-cotton-female.xml + + + + + + + + + + + + + + + + + + + + + + + + + + leg-jeans-male.xml + leg-jeans-female.xml + + + + + + + item011.xml + + + item012.xml + + + item013.xml + + + item014.xml + + + item015.xml + + + item016.xml + + + item017.xml + + + item018.xml + + + weapon-scythe.xml + + + chest-vnecksweater-male.xml + chest-vnecksweater-female.xml + + + chest-chainmail-male.xml + chest-chainmail-female.xml + + + chest-lightplatemail-male.xml + chest-lightplatemail-female.xml + + + + weapon-bow.xml + bow_shoot_1.ogg + + + + chest-cotton-male.xml + chest-cotton-female.xml + + + head-rangerhat.xml + + + head-antlerhat.xml + + + head-christmastree.xml + + + head-santabeardhat.xml + + + + + + + + -- cgit v1.2.3-60-g2f50