diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-18 11:54:32 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-18 11:54:32 +0000 |
| commit | a7af3aa2e35e7036ed2c29b1e85faca204c7d010 (patch) | |
| tree | 2be40170b489d9bde8bbfd781f3e3545d56e2a93 /crawl-ref/source | |
| parent | 5387461d1ccee508bd543640ed317371d80e1683 (diff) | |
| download | crawl-ref-a7af3aa2e35e7036ed2c29b1e85faca204c7d010.tar.gz crawl-ref-a7af3aa2e35e7036ed2c29b1e85faca204c7d010.zip | |
Apply bookofjude's patch in [2837552] to fix "-um" pluralization issues.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10566 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/libutil.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index eee6108d56..58f6661805 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -396,7 +396,7 @@ std::string pluralise(const std::string &name, // ending with sh (except fish, which are caught in the previous check). return name + "es"; } - else if (ends_with(name, "um")) + else if (ends_with(name, "simulacrum")) { // simulacrum -> simulacra return name.substr(0, name.length() - 2) + "a"; diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 7a79bf53d7..a83da80817 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1363,9 +1363,17 @@ void monster_pane_info::to_string( int count, std::string& desc, } else { - // Don't differentiate between dancing weapons, mimics, or draconians + // Don't pluralise uniques, ever. Multiple copies of the same unique + // are unlikely in the dungeon currently, but quite common in the + // arena. This prevens "4 Gra", etc. {due} + if (mons_is_unique(m_mon->type)) + { + out << count << " " + << m_mon->name(DESC_PLAIN); + } + // Don't differentiate between dancing weapons, mimics or draconians // of different types. - if (m_fullname + else if (m_fullname && m_mon->type != MONS_DANCING_WEAPON && mons_genus(m_mon->type) != MONS_DRACONIAN && !mons_is_mimic(m_mon->type) |