From 3babe0c87ea91bc93c6939de77252bab487cb880 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Fri, 6 Nov 2009 08:34:08 -0600 Subject: Un-hyphenate ogre-mage, for consistency with other mage types. --- crawl-ref/docs/develop/monster_speech.txt | 6 +++--- crawl-ref/source/dat/elf.des | 2 +- crawl-ref/source/dat/entry.des | 2 +- crawl-ref/source/dat/float.des | 2 +- crawl-ref/source/dat/large.des | 4 ++-- crawl-ref/source/dat/orc.des | 2 +- crawl-ref/source/dat/vaults.des | 2 +- crawl-ref/source/mon-data.h | 2 +- crawl-ref/source/skills2.cc | 2 +- 9 files changed, 12 insertions(+), 12 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 adj1/adj2/noun" where 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 diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des index 4261863cec..05a86358f7 100644 --- a/crawl-ref/source/dat/elf.des +++ b/crawl-ref/source/dat/elf.des @@ -503,7 +503,7 @@ MONS: deep elf knight / w:1 deep elf high priest / \ # the orcish delegation: MONS: orc warlord / iron troll / w:1 fire giant / w:1 frost giant / \ w:1 stone giant -MONS: orc sorcerer / orc high priest / w:5 ogre-mage +MONS: orc sorcerer / orc high priest / w:5 ogre mage MONS: orc knight / rock troll / ettin / w:1 orc sorcerer / \ w:1 orc high priest # the arbiter(s): diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des index 11f4c40f99..d720877302 100644 --- a/crawl-ref/source/dat/entry.des +++ b/crawl-ref/source/dat/entry.des @@ -55,7 +55,7 @@ KFEAT: MNOQ = shallow_water SHUFFLE: M/N/O/P/Q SUBST: P = MNO # -# Player monsters (no vampire or ogre-mages because they can get out of their +# Player monsters (no vampire or ogre magi because they can get out of their # cells or create threats outside; no merfolk, alive or undead, because they # insist on having deep water in their cells, which annoys me; other player # species don't exist as monsters): diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des index cbffb1fe6c..a8633116ac 100644 --- a/crawl-ref/source/dat/float.des +++ b/crawl-ref/source/dat/float.des @@ -631,7 +631,7 @@ NAME: lemuel_ogre_cave ORIENT: float DEPTH: D:9-15, Orc TAGS: no_pool_fixup -MONS: ogre, two-headed ogre, ogre-mage / Erolcha, plant / fungus +MONS: ogre, two-headed ogre, ogre mage / Erolcha, plant / fungus MONS: ogre zombie, two-headed ogre zombie SHUFFLE: WX/ZY , 12/12/67 SUBST: W:ww. , X:. , Z:x , Y:+.= diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des index 2ccb810fa0..bd2c946166 100644 --- a/crawl-ref/source/dat/large.des +++ b/crawl-ref/source/dat/large.des @@ -169,7 +169,7 @@ DEPTH: D:11-22, Orc:3-4 ORIENT: north MONS: patrolling stone giant, patrolling frost giant, patrolling fire giant MONS: hill giant, cyclops -MONS: w:50 ogre / w:5 ogre-mage / two-headed ogre +MONS: w:50 ogre / w:5 ogre mage / two-headed ogre MONS: wolf / warg SHUFFLE: ae / bB / gG / dD SUBST: ; = .' @@ -1219,7 +1219,7 @@ KFEAT: m = . KFEAT: z = . KMONS: A = orc sorcerer / Nergalle, orc sorcerer KMONS: B = wizard -KMONS: C = ogre-mage / Erolcha, ogre-mage +KMONS: C = ogre mage / Erolcha, ogre mage KMONS: D = deep elf sorcerer KMONS: E = lich / Boris, lich KMONS: F = ancient lich diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des index 21eaab0a72..d18849292e 100644 --- a/crawl-ref/source/dat/orc.des +++ b/crawl-ref/source/dat/orc.des @@ -454,7 +454,7 @@ SUBST: ? = += SUBST: d = $d SUBST: I = IG SHUFFLE: 112/334 -MONS: orc sorcerer, orc / orc wizard, ogre-mage, ogre / nothing +MONS: orc sorcerer, orc / orc wizard, ogre mage, ogre / nothing ITEM: any book MAP xxxx?xxxx diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des index e472d85b77..418f145cae 100644 --- a/crawl-ref/source/dat/vaults.des +++ b/crawl-ref/source/dat/vaults.des @@ -48,7 +48,7 @@ ENDMAP NAME: david_vaults_2 TAGS: vault_entry MONS: weight:40 nothing / weight:30 yaktaur / yaktaur captain -MONS: weight:70 nothing / weight:40 ogre / weight:20 two-headed ogre / ogre-mage +MONS: weight:70 nothing / weight:40 ogre / weight:20 two-headed ogre / ogre mage MONS: weight:100 nothing / shapeshifter SHUFFLE: 123 ORIENT: float diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index bfb1c95ab8..206d420934 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -2496,7 +2496,7 @@ static monsterentry mondata[] = { }, { - MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage", + MONS_OGRE_MAGE, 'O', MAGENTA, "ogre mage", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, 1300, 16, MONS_OGRE, MONS_OGRE, MH_NATURAL, -6, diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 213dcf20c2..d1719a175b 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -2003,7 +2003,7 @@ std::string skill_title( unsigned char best_skill, unsigned char skill_lev, case SK_SPELLCASTING: if (player_genus(GENPC_OGRE, static_cast(species))) { - result = "Ogre-Mage"; + result = "Ogre Mage"; break; } // else fall-through -- cgit v1.2.3-54-g00ecf