summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tile1.cc
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-03 13:33:08 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-03 13:33:08 +0000
commit94fc8284e019e8157bb8862a0429be6060adae27 (patch)
tree0a9c65e794b91cddb8bb0bff612351a90e3e6804 /crawl-ref/source/tile1.cc
parent5c43b114a2f8e76a27852e1596e89255dbcaa96a (diff)
downloadcrawl-ref-94fc8284e019e8157bb8862a0429be6060adae27.tar.gz
crawl-ref-94fc8284e019e8157bb8862a0429be6060adae27.zip
Adding more staff and rod art for when players equip those items.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3509 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile1.cc')
-rw-r--r--crawl-ref/source/tile1.cc20
1 files changed, 15 insertions, 5 deletions
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index be87bbf29b..02eb45f9d6 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -2535,7 +2535,7 @@ void tilep_job_default(int job, int gender, int *parts)
case JOB_TRANSMUTER:
parts[TILEP_PART_BODY]= TILEP_BODY_ROBE_RAINBOW;
- parts[TILEP_PART_HAND1]= TILEP_HAND1_STAFF_MAGE;
+ parts[TILEP_PART_HAND1]= TILEP_HAND1_STAFF_RUBY;
parts[TILEP_PART_HAND2]= TILEP_HAND2_BOOK_MAGENTA_DIM;
parts[TILEP_PART_BOOTS] = TILEP_BOOTS_SHORT_BROWN;
break;
@@ -2543,7 +2543,7 @@ void tilep_job_default(int job, int gender, int *parts)
case JOB_CONJURER:
parts[TILEP_PART_BODY]= TILEP_BODY_ROBE_MAGENTA;
parts[TILEP_PART_HELM] = TILEP_HELM_GANDALF;
- parts[TILEP_PART_HAND1]= TILEP_HAND1_STAFF_MAGE;
+ parts[TILEP_PART_HAND1]= TILEP_HAND1_STAFF_MAGE2;
parts[TILEP_PART_HAND2]= TILEP_HAND2_BOOK_RED_DIM;
parts[TILEP_PART_BOOTS] = TILEP_BOOTS_SHORT_BROWN;
break;
@@ -2559,7 +2559,7 @@ void tilep_job_default(int job, int gender, int *parts)
case JOB_SUMMONER:
parts[TILEP_PART_BODY]= TILEP_BODY_ROBE_BROWN;
parts[TILEP_PART_HELM] = TILEP_HELM_GANDALF;
- parts[TILEP_PART_HAND1]= TILEP_HAND1_STAFF_MAGE;
+ parts[TILEP_PART_HAND1]= TILEP_HAND1_STAFF_RING_BLUE;
parts[TILEP_PART_HAND2]= TILEP_HAND2_BOOK_YELLOW_DIM;
parts[TILEP_PART_BOOTS] = TILEP_BOOTS_SHORT_BROWN;
break;
@@ -2741,9 +2741,19 @@ void tilep_print_parts(char *fbuf, int *parts)
*/
int tilep_equ_weapon(const item_def &item)
{
- if (item.base_type == OBJ_STAVES) return TILEP_HAND1_STAFF_MAGE;
+ if (item.base_type == OBJ_STAVES)
+ {
+ if (item_is_rod(item))
+ {
+ return TILEP_HAND1_ROD_BROWN + (item.special / 4) % 10;
+ }
+ else
+ {
+ return TILEP_HAND1_STAFF_LARGE + (item.special / 4) % 10;
+ }
+ }
- if (item.base_type ==OBJ_MISCELLANY)
+ if (item.base_type == OBJ_MISCELLANY)
{
switch(item.sub_type)
{