diff options
| -rw-r--r-- | crawl-ref/source/colour.cc | 14 | ||||
| -rw-r--r-- | crawl-ref/source/colour.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc index 9bca86e7de..01c92c66fc 100644 --- a/crawl-ref/source/colour.cc +++ b/crawl-ref/source/colour.cc @@ -3,7 +3,6 @@ #include "colour.h" #include "env.h" -#include "mon-util.h" #include "options.h" #include "player.h" #include "random.h" @@ -224,13 +223,6 @@ int element_colour( int element, bool no_random ) LIGHTRED, MAGENTA, -1); break; - case ETC_UGLY: - case ETC_VERY_UGLY: - ret = ugly_thing_random_colour(); - ret = (element == ETC_VERY_UGLY) ? make_high_colour(ret) - : make_low_colour(ret); - break; - case ETC_STONE: if (player_in_branch(BRANCH_HALL_OF_ZOT)) ret = env.rock_colour; @@ -345,9 +337,9 @@ int str_to_colour( const std::string &str, int default_colour, "magic", "mutagenic", "warp", "enchant", "heal", "holy", "dark", "death", "necro", "unholy", "vehumet", "beogh", "crystal", "blood", "smoke", "slime", "jewel", "elven", "dwarven", - "orcish", "gila", "kraken", "ugly", "very_ugly", "floor", - "rock", "stone", "mist", "shimmer_blue", "decay", "silver", - "gold", "iron", "bone", "random" + "orcish", "gila", "kraken", "floor", "rock", "stone", "mist", + "shimmer_blue", "decay", "silver", "gold", "iron", "bone", + "random" }; ASSERT(ARRAYSZ(element_cols) == (ETC_RANDOM - ETC_FIRE) + 1); diff --git a/crawl-ref/source/colour.h b/crawl-ref/source/colour.h index c13aa973df..72af088c57 100644 --- a/crawl-ref/source/colour.h +++ b/crawl-ref/source/colour.h @@ -35,8 +35,6 @@ enum element_type ETC_ORCISH, // used for colouring orc fabric items ETC_GILA, // gila monster colours ETC_KRAKEN, // kraken colours - ETC_UGLY, // random ugly thing colours - ETC_VERY_UGLY, // random very ugly thing colours ETC_FLOOR, // colour of the area's floor ETC_ROCK, // colour of the area's rock ETC_STONE, // colour of the area's stone diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 1e94f3af0a..3af0cf03a5 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -755,7 +755,7 @@ void item_colour(item_def &item) {ETC_EARTH, ETC_ELECTRICITY, ETC_ENCHANT, ETC_HEAL, ETC_BLOOD, ETC_DEATH, ETC_UNHOLY, ETC_VEHUMET, ETC_BEOGH, ETC_CRYSTAL, ETC_SMOKE, ETC_DWARVEN, ETC_ORCISH, ETC_GILA, - ETC_KRAKEN, ETC_UGLY, ETC_VERY_UGLY}; + ETC_KRAKEN}; item.colour = RANDOM_ELEMENT(types); break; |