From 654c71f66f50572dc470c6412d40078a6e131ea0 Mon Sep 17 00:00:00 2001
From: Brendan Hickey <brendan@bhickey.net>
Date: Wed, 26 Sep 2012 19:23:26 -0700
Subject: [PATCH] Abominations are red

Free up other colours for other X's and x's.
---
 crawl-ref/source/mon-data.h  |    7 ++-----
 crawl-ref/source/mon-util.cc |   30 ------------------------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 88698cf..75a0828 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2240,12 +2240,10 @@ static monsterentry mondata[] = {
 },
 
 {
-    // Coloured with mon-util.cc:random_small_abomination_colour.
-
     // A demonically controlled mass of undead flesh theme-wise, this makes
     // them MH_DEMONIC|MH_UNDEAD, but this is mostly the same as just
     // MH_UNDEAD (save for some god interactions).
-    MONS_ABOMINATION_SMALL, 'x', BLACK, "small abomination",
+    MONS_ABOMINATION_SMALL, 'x', RED, "small abomination",
     M_NO_FLAGS,
     MR_NO_FLAGS,
     0, 10, MONS_ABOMINATION_SMALL, MONS_ABOMINATION_SMALL, MH_UNDEAD, -5,
@@ -3951,9 +3949,8 @@ static monsterentry mondata[] = {
 
 // large abominations ('X')
 {
-    // coloured with mon-util.cc:random_large_abomination_colour.
     // See comment under MONS_ABOMINATION_SMALL regarding holiness.
-    MONS_ABOMINATION_LARGE, 'X', BLACK, "large abomination",
+    MONS_ABOMINATION_LARGE, 'X', RED, "large abomination",
     M_NO_FLAGS,
     MR_NO_FLAGS,
     0, 10, MONS_ABOMINATION_SMALL, MONS_ABOMINATION_LARGE, MH_UNDEAD, -7,
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index d297c5f..1e0d1d9 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1944,34 +1944,6 @@ static colour_t _random_butterfly_colour()
     return col;
 }
 
-// Abominations.
-static colour_t _random_large_abomination_colour()
-{
-    colour_t col;
-    // Restricted colours:
-    //  MAGENTA = orb guardian
-    //  GREEN = tentacled monstrosity
-    do
-        col = random_monster_colour();
-    while (col == MAGENTA || col == GREEN);
-
-    return col;
-}
-
-static colour_t _random_small_abomination_colour()
-{
-    colour_t col;
-    // Restricted colours:
-    //  MAGENTA = unseen horror
-    //  BROWN = used for crawling corpses/macabre masses
-    //  LIGHTCYAN = octopode
-    do
-        col = random_monster_colour();
-    while (col == MAGENTA || col == BROWN || col == LIGHTCYAN);
-
-    return col;
-}
-
 bool init_abomination(monster* mon, int hd)
 {
     if (mon->type == MONS_CRAWLING_CORPSE
@@ -2038,7 +2010,6 @@ void define_monster(monster* mons)
 
     case MONS_ABOMINATION_SMALL:
         init_abomination(mons, 4 + random2(4));
-        col = _random_small_abomination_colour();
         break;
 
     case MONS_ZOMBIE_SMALL:
@@ -2047,7 +2018,6 @@ void define_monster(monster* mons)
 
     case MONS_ABOMINATION_LARGE:
         init_abomination(mons, 8 + random2(4));
-        col = _random_large_abomination_colour();
         break;
 
     case MONS_ZOMBIE_LARGE:
-- 
1.7.4.4