Apply Paul's patch 1901892: reorganize/rewrite docs/monster_speech.txt

And, while on the topic, of monster speech:
 * move weapon noises to a file of its own: noise.txt
 * finally outsource imp/demon insults (making insult.cc/h superfluous)
   This also activates the hitherto commented-out special racial insults
   pertaining to player species. As usual, more input welcome. :)


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

1 files changed, 6 insertions, 0 deletions

diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index ec38bcea9f..a7c06c1a05 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -203,6 +203,12 @@ static std::string replace_name_parts(const std::string name_in,
         name = replace_all(name, "@god_name@", god_name(which_god, false));
     }
 
+    // copied from monster speech handling (mon-util.cc):
+    // The proper possessive for a word ending in an "s" is to
+    // put an apostrophe after the "s": "Chris" -> "Chris'",
+    // not "Chris" -> "Chris's".  Stupid English language...
+    name = replace_all(name, "s's", "s'");
+
     return name;
 }