From 715a7c2424c17e701f6e2a612e6cae6361556adf Mon Sep 17 00:00:00 2001
From: ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 29 Feb 2008 05:43:42 +0000
Subject: Adding different art for staves and rods so that they no longer look
 identical. Rearranging staff and rod art assets.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3478 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/makeitem.cc                       |   3 ---
 crawl-ref/source/rltiles/dc-item.txt               |  14 ++++++++++++-
 .../source/rltiles/item/rod/i-rod_demonology.bmp   | Bin 0 -> 3126 bytes
 .../rltiles/item/rod/i-rod_destruction_fire.bmp    | Bin 0 -> 3126 bytes
 .../rltiles/item/rod/i-rod_destruction_ice.bmp     | Bin 0 -> 3126 bytes
 .../item/rod/i-rod_destruction_inaccuracy.bmp      | Bin 0 -> 3126 bytes
 .../item/rod/i-rod_destruction_lightning.bmp       | Bin 0 -> 3126 bytes
 .../source/rltiles/item/rod/i-rod_discovery.bmp    | Bin 0 -> 3126 bytes
 .../source/rltiles/item/rod/i-rod_smiting.bmp      | Bin 0 -> 3126 bytes
 .../source/rltiles/item/rod/i-rod_striking.bmp     | Bin 0 -> 3126 bytes
 .../source/rltiles/item/rod/i-rod_summoning.bmp    | Bin 0 -> 3126 bytes
 crawl-ref/source/rltiles/item/rod/i-rod_venom.bmp  | Bin 0 -> 3126 bytes
 .../source/rltiles/item/rod/i-rod_warding.bmp      | Bin 0 -> 3126 bytes
 crawl-ref/source/rltiles/item/rod/rod00.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod01.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod02.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod03.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod04.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod05.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod06.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod07.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod08.bmp        | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/rod/rod09.bmp        | Bin 0 -> 2102 bytes
 .../source/rltiles/item/staff/i-staff_air.bmp      | Bin 0 -> 3126 bytes
 .../rltiles/item/staff/i-staff_channeling.bmp      | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_cold.bmp     | Bin 0 -> 3126 bytes
 .../rltiles/item/staff/i-staff_conjuration.bmp     | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_death.bmp    | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_earth.bmp    | Bin 0 -> 3126 bytes
 .../rltiles/item/staff/i-staff_enchantment.bmp     | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_energy.bmp   | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_fire.bmp     | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_poison.bmp   | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_power.bmp    | Bin 0 -> 3126 bytes
 .../rltiles/item/staff/i-staff_summoning.bmp       | Bin 0 -> 3126 bytes
 .../source/rltiles/item/staff/i-staff_wizardry.bmp | Bin 0 -> 3126 bytes
 crawl-ref/source/rltiles/item/staff/staff00.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff01.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff02.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff03.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff04.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff05.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff06.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff07.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff08.bmp    | Bin 0 -> 2102 bytes
 crawl-ref/source/rltiles/item/staff/staff09.bmp    | Bin 0 -> 2102 bytes
 .../source/rltiles/item/wand/i-rod_demonology.bmp  | Bin 3126 -> 0 bytes
 .../rltiles/item/wand/i-rod_destruction_fire.bmp   | Bin 3126 -> 0 bytes
 .../rltiles/item/wand/i-rod_destruction_ice.bmp    | Bin 3126 -> 0 bytes
 .../item/wand/i-rod_destruction_inaccuracy.bmp     | Bin 3126 -> 0 bytes
 .../item/wand/i-rod_destruction_lightning.bmp      | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-rod_discovery.bmp   | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-rod_smiting.bmp     | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-rod_striking.bmp    | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-rod_summoning.bmp   | Bin 3126 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-rod_warding.bmp     | Bin 3126 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/i-staff_air.bmp | Bin 3126 -> 0 bytes
 .../rltiles/item/wand/i-staff_channeling.bmp       | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_cold.bmp      | Bin 3126 -> 0 bytes
 .../rltiles/item/wand/i-staff_conjuration.bmp      | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_death.bmp     | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_earth.bmp     | Bin 3126 -> 0 bytes
 .../rltiles/item/wand/i-staff_enchantment.bmp      | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_energy.bmp    | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_fire.bmp      | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_poison.bmp    | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_power.bmp     | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_summoning.bmp | Bin 3126 -> 0 bytes
 .../source/rltiles/item/wand/i-staff_wizardry.bmp  | Bin 3126 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff00.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff01.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff02.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff03.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff04.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff05.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff06.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff07.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff08.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/rltiles/item/wand/staff09.bmp     | Bin 2102 -> 0 bytes
 crawl-ref/source/tile1.cc                          |  22 +++++++++++++++------
 crawl-ref/source/tile2.cc                          |  12 ++++++++++-
 82 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_demonology.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_destruction_fire.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_destruction_ice.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_destruction_inaccuracy.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_destruction_lightning.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_discovery.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_smiting.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_striking.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_summoning.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_venom.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/i-rod_warding.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod00.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod01.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod02.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod03.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod04.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod05.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod06.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod07.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod08.bmp
 create mode 100644 crawl-ref/source/rltiles/item/rod/rod09.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_air.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_channeling.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_cold.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_conjuration.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_death.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_earth.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_enchantment.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_energy.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_fire.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_poison.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_power.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_summoning.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/i-staff_wizardry.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff00.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff01.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff02.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff03.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff04.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff05.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff06.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff07.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff08.bmp
 create mode 100644 crawl-ref/source/rltiles/item/staff/staff09.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_destruction_fire.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_destruction_ice.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_destruction_inaccuracy.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_destruction_lightning.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_air.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_death.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_power.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff00.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff01.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff02.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff03.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff04.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff05.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff06.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff07.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff08.bmp
 delete mode 100644 crawl-ref/source/rltiles/item/wand/staff09.bmp

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 9db84a802d..42aa84fd6a 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2484,9 +2484,6 @@ static void generate_staff_item(item_def& item, int force_type)
     
     if (item_is_rod( item ))
         init_rod_mp( item );
-    
-    // add different looks
-//  item.special = you.item_description[IDESC_STAVES][item.sub_type];
 }
 
 static bool try_make_jewellery_unrandart(item_def& item, int force_type,
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index b4c83ed738..d8c0283e14 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -560,7 +560,7 @@ metal_green
 ############4papi 1
 cloth BOOK_PAPYRUS
 #####################OBJ_STAVES
-%sdir item/wand
+%sdir item/staff
 staff00 STAFF_OFFSET /*curved*/
 staff01
 staff02
@@ -586,6 +586,18 @@ i-staff_air STAFF_AIR
 i-staff_earth STAFF_EARTH
 i-staff_channeling STAFF_CHANNELING
 
+%sdir item/rod
+rod00 ROD_OFFSET
+rod01
+rod02
+rod03
+rod04
+rod05
+rod06
+rod07
+rod08
+rod09
+
 i-rod_smiting ROD_SMITING
 i-rod_summoning ROD_SUMMONING
 i-rod_destruction_fire ROD_DESTRUCTION_FIRE
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_demonology.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_demonology.bmp
new file mode 100644
index 0000000000..3b78d6420e
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_demonology.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_destruction_fire.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_fire.bmp
new file mode 100644
index 0000000000..7d2f3b26c1
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_fire.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_destruction_ice.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_ice.bmp
new file mode 100644
index 0000000000..d2fab495a3
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_ice.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_destruction_inaccuracy.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_inaccuracy.bmp
new file mode 100644
index 0000000000..68ec621c9a
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_inaccuracy.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_destruction_lightning.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_lightning.bmp
new file mode 100644
index 0000000000..18f03653cd
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_lightning.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_discovery.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_discovery.bmp
new file mode 100644
index 0000000000..8da451f276
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_discovery.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_smiting.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_smiting.bmp
new file mode 100644
index 0000000000..999b407ecf
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_smiting.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_striking.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_striking.bmp
new file mode 100644
index 0000000000..2383a1e734
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_striking.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_summoning.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_summoning.bmp
new file mode 100644
index 0000000000..3dd4f6f1d4
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_summoning.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_venom.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_venom.bmp
new file mode 100644
index 0000000000..38ca50b69b
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_venom.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/i-rod_warding.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_warding.bmp
new file mode 100644
index 0000000000..80b3a65243
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/i-rod_warding.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod00.bmp b/crawl-ref/source/rltiles/item/rod/rod00.bmp
new file mode 100644
index 0000000000..f5c57707b9
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod00.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod01.bmp b/crawl-ref/source/rltiles/item/rod/rod01.bmp
new file mode 100644
index 0000000000..f230049cef
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod01.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod02.bmp b/crawl-ref/source/rltiles/item/rod/rod02.bmp
new file mode 100644
index 0000000000..f1f933f432
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod02.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod03.bmp b/crawl-ref/source/rltiles/item/rod/rod03.bmp
new file mode 100644
index 0000000000..aeae232640
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod03.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod04.bmp b/crawl-ref/source/rltiles/item/rod/rod04.bmp
new file mode 100644
index 0000000000..259921feb0
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod04.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod05.bmp b/crawl-ref/source/rltiles/item/rod/rod05.bmp
new file mode 100644
index 0000000000..13233e735c
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod05.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod06.bmp b/crawl-ref/source/rltiles/item/rod/rod06.bmp
new file mode 100644
index 0000000000..22ff89c0bd
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod06.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod07.bmp b/crawl-ref/source/rltiles/item/rod/rod07.bmp
new file mode 100644
index 0000000000..3dadbceb0b
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod07.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod08.bmp b/crawl-ref/source/rltiles/item/rod/rod08.bmp
new file mode 100644
index 0000000000..cf6e1f80bd
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod08.bmp differ
diff --git a/crawl-ref/source/rltiles/item/rod/rod09.bmp b/crawl-ref/source/rltiles/item/rod/rod09.bmp
new file mode 100644
index 0000000000..2d61ec6062
Binary files /dev/null and b/crawl-ref/source/rltiles/item/rod/rod09.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_air.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_air.bmp
new file mode 100644
index 0000000000..6e6fc38e31
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_air.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_channeling.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_channeling.bmp
new file mode 100644
index 0000000000..e08af45efa
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_channeling.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_cold.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_cold.bmp
new file mode 100644
index 0000000000..d2fab495a3
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_cold.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_conjuration.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_conjuration.bmp
new file mode 100644
index 0000000000..4353a5adee
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_conjuration.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_death.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_death.bmp
new file mode 100644
index 0000000000..7ca87f3556
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_death.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_earth.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_earth.bmp
new file mode 100644
index 0000000000..9197c364cb
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_earth.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_enchantment.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_enchantment.bmp
new file mode 100644
index 0000000000..1a90a29eec
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_enchantment.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_energy.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_energy.bmp
new file mode 100644
index 0000000000..083d4b4eb7
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_energy.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_fire.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_fire.bmp
new file mode 100644
index 0000000000..7d2f3b26c1
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_fire.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_poison.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_poison.bmp
new file mode 100644
index 0000000000..d1db487724
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_poison.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_power.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_power.bmp
new file mode 100644
index 0000000000..903888d036
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_power.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_summoning.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_summoning.bmp
new file mode 100644
index 0000000000..3dd4f6f1d4
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_summoning.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/i-staff_wizardry.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_wizardry.bmp
new file mode 100644
index 0000000000..0cc5642c9c
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/i-staff_wizardry.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff00.bmp b/crawl-ref/source/rltiles/item/staff/staff00.bmp
new file mode 100644
index 0000000000..2c30326f6c
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff00.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff01.bmp b/crawl-ref/source/rltiles/item/staff/staff01.bmp
new file mode 100644
index 0000000000..b27ebd7a5d
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff01.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff02.bmp b/crawl-ref/source/rltiles/item/staff/staff02.bmp
new file mode 100644
index 0000000000..fc6d42fc8b
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff02.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff03.bmp b/crawl-ref/source/rltiles/item/staff/staff03.bmp
new file mode 100644
index 0000000000..fac426cbba
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff03.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff04.bmp b/crawl-ref/source/rltiles/item/staff/staff04.bmp
new file mode 100644
index 0000000000..138c099c6b
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff04.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff05.bmp b/crawl-ref/source/rltiles/item/staff/staff05.bmp
new file mode 100644
index 0000000000..be9509f368
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff05.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff06.bmp b/crawl-ref/source/rltiles/item/staff/staff06.bmp
new file mode 100644
index 0000000000..4c229c253f
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff06.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff07.bmp b/crawl-ref/source/rltiles/item/staff/staff07.bmp
new file mode 100644
index 0000000000..2d1a334223
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff07.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff08.bmp b/crawl-ref/source/rltiles/item/staff/staff08.bmp
new file mode 100644
index 0000000000..0b83635351
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff08.bmp differ
diff --git a/crawl-ref/source/rltiles/item/staff/staff09.bmp b/crawl-ref/source/rltiles/item/staff/staff09.bmp
new file mode 100644
index 0000000000..7a7ded53b3
Binary files /dev/null and b/crawl-ref/source/rltiles/item/staff/staff09.bmp differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp
deleted file mode 100644
index 3b78d6420e..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_fire.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_fire.bmp
deleted file mode 100644
index 7d2f3b26c1..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_fire.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_ice.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_ice.bmp
deleted file mode 100644
index d2fab495a3..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_ice.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_inaccuracy.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_inaccuracy.bmp
deleted file mode 100644
index 68ec621c9a..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_inaccuracy.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_lightning.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_lightning.bmp
deleted file mode 100644
index 18f03653cd..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_lightning.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp
deleted file mode 100644
index 8da451f276..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp
deleted file mode 100644
index 999b407ecf..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp
deleted file mode 100644
index 2383a1e734..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp
deleted file mode 100644
index 3dd4f6f1d4..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp
deleted file mode 100644
index 38ca50b69b..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp
deleted file mode 100644
index 80b3a65243..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp
deleted file mode 100644
index 6e6fc38e31..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp
deleted file mode 100644
index e08af45efa..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp
deleted file mode 100644
index d2fab495a3..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp
deleted file mode 100644
index 4353a5adee..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp
deleted file mode 100644
index 7ca87f3556..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp
deleted file mode 100644
index 9197c364cb..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp
deleted file mode 100644
index 1a90a29eec..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp
deleted file mode 100644
index 083d4b4eb7..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp
deleted file mode 100644
index 7d2f3b26c1..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp
deleted file mode 100644
index d1db487724..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp
deleted file mode 100644
index 903888d036..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp
deleted file mode 100644
index 3dd4f6f1d4..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp
deleted file mode 100644
index 0cc5642c9c..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff00.bmp b/crawl-ref/source/rltiles/item/wand/staff00.bmp
deleted file mode 100644
index 2c30326f6c..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff00.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff01.bmp b/crawl-ref/source/rltiles/item/wand/staff01.bmp
deleted file mode 100644
index 9182cabba1..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff01.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff02.bmp b/crawl-ref/source/rltiles/item/wand/staff02.bmp
deleted file mode 100644
index 5daca36650..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff02.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff03.bmp b/crawl-ref/source/rltiles/item/wand/staff03.bmp
deleted file mode 100644
index fac426cbba..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff03.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff04.bmp b/crawl-ref/source/rltiles/item/wand/staff04.bmp
deleted file mode 100644
index b27ebd7a5d..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff04.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff05.bmp b/crawl-ref/source/rltiles/item/wand/staff05.bmp
deleted file mode 100644
index be9509f368..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff05.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff06.bmp b/crawl-ref/source/rltiles/item/wand/staff06.bmp
deleted file mode 100644
index 4c560dfe75..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff06.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff07.bmp b/crawl-ref/source/rltiles/item/wand/staff07.bmp
deleted file mode 100644
index fb93320584..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff07.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff08.bmp b/crawl-ref/source/rltiles/item/wand/staff08.bmp
deleted file mode 100644
index 0b83635351..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff08.bmp and /dev/null differ
diff --git a/crawl-ref/source/rltiles/item/wand/staff09.bmp b/crawl-ref/source/rltiles/item/wand/staff09.bmp
deleted file mode 100644
index 7fbe7c27dc..0000000000
Binary files a/crawl-ref/source/rltiles/item/wand/staff09.bmp and /dev/null differ
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index b59feeb8b6..be87bbf29b 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1610,14 +1610,24 @@ int tileidx_item(const item_def &item)
             return TILE_BOOK_PAPYRUS;
 
     case OBJ_STAVES:
-        if (id[ IDTYPE_STAVES ][type] == ID_KNOWN_TYPE
-            ||  (item.flags & ISFLAG_KNOW_TYPE ))
+        if (item_is_rod(item))
         {
-            return TILE_STAFF_WIZARDRY + type;
+            if (id[IDTYPE_STAVES][type] == ID_KNOWN_TYPE
+                ||  (item.flags & ISFLAG_KNOW_TYPE ))
+            {
+                return TILE_ROD_SMITING + type - STAFF_SMITING;
+            }
+            return TILE_ROD_OFFSET + (special / 4) % 10;
+        }
+        else
+        {
+            if (id[IDTYPE_STAVES][type] == ID_KNOWN_TYPE
+                ||  (item.flags & ISFLAG_KNOW_TYPE ))
+            {
+                return TILE_STAFF_WIZARDRY + type;
+            }
+            return TILE_STAFF_OFFSET + (special / 4) % 10;
         }
-        // Try to return an appropriate tile
-        // Note: We really need separate rod and stave tiles...
-        return TILE_STAFF_OFFSET + (special / 4) % 10;
 
     case OBJ_CORPSES:
         if (item.sub_type == CORPSE_SKELETON)
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index 52eca0f79a..109d2485b7 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -2272,12 +2272,22 @@ void TileInitItems()
         ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1);
     }
 
-    for (int i = 0; i < NUM_STAVES; i++)
+    for (int i = 0; i < STAFF_SMITING; i++)
     {
         int special = you.item_description[IDESC_STAVES][i];
         int tile0 = TILE_STAFF_OFFSET + (special / 4) % 10;
         int tile1 = TILE_STAFF_WIZARDRY + i;
 
+        ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1);
+        ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0);
+        ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1);
+    }
+    for (int i = STAFF_SMITING; i < NUM_STAVES; i++)
+    {
+        int special = you.item_description[IDESC_STAVES][i];
+        int tile0 = TILE_ROD_OFFSET + (special / 4) % 10;
+        int tile1 = TILE_ROD_SMITING + i - STAFF_SMITING;
+
         ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1);
         ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0);
         ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1);
-- 
cgit v1.2.3-54-g00ecf