Adding icons (from Denzi) for identified staves and rods, now that identical staff types share the same description.

Removing old Nethack item tiles.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3425 c06c8d41-db1a-0410-9941-cceddc491573

102 files changed, 48 insertions, 10 deletions

diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 6cfb5345a7..b4c83ed738 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -374,9 +374,9 @@ bone FOOD_BONE
 #################OBJ_UNKNOWN_I

 ##################OBJ_SCROLLS

 %sdir item/scroll

-kernod_wel SCROLL

+scroll SCROLL

 

-%back kernod_wel

+%back scroll

 %sdir item/scroll

 i-identify SCR_IDENTIFY

 i-teleportation SCR_TELEPORTATION

@@ -572,6 +572,32 @@ staff07
 staff08

 staff09

 

+i-staff_wizardry STAFF_WIZARDRY

+i-staff_power STAFF_POWER

+i-staff_fire STAFF_FIRE

+i-staff_cold STAFF_COLD

+i-staff_poison STAFF_POISON

+i-staff_energy STAFF_ENERGY

+i-staff_death STAFF_DEATH

+i-staff_conjuration STAFF_CONJURATION

+i-staff_enchantment STAFF_ENCHANTMENT

+i-staff_summoning STAFF_SUMMONING

+i-staff_air STAFF_AIR

+i-staff_earth STAFF_EARTH

+i-staff_channeling STAFF_CHANNELING

+

+i-rod_smiting ROD_SMITING

+i-rod_summoning ROD_SUMMONING

+i-rod_destruction_fire ROD_DESTRUCTION_FIRE

+i-rod_destruction_ice ROD_DESTRUCTION_ICE

+i-rod_destruction_lightning ROD_DESTRUCTION_LIGHTNING

+i-rod_destruction_inaccuracy ROD_DESTRUCTION_INACCURACY

+i-rod_warding ROD_WARDING

+i-rod_discovery ROD_DISCOVERY

+i-rod_demonology ROD_DEMONOLOGY

+i-rod_striking ROD_STRIKING

+i-rod_venom ROD_VENOM

+

 #OBJ_ORBS

 %sdir item/misc

 misc_orb ORB

diff --git a/crawl-ref/source/rltiles/item/amulet/circular.bmp b/crawl-ref/source/rltiles/item/amulet/circular.bmp
deleted file mode 100644
index 9aae0d67f0..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/circular.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/concave.bmp b/crawl-ref/source/rltiles/item/amulet/concave.bmp
deleted file mode 100644
index af97523a9d..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/concave.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/hexagonal.bmp b/crawl-ref/source/rltiles/item/amulet/hexagonal.bmp
deleted file mode 100644
index f74134785b..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/hexagonal.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/octagonal.bmp b/crawl-ref/source/rltiles/item/amulet/octagonal.bmp
deleted file mode 100644
index 0066227319..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/octagonal.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/oval.bmp b/crawl-ref/source/rltiles/item/amulet/oval.bmp
deleted file mode 100644
index 87c42b4d4d..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/oval.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/pyramidal.bmp b/crawl-ref/source/rltiles/item/amulet/pyramidal.bmp
deleted file mode 100644
index 757bf10ed3..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/pyramidal.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/spherical.bmp b/crawl-ref/source/rltiles/item/amulet/spherical.bmp
deleted file mode 100644
index 48354d694f..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/spherical.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/square.bmp b/crawl-ref/source/rltiles/item/amulet/square.bmp
deleted file mode 100644
index fa8752351c..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/square.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/amulet/triangular.bmp b/crawl-ref/source/rltiles/item/amulet/triangular.bmp
deleted file mode 100644
index 4aeb4470e5..0000000000
--- a/crawl-ref/source/rltiles/item/amulet/triangular.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/blank_paper.bmp b/crawl-ref/source/rltiles/item/book/blank_paper.bmp
deleted file mode 100644
index 8f238611e2..0000000000
--- a/crawl-ref/source/rltiles/item/book/blank_paper.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/dull.bmp b/crawl-ref/source/rltiles/item/book/dull.bmp
deleted file mode 100644
index 20cd183cd9..0000000000
--- a/crawl-ref/source/rltiles/item/book/dull.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/dusty.bmp b/crawl-ref/source/rltiles/item/book/dusty.bmp
deleted file mode 100644
index b308f89651..0000000000
--- a/crawl-ref/source/rltiles/item/book/dusty.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/mottled.bmp b/crawl-ref/source/rltiles/item/book/mottled.bmp
deleted file mode 100644
index 32b39ed36a..0000000000
--- a/crawl-ref/source/rltiles/item/book/mottled.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/ragged.bmp b/crawl-ref/source/rltiles/item/book/ragged.bmp
deleted file mode 100644
index 4165d94ebc..0000000000
--- a/crawl-ref/source/rltiles/item/book/ragged.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/shining.bmp b/crawl-ref/source/rltiles/item/book/shining.bmp
deleted file mode 100644
index 89760bb44d..0000000000
--- a/crawl-ref/source/rltiles/item/book/shining.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/stained.bmp b/crawl-ref/source/rltiles/item/book/stained.bmp
deleted file mode 100644
index 00320c074e..0000000000
--- a/crawl-ref/source/rltiles/item/book/stained.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/thick.bmp b/crawl-ref/source/rltiles/item/book/thick.bmp
deleted file mode 100644
index d095611f3e..0000000000
--- a/crawl-ref/source/rltiles/item/book/thick.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/book/thin.bmp b/crawl-ref/source/rltiles/item/book/thin.bmp
deleted file mode 100644
index a13cc5d249..0000000000
--- a/crawl-ref/source/rltiles/item/book/thin.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/c_ration.bmp b/crawl-ref/source/rltiles/item/food/c_ration.bmp
deleted file mode 100644
index 116df9dc80..0000000000
--- a/crawl-ref/source/rltiles/item/food/c_ration.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/candy_bar.bmp b/crawl-ref/source/rltiles/item/food/candy_bar.bmp
deleted file mode 100644
index 620d7e2cdf..0000000000
--- a/crawl-ref/source/rltiles/item/food/candy_bar.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/cram_ration.bmp b/crawl-ref/source/rltiles/item/food/cram_ration.bmp
deleted file mode 100644
index 20d2d2d028..0000000000
--- a/crawl-ref/source/rltiles/item/food/cram_ration.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/cream_pie.bmp b/crawl-ref/source/rltiles/item/food/cream_pie.bmp
deleted file mode 100644
index a288555ca8..0000000000
--- a/crawl-ref/source/rltiles/item/food/cream_pie.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/egg.bmp b/crawl-ref/source/rltiles/item/food/egg.bmp
deleted file mode 100644
index 4390c1a974..0000000000
--- a/crawl-ref/source/rltiles/item/food/egg.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/eucalyptus_leaf.bmp b/crawl-ref/source/rltiles/item/food/eucalyptus_leaf.bmp
deleted file mode 100644
index b1c60db9f3..0000000000
--- a/crawl-ref/source/rltiles/item/food/eucalyptus_leaf.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/food_ration.bmp b/crawl-ref/source/rltiles/item/food/food_ration.bmp
deleted file mode 100644
index 3842312aee..0000000000
--- a/crawl-ref/source/rltiles/item/food/food_ration.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/fortune_cookie.bmp b/crawl-ref/source/rltiles/item/food/fortune_cookie.bmp
deleted file mode 100644
index 718644cd96..0000000000
--- a/crawl-ref/source/rltiles/item/food/fortune_cookie.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/k_ration.bmp b/crawl-ref/source/rltiles/item/food/k_ration.bmp
deleted file mode 100644
index cb3910e330..0000000000
--- a/crawl-ref/source/rltiles/item/food/k_ration.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/kelp_frond.bmp b/crawl-ref/source/rltiles/item/food/kelp_frond.bmp
deleted file mode 100644
index c4091709c7..0000000000
--- a/crawl-ref/source/rltiles/item/food/kelp_frond.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/lembas_wafer.bmp b/crawl-ref/source/rltiles/item/food/lembas_wafer.bmp
deleted file mode 100644
index b06c8a706c..0000000000
--- a/crawl-ref/source/rltiles/item/food/lembas_wafer.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/meat_ring.bmp b/crawl-ref/source/rltiles/item/food/meat_ring.bmp
deleted file mode 100644
index 1b1c5171ef..0000000000
--- a/crawl-ref/source/rltiles/item/food/meat_ring.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/meat_stick.bmp b/crawl-ref/source/rltiles/item/food/meat_stick.bmp
deleted file mode 100644
index 8e086dfbaf..0000000000
--- a/crawl-ref/source/rltiles/item/food/meat_stick.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/meatball.bmp b/crawl-ref/source/rltiles/item/food/meatball.bmp
deleted file mode 100644
index 74a9fcd621..0000000000
--- a/crawl-ref/source/rltiles/item/food/meatball.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/melon.bmp b/crawl-ref/source/rltiles/item/food/melon.bmp
deleted file mode 100644
index 5fd0cd303f..0000000000
--- a/crawl-ref/source/rltiles/item/food/melon.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/pancake.bmp b/crawl-ref/source/rltiles/item/food/pancake.bmp
deleted file mode 100644
index 0be43865f5..0000000000
--- a/crawl-ref/source/rltiles/item/food/pancake.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/slime_mold.bmp b/crawl-ref/source/rltiles/item/food/slime_mold.bmp
deleted file mode 100644
index ee4ebf2c9f..0000000000
--- a/crawl-ref/source/rltiles/item/food/slime_mold.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/sprig_of_wolfsbane.bmp b/crawl-ref/source/rltiles/item/food/sprig_of_wolfsbane.bmp
deleted file mode 100644
index 89f12142f1..0000000000
--- a/crawl-ref/source/rltiles/item/food/sprig_of_wolfsbane.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/food/tin.bmp b/crawl-ref/source/rltiles/item/food/tin.bmp
deleted file mode 100644
index 04ad785e73..0000000000
--- a/crawl-ref/source/rltiles/item/food/tin.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/black.bmp b/crawl-ref/source/rltiles/item/gem/black.bmp
deleted file mode 100644
index a9a8938e47..0000000000
--- a/crawl-ref/source/rltiles/item/gem/black.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/blue.bmp b/crawl-ref/source/rltiles/item/gem/blue.bmp
deleted file mode 100644
index a1a7d267ed..0000000000
--- a/crawl-ref/source/rltiles/item/gem/blue.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/boulder.bmp b/crawl-ref/source/rltiles/item/gem/boulder.bmp
deleted file mode 100644
index fa9507ceeb..0000000000
--- a/crawl-ref/source/rltiles/item/gem/boulder.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/green.bmp b/crawl-ref/source/rltiles/item/gem/green.bmp
deleted file mode 100644
index a3da7901bb..0000000000
--- a/crawl-ref/source/rltiles/item/gem/green.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/orange.bmp b/crawl-ref/source/rltiles/item/gem/orange.bmp
deleted file mode 100644
index 7e65a6de80..0000000000
--- a/crawl-ref/source/rltiles/item/gem/orange.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/red.bmp b/crawl-ref/source/rltiles/item/gem/red.bmp
deleted file mode 100644
index 986b8458d4..0000000000
--- a/crawl-ref/source/rltiles/item/gem/red.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/violet.bmp b/crawl-ref/source/rltiles/item/gem/violet.bmp
deleted file mode 100644
index c3222fee85..0000000000
--- a/crawl-ref/source/rltiles/item/gem/violet.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/white.bmp b/crawl-ref/source/rltiles/item/gem/white.bmp
deleted file mode 100644
index dc18e711b1..0000000000
--- a/crawl-ref/source/rltiles/item/gem/white.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/yellow.bmp b/crawl-ref/source/rltiles/item/gem/yellow.bmp
deleted file mode 100644
index 55490c3f1b..0000000000
--- a/crawl-ref/source/rltiles/item/gem/yellow.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/gem/yellowish_brown.bmp b/crawl-ref/source/rltiles/item/gem/yellowish_brown.bmp
deleted file mode 100644
index 6371365215..0000000000
--- a/crawl-ref/source/rltiles/item/gem/yellowish_brown.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/daiyen_fooels.bmp b/crawl-ref/source/rltiles/item/scroll/daiyen_fooels.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/daiyen_fooels.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/duam_xnaht.bmp b/crawl-ref/source/rltiles/item/scroll/duam_xnaht.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/duam_xnaht.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/elam_ebow.bmp b/crawl-ref/source/rltiles/item/scroll/elam_ebow.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/elam_ebow.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/elbib_yloh.bmp b/crawl-ref/source/rltiles/item/scroll/elbib_yloh.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/elbib_yloh.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/foobie_bletch.bmp b/crawl-ref/source/rltiles/item/scroll/foobie_bletch.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/foobie_bletch.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/garven_deh.bmp b/crawl-ref/source/rltiles/item/scroll/garven_deh.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/garven_deh.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/hackem_muche.bmp b/crawl-ref/source/rltiles/item/scroll/hackem_muche.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/hackem_muche.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/juyed_awk_yacc.bmp b/crawl-ref/source/rltiles/item/scroll/juyed_awk_yacc.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/juyed_awk_yacc.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/kernod_wel.bmp b/crawl-ref/source/rltiles/item/scroll/kernod_wel.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/kernod_wel.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/kirje.bmp b/crawl-ref/source/rltiles/item/scroll/kirje.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/kirje.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/lep_gex_ven_zea.bmp b/crawl-ref/source/rltiles/item/scroll/lep_gex_ven_zea.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/lep_gex_ven_zea.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/mail.bmp b/crawl-ref/source/rltiles/item/scroll/mail.bmp
deleted file mode 100644
index f4cd4c2c4c..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/mail.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/nr_9.bmp b/crawl-ref/source/rltiles/item/scroll/nr_9.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/nr_9.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/pratyavayah.bmp b/crawl-ref/source/rltiles/item/scroll/pratyavayah.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/pratyavayah.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/prirutsenie.bmp b/crawl-ref/source/rltiles/item/scroll/prirutsenie.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/prirutsenie.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/read_me.bmp b/crawl-ref/source/rltiles/item/scroll/read_me.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/read_me.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/andova_begarin.bmp b/crawl-ref/source/rltiles/item/scroll/scroll.bmp
index 5f5b7c284d..5f5b7c284d 100644
--- a/crawl-ref/source/rltiles/item/scroll/andova_begarin.bmp
+++ b/crawl-ref/source/rltiles/item/scroll/scroll.bmp
diff --git a/crawl-ref/source/rltiles/item/scroll/temov.bmp b/crawl-ref/source/rltiles/item/scroll/temov.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/temov.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/tharr.bmp b/crawl-ref/source/rltiles/item/scroll/tharr.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/tharr.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/ve_forbryderne.bmp b/crawl-ref/source/rltiles/item/scroll/ve_forbryderne.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/ve_forbryderne.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/velox_neb.bmp b/crawl-ref/source/rltiles/item/scroll/velox_neb.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/velox_neb.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/venzar_borgavve.bmp b/crawl-ref/source/rltiles/item/scroll/venzar_borgavve.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/venzar_borgavve.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/verr_yed_horre.bmp b/crawl-ref/source/rltiles/item/scroll/verr_yed_horre.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/verr_yed_horre.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/xixaxa_xoxaxa_xuxaxa.bmp b/crawl-ref/source/rltiles/item/scroll/xixaxa_xoxaxa_xuxaxa.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/xixaxa_xoxaxa_xuxaxa.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/yum_yum.bmp b/crawl-ref/source/rltiles/item/scroll/yum_yum.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/yum_yum.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/scroll/zelgo_mer.bmp b/crawl-ref/source/rltiles/item/scroll/zelgo_mer.bmp
deleted file mode 100644
index 5f5b7c284d..0000000000
--- a/crawl-ref/source/rltiles/item/scroll/zelgo_mer.bmp
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp
new file mode 100644
index 0000000000..3b78d6420e
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp
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
new file mode 100644
index 0000000000..7d2f3b26c1
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_fire.bmp
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
new file mode 100644
index 0000000000..d2fab495a3
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_ice.bmp
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
new file mode 100644
index 0000000000..68ec621c9a
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_inaccuracy.bmp
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
new file mode 100644
index 0000000000..18f03653cd
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_destruction_lightning.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp
new file mode 100644
index 0000000000..8da451f276
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp
new file mode 100644
index 0000000000..999b407ecf
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp
new file mode 100644
index 0000000000..2383a1e734
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp
new file mode 100644
index 0000000000..3dd4f6f1d4
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp
new file mode 100644
index 0000000000..38ca50b69b
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp b/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp
new file mode 100644
index 0000000000..80b3a65243
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp
new file mode 100644
index 0000000000..6e6fc38e31
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp
new file mode 100644
index 0000000000..e08af45efa
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp
new file mode 100644
index 0000000000..d2fab495a3
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp
new file mode 100644
index 0000000000..4353a5adee
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp
new file mode 100644
index 0000000000..7ca87f3556
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp
new file mode 100644
index 0000000000..9197c364cb
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp
new file mode 100644
index 0000000000..1a90a29eec
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp
new file mode 100644
index 0000000000..083d4b4eb7
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp
new file mode 100644
index 0000000000..7d2f3b26c1
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp
new file mode 100644
index 0000000000..d1db487724
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp
new file mode 100644
index 0000000000..903888d036
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp
new file mode 100644
index 0000000000..3dd4f6f1d4
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp b/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp
new file mode 100644
index 0000000000..0cc5642c9c
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff02.bmp b/crawl-ref/source/rltiles/item/wand/staff02.bmp
index c7dda61fb7..5daca36650 100644
--- a/crawl-ref/source/rltiles/item/wand/staff02.bmp
+++ b/crawl-ref/source/rltiles/item/wand/staff02.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff05.bmp b/crawl-ref/source/rltiles/item/wand/staff05.bmp
index fd33330424..be9509f368 100644
--- a/crawl-ref/source/rltiles/item/wand/staff05.bmp
+++ b/crawl-ref/source/rltiles/item/wand/staff05.bmp
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index cdf12cdf45..8a45e437cc 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1611,12 +1611,13 @@ 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 ))
+            ||  (item.flags & ISFLAG_KNOW_TYPE ))
+        {
             return TILE_STAFF_WIZARDRY + type;
-*/
-        // try to return an appropriate tile
+        }
+        // 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:
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index 2228dccd1e..70005427a9 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -2251,7 +2251,7 @@ void TileGhostInit(const struct ghost_demon &ghost)
 
 void TileInitItems()
 {
-    for(int i=0; i<NUM_POTIONS; i++)
+    for (int i = 0; i < NUM_POTIONS; i++)
     {
         int special = you.item_description[IDESC_POTIONS][i];
         int tile0 = TILE_POTION_OFFSET + special % 14;
@@ -2259,10 +2259,10 @@ void TileInitItems()
 
         ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1);
         ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0);
-        ImgCopyToTileImg  (tile1, DollCacheImg, 0, 0, 1);
+        ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1);
     }
 
-    for(int i=0; i<NUM_WANDS; i++)
+    for (int i = 0; i < NUM_WANDS; i++)
     {
         int special = you.item_description[IDESC_WANDS][i];
         int tile0 = TILE_WAND_OFFSET + special % 12;
@@ -2270,7 +2270,18 @@ void TileInitItems()
 
         ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1);
         ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0);
-        ImgCopyToTileImg  (tile1, DollCacheImg, 0, 0, 1);
+        ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1);
+    }
+
+    for (int i = 0; i < NUM_STAVES; 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);
     }
 }