summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.cc
diff options
context:
space:
mode:
authorCharles Otto <ottochar@gmail.com>2009-10-25 19:41:44 -0400
committerCharles Otto <ottochar@gmail.com>2009-10-30 20:31:29 -0400
commitc7d2e28d1714aea898a0ab394bd3cce8cde29e01 (patch)
tree2a8d967ccd143e545d968ef8a74c9424893f21a9 /crawl-ref/source/mon-util.cc
parentd0f35e86de825119d5fa255f6075a55a89f2f20b (diff)
downloadcrawl-ref-c7d2e28d1714aea898a0ab394bd3cce8cde29e01.tar.gz
crawl-ref-c7d2e28d1714aea898a0ab394bd3cce8cde29e01.zip
Various slime creature improvements
Make splitting while out of sight actually work When merging average enchantment durations for the two slimes When splitting add the parents ench durations to the offspring slime Better messaging for merging/splitting Cap the merge count to 5, use size adjectives instead of numbers for the combiend slime creature names. Don't group different size slime creatures together in the monster list
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
-rw-r--r--crawl-ref/source/mon-util.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 3e8ab4d865..be90ff2d48 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -2207,17 +2207,12 @@ static std::string _str_monam(const monsters& mon, description_level_type desc,
if(mon.mons_species() == MONS_SLIME_CREATURE && desc != DESC_DBNAME)
{
- if (mon.number < 11)
- {
- const char* cardinals[] = {"one", "two", "three", "four", "five",
- "six", "seven", "eight", "nine", "ten"};
- result += cardinals[mon.number - 1];
- }
- else
- result += make_stringf("%d", mon.number);
-
- result += "-blob ";
+ ASSERT(mon.number <=5);
+ const char* cardinals[] = {"", "large ", "very large ",
+ "enormous ", "titanic "};
+ result += cardinals[mon.number - 1];
}
+
// Done here to cover cases of undead versions of hydras.
if (mons_species(nametype) == MONS_HYDRA
&& mon.number > 0 && desc != DESC_DBNAME)