diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-08 18:00:00 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-08 18:00:00 +0000 |
commit | 55826a15202764602ab3ad81cdeb3dd37ee9cb0b (patch) | |
tree | 7bce0cf8c398cff337f15f7a99d24ab90b395b8f | |
parent | d4cca63a59edcd85a58c9ccaf4eaaff476b25e7e (diff) | |
download | crawl-ref-55826a15202764602ab3ad81cdeb3dd37ee9cb0b.tar.gz crawl-ref-55826a15202764602ab3ad81cdeb3dd37ee9cb0b.zip |
Removed spoily colours for "runed" randarts. They now have
normal item appearance depending on item type.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1274 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/dungeon.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 5b39faa997..a1aa225703 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -6517,8 +6517,14 @@ static int exciting_colour() static int newwave_weapon_colour(const item_def &item) { int item_colour = BLACK; - // unrandom artefacts get predefined colours - if ( is_random_artefact(item) ) + // fixed artefacts get predefined colours + + char *itname = (char*) item_name( item, DESC_PLAIN ); + char *item_runed = strstr( strlwr(itname), strlwr((char*) "runed") ); + char *heav_runed = strstr( strlwr(itname), strlwr((char*) "heavily") ); + + if ( is_random_artefact(item) && + (item_runed == NULL || heav_runed != NULL) ) return exciting_colour(); if (is_range_weapon( item )) @@ -6835,7 +6841,8 @@ void item_colour( item_def &item ) else item.colour = weapon_colour(item); - if (is_random_artefact( item ) && one_chance_in(5)) + if (is_random_artefact( item ) && one_chance_in(5) + && Options.classic_item_colours) item.colour = random_colour(); break; |