summaryrefslogtreecommitdiffstats
path: root/crawl-ref/docs/develop
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-06 08:34:08 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-06 08:34:08 -0600
commit3babe0c87ea91bc93c6939de77252bab487cb880 (patch)
tree0240e8d470d8ba93531e55c445cdb3961f951d12 /crawl-ref/docs/develop
parent01b40e683ee4886b7ed76b4c90ff97ac394dc30e (diff)
downloadcrawl-ref-3babe0c87ea91bc93c6939de77252bab487cb880.tar.gz
crawl-ref-3babe0c87ea91bc93c6939de77252bab487cb880.zip
Un-hyphenate ogre-mage, for consistency with other mage types.
Diffstat (limited to 'crawl-ref/docs/develop')
-rw-r--r--crawl-ref/docs/develop/monster_speech.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/docs/develop/monster_speech.txt b/crawl-ref/docs/develop/monster_speech.txt
index 1e7499614b..402b36998c 100644
--- a/crawl-ref/docs/develop/monster_speech.txt
+++ b/crawl-ref/docs/develop/monster_speech.txt
@@ -258,7 +258,7 @@ following order:
1. The actual monster name.
Examples: "crystal golem", "default confused moth of wrath"
2. The monster genus.
- Examples: If "friendly ogre-mage" wasn't found, try "friendly ogre"
+ Examples: If "friendly ogre mage" wasn't found, try "friendly ogre"
instead. Same for "dragon" if "swamp drake" was
unsuccessful.
3. Then the monster glyph, with prefix "cap-" for capital letters.
@@ -478,7 +478,7 @@ The following variables are hardcoded:
@player_species@: Player base species, with Draconian rather than the
actual subtype.
@player_genus@ : Player genus, i.e. "Elf" rather than the exact type,
- or "Ogre" instead of "Ogre-Mage".
+ or "Orc" instead of "Hill Orc".
@player_genus_plural@ : pluralised genus form.
@player_god@ : Player's god name, or "you" if non-religious.
@Player_god@ : Player's god name, or "You" if non-religious.
@@ -506,7 +506,7 @@ handling. If the parser encounters such a variable, it will search the
database for the corresponding specific entry, i.e. "insult <genus>
adj1/adj2/noun" where <genus> is replaced with the actual genus name,
that is "draconian", "elf" or "dwarf" instead of the more specific
-species name, "ogre" for "ogre-mage", or the actual species name in all
+species name, "ogre" for "ogre mage", or the actual species name in all
other cases.
If this specific search doesn't yield any results, i.e., such an