diff options
16 files changed, 38 insertions, 9 deletions
diff --git a/crawl-ref/source/rltiles/dc-pl.txt b/crawl-ref/source/rltiles/dc-pl.txt index 66f00dc4b4..28e02ecd72 100644 --- a/crawl-ref/source/rltiles/dc-pl.txt +++ b/crawl-ref/source/rltiles/dc-pl.txt @@ -502,22 +502,41 @@ voodoo VOODOO finisher FINISHER
## staves
-staff_skull STAFF_SKULL
+# These 10 staves correspond to the same order as item/staff/
+staff_large STAFF_LARGE
+great_staff GREAT_STAFF
staff_mage STAFF_MAGE
staff_mage2 STAFF_MAGE2
-great_staff GREAT_STAFF
+staff_plain STAFF_PLAIN
+staff_organic STAFF_ORGANIC
+staff_skull STAFF_SKULL
+staff_sceptre STAFF_SCEPTRE
+staff_ruby STAFF_RUBY
+staff_fancy STAFF_FANCY
+
staff_evil STAFF_EVIL
staff_ring_blue STAFF_RING_BLUE
staff_mummy STAFF_MUMMY
staff_fork STAFF_FORK
-staff_ruby STAFF_RUBY
-staff_large STAFF_LARGE
elemental_staff ELEMENTAL_STAFF
asmodeus ASMODEUS
dispater DISPATER
olgreb OLGREB
+## rods
+# These 10 rods correspond to the same order as item/rod/
+rod_brown ROD_BROWN
+rod_moon ROD_MOON
+rod_aries ROD_ARIES
+rod_blue ROD_BLUE
+rod_magenta ROD_MAGENTA
+rod_hammer ROD_HAMMER
+rod_thick ROD_THICK
+rod_ruby ROD_RUBY
+rod_forked ROD_FORKED
+rod_emerald ROD_EMERALD
+
## axes
axe_small AXE_SMALL
hand_axe HAND_AXE
diff --git a/crawl-ref/source/rltiles/player/hand1/rod_aries.bmp b/crawl-ref/source/rltiles/player/hand1/rod_aries.bmp Binary files differnew file mode 100644 index 0000000000..183f1a76bd --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_aries.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_blue.bmp b/crawl-ref/source/rltiles/player/hand1/rod_blue.bmp Binary files differnew file mode 100644 index 0000000000..59373c62de --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_blue.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_brown.bmp b/crawl-ref/source/rltiles/player/hand1/rod_brown.bmp Binary files differnew file mode 100644 index 0000000000..8243f7be30 --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_brown.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_emerald.bmp b/crawl-ref/source/rltiles/player/hand1/rod_emerald.bmp Binary files differnew file mode 100644 index 0000000000..d20f914707 --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_emerald.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_forked.bmp b/crawl-ref/source/rltiles/player/hand1/rod_forked.bmp Binary files differnew file mode 100644 index 0000000000..c7713edd3b --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_forked.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_hammer.bmp b/crawl-ref/source/rltiles/player/hand1/rod_hammer.bmp Binary files differnew file mode 100644 index 0000000000..fc1af0060e --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_hammer.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_magenta.bmp b/crawl-ref/source/rltiles/player/hand1/rod_magenta.bmp Binary files differnew file mode 100644 index 0000000000..91b40999b9 --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_magenta.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_moon.bmp b/crawl-ref/source/rltiles/player/hand1/rod_moon.bmp Binary files differnew file mode 100644 index 0000000000..f71b43e243 --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_moon.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_ruby.bmp b/crawl-ref/source/rltiles/player/hand1/rod_ruby.bmp Binary files differnew file mode 100644 index 0000000000..3c7365190d --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_ruby.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/rod_thick.bmp b/crawl-ref/source/rltiles/player/hand1/rod_thick.bmp Binary files differnew file mode 100644 index 0000000000..4f9b9753b6 --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/rod_thick.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/staff_fancy.bmp b/crawl-ref/source/rltiles/player/hand1/staff_fancy.bmp Binary files differnew file mode 100644 index 0000000000..b0be0cd18e --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/staff_fancy.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/staff_organic.bmp b/crawl-ref/source/rltiles/player/hand1/staff_organic.bmp Binary files differnew file mode 100644 index 0000000000..9ecdab350f --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/staff_organic.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/staff_plain.bmp b/crawl-ref/source/rltiles/player/hand1/staff_plain.bmp Binary files differnew file mode 100644 index 0000000000..fb67c72c0d --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/staff_plain.bmp diff --git a/crawl-ref/source/rltiles/player/hand1/staff_sceptre.bmp b/crawl-ref/source/rltiles/player/hand1/staff_sceptre.bmp Binary files differnew file mode 100644 index 0000000000..500a6a7d54 --- /dev/null +++ b/crawl-ref/source/rltiles/player/hand1/staff_sceptre.bmp 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) { |
