summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/Kills.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-02-24 14:09:06 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-02-24 14:09:06 +0000
commitc5f83d2896c317b5dc34e010f4e3fcea3dd195b5 (patch)
tree38d19ee0c953efe00e797ff88d1363cddae1450c /crawl-ref/source/Kills.cc
parent8674d7ae28e958983128c045fb8504b037785da7 (diff)
downloadcrawl-ref-c5f83d2896c317b5dc34e010f4e3fcea3dd195b5.tar.gz
crawl-ref-c5f83d2896c317b5dc34e010f4e3fcea3dd195b5.zip
We're not quite ready for engulfing monsters yet, changed AT_ENGULF to AT_HIT.
Corrected command-line summary of the -macro option. Player aux unarmed was reusing the primary attack damage, fixed. Ghosts and pandemonium demons were getting 4 attacks where they should get only 1, fixed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@960 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/Kills.cc')
-rw-r--r--crawl-ref/source/Kills.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc
index 9bff79ec8c..c3e54fc0ac 100644
--- a/crawl-ref/source/Kills.cc
+++ b/crawl-ref/source/Kills.cc
@@ -386,7 +386,7 @@ std::string pluralize(const std::string &name,
return name.substr(0, name.length() - 1) + "es";
else if (ends_with(name, "y"))
return name.substr(0, name.length() - 1) + "ies";
- else if (ends_with(name, "lf"))
+ else if (ends_with(name, "elf") || ends_with(name, "olf"))
// Elf, wolf. Dwarfs can stay dwarfs, if there were dwarfs.
return name.substr(0, name.length() - 1) + "ves";
else if (ends_with(name, "mage"))