Add minor abomination-related tweaks.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7091 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 11 insertions, 13 deletions

diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index b4069a71d0..32a25afc7c 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -256,10 +256,6 @@ Xtahua
 
 An ancient and mighty dragon.
 %%%%
-abomination
-
-A hideous form, created or summoned by some arcane process.
-%%%%
 acid blob
 
 A lump of sickly green flesh, dripping with lethal acid.
@@ -795,10 +791,6 @@ hound
 
 A fearsome hunting dog, lithe and alert.  Its master must be long gone, for it looks dishevelled, and has a lean and hungry look.
 %%%%
-huge abomination
-
-A huge and hideous form, created or summoned by some arcane process.
-%%%%
 human
 
 A remarkably nondescript person.  How odd.
@@ -896,6 +888,10 @@ An enormous monitor lizard. It's more than capable of preying on large
 animals. Bits of fetid and rotting flesh from its last few meals are
 stuck in its teeth.
 %%%%
+large abomination
+
+A large and hideous form, created or summoned by some arcane process.
+%%%%
 large simulacrum
 
 An ice replica of a monster that is animated by the powers of necromancy.
@@ -1246,6 +1242,10 @@ slime creature
 
 An icky glob of slime, which slithers along the ground.
 %%%%
+small abomination
+
+A hideous form, created or summoned by some arcane process.
+%%%%
 small snake
 
 The lesser dungeon snake.
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index fae3be4505..351d95230f 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1469,7 +1469,7 @@ static monsterentry mondata[] = {
 },
 
 {
-    MONS_ABOMINATION_SMALL, 'x', BLACK, "abomination",
+    MONS_ABOMINATION_SMALL, 'x', BLACK, "small abomination",
     M_EVIL,
     MR_NO_FLAGS,
     0, 10, MONS_ABOMINATION_SMALL, MONS_ABOMINATION_SMALL, MH_DEMONIC, -5,
@@ -2781,9 +2781,8 @@ static monsterentry mondata[] = {
 },
 
 // large abominations ('X')
-// Large abom: (the previous one was small)
 {
-    MONS_ABOMINATION_LARGE, 'X', BLACK, "abomination",
+    MONS_ABOMINATION_LARGE, 'X', BLACK, "large abomination",
     M_EVIL,
     MR_NO_FLAGS,
     0, 10, MONS_ABOMINATION_SMALL, MONS_ABOMINATION_LARGE, MH_DEMONIC, -7,
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index d35caa37c7..3a51ce879c 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -176,8 +176,7 @@ void init_mon_name_cache()
             if (mon == MONS_RAKSHASA_FAKE
                 || mon == MONS_ARMOUR_MIMIC
                 || mon == MONS_SCROLL_MIMIC
-                || mon == MONS_POTION_MIMIC
-                || mon == MONS_ABOMINATION_LARGE)
+                || mon == MONS_POTION_MIMIC)
             {
                 // Keep previous entry.
                 continue;