From 84488d2b62b2bb1e16337031edcbee33886e2279 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 21 Nov 2009 19:00:35 -0600 Subject: Change the ETC_KRAKEN color to use tmp_rand. This is so element_colour()'s no_random parameter is taken into account properly. Also, so it divides evenly, add lightmagenta to the list of colors. --- crawl-ref/source/colour.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/colour.cc') diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc index 01c92c66fc..f9cd4ec8de 100644 --- a/crawl-ref/source/colour.cc +++ b/crawl-ref/source/colour.cc @@ -219,8 +219,14 @@ int element_colour( int element, bool no_random ) break; case ETC_KRAKEN: - ret = random_choose(GREEN, LIGHTGREEN, LIGHTCYAN, LIGHTBLUE, RED, - LIGHTRED, MAGENTA, -1); + ret = (tmp_rand < 15) ? GREEN : + (tmp_rand < 30) ? LIGHTGREEN : + (tmp_rand < 45) ? LIGHTCYAN : + (tmp_rand < 60) ? LIGHTBLUE : + (tmp_rand < 75) ? RED : + (tmp_rand < 90) ? LIGHTRED : + (tmp_rand < 105) ? MAGENTA + : LIGHTMAGENTA; break; case ETC_STONE: -- cgit v1.2.3-54-g00ecf