fiddlerwoaroof/crawl - Change 72GIZBEMQLEF3TITOHABWHRLL5TE7KOUSVWOUEHFMO2OZQ4EIB7AC

Another few modifications to monster speech, and removed (or rather,

commented out, for now) the dependency of the W/T, P/R merge of easy_unequip (I'd completely mixed up the options.) If we decide we keep this behaviour and don't add a replacement option, the commented out "You're already wearing that." messages can be removed.

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

Created by j-p-e-g on March 13, 2008

72GIZBEMQLEF3TITOHABWHRLL5TE7KOUSVWOUEHFMO2OZQ4EIB7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monspeak.cc at line 97 [6.1558496]
B:BD[5.5995] → [5.5995:6016]
```
        if (hostile)
```
[5.5995]
[5.6016]
```
        if (hostile) // skip hostile
```

Replacement in crawl-ref/source/monspeak.cc at line 100 [6.1558496]

B:BD[5.6099] → [5.6099:6189]

            msg = try_exact_string(prefixes, key, true, true);
        else if (religion)

[5.6099]

[5.6189]

        {
            if (religion) // skip hostile and religion
                msg = try_exact_string(prefixes, key, true, false, true);
            else // skip hostile and related
                msg = try_exact_string(prefixes, key, true, true);
        }
        else if (religion) // skip hostile, related and religion

Replacement in crawl-ref/source/monspeak.cc at line 110 [6.1558496]
B:BD[5.6373] → [5.6373:6415]
```
        else if (silenced && coinflip()) 
```
[5.6373]
[5.6415]
```
        else if (silenced && coinflip()) // skip all
```
Replacement in crawl-ref/source/monspeak.cc at line 206 [6.1558496]
B:BD[7.3305] → [8.9378:9417]
```
  // returns true if something is said
```
[7.3305]
[7.3306]
```
// returns true if something is said
```
Insertion in crawl-ref/source/monspeak.cc at line 216 [6.1558496]
[8.9854]
[8.9854]
```
    {
```
Insertion in crawl-ref/source/monspeak.cc at line 218 [6.1558496]
[8.9876]
[6.1559772]
```
    }
```
Insertion in crawl-ref/source/monspeak.cc at line 245 [6.1558496]
[5.7389]
[9.2591]
```
            
```

Insertion in crawl-ref/source/monspeak.cc at line 266 [6.1558496]

[5.7475]

[10.2552]

    // animals only look at the current player form,
    // smart monsters at the actual player genus
    if (is_player_same_species(monster->type,
                               mons_intel(monster->type) <= I_ANIMAL))
    {
        prefixes.push_back("related"); // maybe overkill for Beogh?
    }

Deletion in crawl-ref/source/monspeak.cc at line 284 [6.1558496]

B:BD[4.2778] → [4.2778:2949]

        // only look at the current player form
        if (is_player_same_species(monster->type, true))
            prefixes.push_back("related"); // overkill for Beogh

Replacement in crawl-ref/source/item_use.cc at line 985 [6.2781507]
B:BD[11.3084] → [4.3564:3598]
```
        if (Options.easy_unequip)
```
[11.3084]
[4.3598]
```
//        if (Options.easy_unequip)
```
Replacement in crawl-ref/source/item_use.cc at line 987 [6.2781507]
B:BD[4.3642] → [4.3642:3643]
[4.3642]
[11.3084]
```
/*
```
Insertion in crawl-ref/source/item_use.cc at line 992 [6.2781507]
[11.3179]
[11.3179]
```
*/
```
Replacement in crawl-ref/source/item_use.cc at line 2999 [6.2781507]
B:BD[12.754453] → [4.4072:4106]
```
        if (Options.easy_unequip)
```
[12.754453]
[4.4106]
```
//        if (Options.easy_unequip)
```
Replacement in crawl-ref/source/item_use.cc at line 3002 [6.2781507]
∅:D[4.4165] → [12.754453:754520]
B:BD[12.754453] → [12.754453:754520]
```
        mpr("You've already put that on!");
        return (true);
```
[4.4165]
[12.754520]
```
//        mpr("You've already put that on!");
//        return (true);
```

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 1877 [14.307]

[13.4008]

# The good gods are assumed to work closely together, so a Daeva praising 
# Elyvilon is actually flavour.

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2007 [14.307]

[10.4457]

@_generic_orc_speech_@
%%%%
# charmed orcs
friendly orc
@default friendly humanoid@
w:5
@_generic_orc_speech_@
%%%%
# charmed orcs, for hill orcs (not counting beogh)
friendly related orc
@default friendly related humanoid@
w:5

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2057 [14.307]
B:BD[10.4669] → [10.4669:4679]
```
beogh orc
```
[10.4669]
[10.4679]
```
related beogh orc
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2119 [14.307]
B:BD[14.37116] → [10.5693:5712]
```
friendly beogh orc
```
[14.37116]
[10.5712]
```
friendly related beogh orc
```

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2151 [14.307]

B:BD[9.5906] → [2.2959:3028]

@The_monster@ @shouts@, "Let's @kill_or_maim@ those @orc_heathen@s."

[9.5906]

[9.5971]

@The_monster@ @shouts@, "Let's @kill_or_maim@ those @orc_heathen@s!"

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2193 [14.307]
∅:D[9.6512] → [10.7168:7187]
B:BD[10.7168] → [10.7168:7187]
```
beogh orc sorcerer
```
[9.6512]
[10.7187]
```
related beogh orc sorcerer
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2198 [14.307]
B:BD[10.7204] → [10.7204:7216]
```
@beogh orc@
```
[10.7204]
[10.7216]
```
@related beogh orc@
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2211 [14.307]
B:BD[9.6545] → [9.6545:6565]
```
beogh Blork the orc
```
[9.6545]
[9.6565]
```
related beogh Blork the orc
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2219 [14.307]
B:BD[9.6663] → [9.6663:6675]
```
@beogh orc@
```
[9.6663]
[9.6675]
```
@related beogh orc@
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2222 [14.307]
B:BD[9.6704] → [9.6704:6715]
```
beogh Urug
```
[9.6704]
[9.6715]
```
related beogh Urug
```
Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2230 [14.307]
B:BD[9.6803] → [9.6803:6815]
```
@beogh orc@
```
[9.6803]
[10.7279]
```
@related beogh orc@
```

Replacement in crawl-ref/init.txt at line 4 [6.4830895]

B:BD[3.2823] → [3.2823:2963]

# command keys, monster colours, item colours, butchering interface, 
# targeting interface. 
# (New players should go ignore these lines.)

[3.2823]

[15.3018]

# monster colours, command keys, order on the character selection screen,
# item colours, butchering interface, targeting interface. 
# (New players should just ignore these lines.)

Insertion in crawl-ref/init.txt at line 8 [6.4830895]
[15.3020]
[3.2964]
```
# : crawl.read_options('docs/034_monster_glyphs.txt')
```
Replacement in crawl-ref/init.txt at line 10 [6.4830895]
∅:D[3.3018] → [15.3072:3126]
B:BD[15.3072] → [15.3072:3126]
B:BD[15.3126] → [3.3019:3049]
```
# : crawl.read_options('docs/034_monster_glyphs.txt')
# classic_item_colours = true
```
[3.3018]
[5.13436]
```
# classic_item_colours    = true
```
Replacement in crawl-ref/init.txt at line 13 [6.4830895]
B:BD[5.13502] → [3.3050:3081]
```
# target_unshifted_dirs = true
```
[5.13502]
[15.3158]
```
# target_unshifted_dirs   = true
```
Deletion in crawl-ref/init.txt at line 16 [6.4830895]
B:BD[15.3160] → [15.3160:3161]

Replacement in crawl-ref/docs/monster_speech.txt at line 160 [16.15456]

B:BD[5.16353] → [5.16353:16358]

are.

[5.16353]

[16.17394]

are. Stupid monsters, i.e. animals, will judge your relatedness status
according to your transformed looks while smart monsters will see
through that magic, so that e.g. vampires will recognise a vampire in
bat form as one of their own but a giant bat would think the player
really is a bat.

Replacement in crawl-ref/docs/monster_speech.txt at line 169 [16.15456]

B:BD[13.6156] → [5.16359:16640]

added to the list. If you worship one of the good gods (Zin, Elyvilon,
or The Shining One) the prefix "good god" is used instead.
Conversely, worshippers of one of the evil gods (Yredelemnul, Makhleb,
Kikubaaqudgha, Lugonu, Xom, Beogh, or Vehumet) will use the prefix
"evil god".

[13.6156]

[13.6437]

added to the list, though not for charmed orcs who will simply use the
generic friendly statements instead of the orcish followers' cheers.
If you worship one of the good gods instead (Zin, The Shining One, or
Elyvilon) the prefix "good god" is used. Conversely, worshippers of one
of the evil gods (Yredelemnul, Makhleb, Kikubaaqudgha, Lugonu, Xom,
Beogh, or Vehumet) will use the prefix "evil god".

Replacement in crawl-ref/docs/monster_speech.txt at line 187 [16.15456]

B:BD[5.16979] → [5.16979:17063]

ignoring "related", then religion status, and finally "silenced", where
applicable.

[5.16979]

[5.17063]

ignoring religion status, then hostile and "related", then all three
of them, and then finally adding "silenced" to the list of ignored
prefixes, where applicable.

Replacement in crawl-ref/docs/monster_speech.txt at line 253 [16.15456]
B:BD[13.9070] → [13.9070:9116]
```
  bee", neither of which yields any results. 
```
[13.9070]
[5.18433]
```
  bee", neither of which yields any results.
```

Replacement in crawl-ref/docs/monster_speech.txt at line 266 [16.15456]

B:BD[13.9487] → [13.9487:9557]

  This time, we're interested in "friendly fleeing beogh orc wizard".

[13.9487]

[13.9557]

  This time, we're interested in "friendly fleeing related beogh orc
  wizard".

Replacement in crawl-ref/docs/monster_speech.txt at line 270 [16.15456]

B:BD[13.9628] → [5.18503:19270]

  database, so first we try to remove the less important prefixes,
  something that in this case only applies to "beogh". Unfortunately,
  "friendly fleeing orc wizard" also has no corresponding entry in the
  database, so that, one after another, we now check for "default
  friendly fleeing beogh orc wizard", "default friendly fleeing orc
  wizard", "default friendly beogh orc wizard", "default fleeing beogh
  orc wizard", "default friendly orc wizard", "default fleeing orc
  wizard", "default beogh orc wizard" and "default orc wizard", none of
  which is successful.
  The genus of orc wizards is "orc", so we retry the above using "orc"
  instead of "orc wizard". The same is repeated for "friendly fleeing
  beogh 'o'", and we still haven't found anything.

[13.9628]

[13.10199]

  database, so first we try to remove the less important prefixes, in 
  this case "related" and "beogh". Unfortunately, none of "friendly
  fleeing related orc wizard", "friendly fleeing beogh orc wizard", or
  "friendly fleeing orc wizard" has any corresponding entry in the
  database, so that we now check for "default" in combination with, one
  after another, all combinations of three or less prefixes.
  Three prefixes: "default friendly fleeing related orc wizard",
  "default friendly fleeing beogh orc wizard", "default friendly
  related beogh orc wizard", "default fleeing related beogh orc
  wizard".
  Two prefixes: "default friendly fleeing orc wizard", "default
  friendly related orc wizard", "default friendly beogh orc wizard",
  "default fleeing related orc wizard", "default fleeing beogh orc
  wizard", "default related beogh orc wizard".
  One prefix: "default friendly orc wizard", "default fleeing orc
  wizard", "default related orc wizard", "default beogh orc wizard".
  No prefix: "default orc wizard". 
  Sadly, none of these is successful. The genus of orc wizards is
  "orc", so we retry the above using "orc" instead of "orc wizard". The
  same is repeated for "friendly fleeing beogh 'o'", and we still
  haven't found anything.

Replacement in crawl-ref/docs/monster_speech.txt at line 302 [16.15456]

B:BD[13.10487] → [13.10487:10626]

B:BD[13.10626] → [5.19271:19353]

  the database for "friendly fleeing beogh humanoid", something that,
  not surprisingly (since Beogh and humanoid don't go well together)
  doesn't exist. Annoyingly enough, neither does "friendly fleeing 
  humanoid".

[13.10487]

[5.19353]

  the database for "friendly fleeing related beogh humanoid", something
  that, not surprisingly (since Beogh and humanoid don't go well
  together), doesn't exist. Annoyingly enough, neither do the variants
  "friendly fleeing related humanoid", "friendly fleeing beogh
  humanoid" or even "friendly fleeing humanoid".

Replacement in crawl-ref/docs/monster_speech.txt at line 309 [16.15456]

B:BD[5.19417] → [5.19417:19546]

  friendly fleeing beogh humanoid" is still unsuccessful, but with
  "default friendly fleeing humanoid" we finally strike gold:

[5.19417]

[13.10834]

  friendly fleeing related humanoid" is still unsuccessful, as
  are "default friendly fleeing beogh humanoid", "default friendly
  related beogh humanoid", and "default fleeing related beogh
  humanoid", but with "default friendly fleeing humanoid" we finally
  strike gold:

Insertion in crawl-ref/docs/monster_speech.txt at line 409 [16.15456]

[17.29925]

[18.921]


Also, in insult.txt you'll find the hardcoded variables
@species_insult_adj1@, @species_insult_adj2@ and @species_insult_noun@.
These are sometimes used in the construction of imps' or demons'
generic insults, and allow for species-dependent 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 other
cases.
If this specific search doesn't yield any results, that is, such an
entry hasn't been defined for the species in question, the general
replacements are used instead.

Replacement in crawl-ref/docs/monster_speech.txt at line 559 [16.15456]

B:BD[16.20248] → [17.32267:32489]

For shouts the default is also MSGCH_TALK which is automatically
changed to MSGCH_TALK_VISUAL for monsters that can't speak (animals,
usually), and manually set to MSGCH_SOUND for all those variants of
"You hear a shout!"

[16.20248]

[16.20663]

For shouts the default channel is also MSGCH_TALK, which is
automatically changed to MSGCH_TALK_VISUAL for monsters that can't
speak (animals, usually), and manually set to MSGCH_SOUND for all those
variants of "You hear a shout!"

Another few modifications to monster speech, and removed (or rather,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monspeak.cc at line 97 [6.1558496]

Replacement in crawl-ref/source/monspeak.cc at line 100 [6.1558496]

Replacement in crawl-ref/source/monspeak.cc at line 110 [6.1558496]

Replacement in crawl-ref/source/monspeak.cc at line 206 [6.1558496]

Insertion in crawl-ref/source/monspeak.cc at line 216 [6.1558496]

Insertion in crawl-ref/source/monspeak.cc at line 218 [6.1558496]

Insertion in crawl-ref/source/monspeak.cc at line 245 [6.1558496]

Insertion in crawl-ref/source/monspeak.cc at line 266 [6.1558496]

Deletion in crawl-ref/source/monspeak.cc at line 284 [6.1558496]

Replacement in crawl-ref/source/item_use.cc at line 985 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 987 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 992 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2999 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3002 [6.2781507]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 1877 [14.307]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 2007 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2057 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2119 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2151 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2193 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2198 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2211 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2219 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2222 [14.307]

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 2230 [14.307]

Replacement in crawl-ref/init.txt at line 4 [6.4830895]

Insertion in crawl-ref/init.txt at line 8 [6.4830895]

Replacement in crawl-ref/init.txt at line 10 [6.4830895]

Replacement in crawl-ref/init.txt at line 13 [6.4830895]

Deletion in crawl-ref/init.txt at line 16 [6.4830895]