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

49 files changed, 13 insertions, 1 deletions

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/wand/i-rod_demonology.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_demonology.bmp
index 3b78d6420e..3b78d6420e 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_demonology.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_demonology.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_fire.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_fire.bmp
index 7d2f3b26c1..7d2f3b26c1 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_fire.bmp
+++ b/crawl-ref/source/rltiles/item/rod/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/rod/i-rod_destruction_ice.bmp
index d2fab495a3..d2fab495a3 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_ice.bmp
+++ b/crawl-ref/source/rltiles/item/rod/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/rod/i-rod_destruction_inaccuracy.bmp
index 68ec621c9a..68ec621c9a 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_inaccuracy.bmp
+++ b/crawl-ref/source/rltiles/item/rod/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/rod/i-rod_destruction_lightning.bmp
index 18f03653cd..18f03653cd 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_destruction_lightning.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_destruction_lightning.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_discovery.bmp
index 8da451f276..8da451f276 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_discovery.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_discovery.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_smiting.bmp
index 999b407ecf..999b407ecf 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_smiting.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_smiting.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_striking.bmp
index 2383a1e734..2383a1e734 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_striking.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_striking.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_summoning.bmp
index 3dd4f6f1d4..3dd4f6f1d4 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_summoning.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_summoning.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_venom.bmp
index 38ca50b69b..38ca50b69b 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_venom.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_venom.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp b/crawl-ref/source/rltiles/item/rod/i-rod_warding.bmp
index 80b3a65243..80b3a65243 100644
--- a/crawl-ref/source/rltiles/item/wand/i-rod_warding.bmp
+++ b/crawl-ref/source/rltiles/item/rod/i-rod_warding.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod00.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod01.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod02.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod03.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod04.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod05.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff09.bmp b/crawl-ref/source/rltiles/item/rod/rod06.bmp
index 7fbe7c27dc..22ff89c0bd 100644
--- a/crawl-ref/source/rltiles/item/wand/staff09.bmp
+++ b/crawl-ref/source/rltiles/item/rod/rod06.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod07.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod08.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/rod/rod09.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_air.bmp
index 6e6fc38e31..6e6fc38e31 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_air.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_air.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_channeling.bmp
index e08af45efa..e08af45efa 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_channeling.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_channeling.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_cold.bmp
index d2fab495a3..d2fab495a3 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_cold.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_cold.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_conjuration.bmp
index 4353a5adee..4353a5adee 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_conjuration.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_conjuration.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_death.bmp
index 7ca87f3556..7ca87f3556 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_death.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_death.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_earth.bmp
index 9197c364cb..9197c364cb 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_earth.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_earth.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_enchantment.bmp
index 1a90a29eec..1a90a29eec 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_enchantment.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_enchantment.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_energy.bmp
index 083d4b4eb7..083d4b4eb7 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_energy.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_energy.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_fire.bmp
index 7d2f3b26c1..7d2f3b26c1 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_fire.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_fire.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_poison.bmp
index d1db487724..d1db487724 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_poison.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_poison.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_power.bmp
index 903888d036..903888d036 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_power.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_power.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_summoning.bmp
index 3dd4f6f1d4..3dd4f6f1d4 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_summoning.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_summoning.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp b/crawl-ref/source/rltiles/item/staff/i-staff_wizardry.bmp
index 0cc5642c9c..0cc5642c9c 100644
--- a/crawl-ref/source/rltiles/item/wand/i-staff_wizardry.bmp
+++ b/crawl-ref/source/rltiles/item/staff/i-staff_wizardry.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff00.bmp b/crawl-ref/source/rltiles/item/staff/staff00.bmp
index 2c30326f6c..2c30326f6c 100644
--- a/crawl-ref/source/rltiles/item/wand/staff00.bmp
+++ b/crawl-ref/source/rltiles/item/staff/staff00.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff04.bmp b/crawl-ref/source/rltiles/item/staff/staff01.bmp
index b27ebd7a5d..b27ebd7a5d 100644
--- a/crawl-ref/source/rltiles/item/wand/staff04.bmp
+++ b/crawl-ref/source/rltiles/item/staff/staff01.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/staff/staff02.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff03.bmp b/crawl-ref/source/rltiles/item/staff/staff03.bmp
index fac426cbba..fac426cbba 100644
--- a/crawl-ref/source/rltiles/item/wand/staff03.bmp
+++ b/crawl-ref/source/rltiles/item/staff/staff03.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/staff/staff04.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff05.bmp b/crawl-ref/source/rltiles/item/staff/staff05.bmp
index be9509f368..be9509f368 100644
--- a/crawl-ref/source/rltiles/item/wand/staff05.bmp
+++ b/crawl-ref/source/rltiles/item/staff/staff05.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/staff/staff06.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/staff/staff07.bmp
diff --git a/crawl-ref/source/rltiles/item/wand/staff08.bmp b/crawl-ref/source/rltiles/item/staff/staff08.bmp
index 0b83635351..0b83635351 100644
--- a/crawl-ref/source/rltiles/item/wand/staff08.bmp
+++ b/crawl-ref/source/rltiles/item/staff/staff08.bmp
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
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/staff/staff09.bmp
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
--- a/crawl-ref/source/rltiles/item/wand/staff01.bmp
+++ /dev/null
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
--- a/crawl-ref/source/rltiles/item/wand/staff02.bmp
+++ /dev/null
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
--- a/crawl-ref/source/rltiles/item/wand/staff06.bmp
+++ /dev/null
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
--- a/crawl-ref/source/rltiles/item/wand/staff07.bmp
+++ /dev/null