fiddlerwoaroof/crawl - Change OEMBDFEY3NCGY5T7N45METTYTR33STXAYNPXKL2BGKDUCBCP5PJQC

Don't give shout/talk messages if they're on the TALK_VISUAL channel

(e.g., "The jelly quivers", "The jelly jiggles") and you can't see the relevant monster. Fixes half of [2628480].

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

Created by haranp on February 25, 2009

OEMBDFEY3NCGY5T7N45METTYTR33STXAYNPXKL2BGKDUCBCP5PJQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1200 [6.16817]

B:BD[5.181] → [2.321:382]

∅:D[5.181] → [7.472:523]

∅:D[2.382] → [7.472:523]

B:BD[7.472] → [7.472:523]

        msg = do_mon_str_replacements(msg, monster, s_type);
        msg::streams(channel) << msg << std::endl;

[5.181]

[8.7271]

        if (channel != MSGCH_TALK_VISUAL || you.can_see(monster))
        {
            msg = do_mon_str_replacements(msg, monster, s_type);
            msg::streams(channel) << msg << std::endl;
        }

Replacement in crawl-ref/source/monstuff.cc at line 8128 [6.1396662]

B:BD[4.3666] → [4.3666:3712]

            int newdir = (dir + 8 + mod) % 8;

[4.3666]

[4.3712]

            const int newdir = (dir + 8 + mod) % 8;

Replacement in crawl-ref/source/monstuff.cc at line 8136 [6.1396662]

B:BD[4.3972] → [4.3972:4071]

                dist[i] = (mons_is_fleeing(monster)) ? (-FAR_AWAY)
                    : FAR_AWAY;

[4.3972]

[4.4071]

                dist[i] = (mons_is_fleeing(monster)) ? (-FAR_AWAY) : FAR_AWAY;

Insertion in crawl-ref/source/monstuff.cc at line 8139 [6.1396662]

[4.4095]


        const int dir0 = ((dir + 8 + sdir) % 8);
        const int dir1 = ((dir + 8 - sdir) % 8);

Replacement in crawl-ref/source/monstuff.cc at line 8152 [6.1396662]

B:BD[4.4394] → [4.4394:4448]

                mmov = mon_compass[((dir+8)+sdir)%8];

[4.4394]

[4.4448]

                mmov = mon_compass[dir0];

Replacement in crawl-ref/source/monstuff.cc at line 8157 [6.1396662]

B:BD[4.4566] → [4.4566:4620]

                mmov = mon_compass[((dir+8)-sdir)%8];

[4.4566]

[4.4620]

                mmov = mon_compass[dir1];

Replacement in crawl-ref/source/monstuff.cc at line 8165 [6.1396662]

B:BD[4.4771] → [4.4771:4825]

                mmov = mon_compass[((dir+8)+sdir)%8];

[4.4771]

[4.4825]

                mmov = mon_compass[dir0];

Replacement in crawl-ref/source/monstuff.cc at line 8170 [6.1396662]

B:BD[4.4943] → [4.4943:4997]

                mmov = mon_compass[((dir+8)-sdir)%8];

[4.4943]

[4.4997]

                mmov = mon_compass[dir1];

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

B:BD[9.16464] → [9.16464:16533]

        // warning to scare the player.  In order to accomidate this

[9.16464]

[9.16533]

        // warning to scare the player.  In order to accomodate this

Deletion in crawl-ref/source/monspeak.cc at line 798 [6.1558496]
B:BD[7.2120] → [7.2120:2130]
```
        {
```
Deletion in crawl-ref/source/monspeak.cc at line 799 [6.1558496]
B:BD[7.2172] → [7.2172:2204]
```
            continue;
        }
```
Deletion in crawl-ref/source/monspeak.cc at line 800 [6.1558496]
B:BD[7.2285] → [7.2285:2295]
```
        {
```
Deletion in crawl-ref/source/monspeak.cc at line 801 [6.1558496]
B:BD[7.2342] → [7.2342:2374]
```
            continue;
        }
```
Deletion in crawl-ref/source/monspeak.cc at line 802 [6.1558496]
B:BD[7.2444] → [7.2444:2454]
```
        {
```

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

B:BD[7.2474] → [7.2474:2507]

∅:D[7.2507] → [9.17467:17504]

B:BD[6.1621947] → [9.17467:17504]

            continue;
        }
        mpr(line.c_str(), msg_type);

[7.2474]

[9.17504]

        else if (msg_type == MSGCH_TALK_VISUAL && !you.can_see(monster))
            ;                   // do nothing
        else
            mpr(line.c_str(), msg_type);

Replacement in crawl-ref/source/dat/database/shout.txt at line 266 [10.37152]

B:BD[10.39826] → [11.723:787]

@The_monster@ twitches @possessive@ antennae in your direction.

[10.39826]

[10.39890]

VISUAL:@The_monster@ twitches @possessive@ antennae in your direction.

Replacement in crawl-ref/source/dat/database/shout.txt at line 270 [10.37152]

B:BD[10.39904] → [11.788:852]

@The_monster@ twitches @possessive@ antennae in your direction.

[10.39904]

[10.39968]

VISUAL:@The_monster@ twitches @possessive@ antennae in your direction.

Replacement in crawl-ref/source/dat/database/shout.txt at line 276 [10.37152]
B:BD[10.40065] → [10.40065:40116]
```
@The_monster@ turns @possessive@ gaze towards you.
```
[10.40065]
[3.2799]
```
VISUAL:@The_monster@ turns @possessive@ gaze towards you.
```
Replacement in crawl-ref/source/dat/database/shout.txt at line 280 [10.37152]
B:BD[3.2809] → [3.2809:2868]
```
@The_monster@ swivels @possessive@ eye-stalks towards you.
```
[3.2809]
[10.40116]
```
VISUAL:@The_monster@ swivels @possessive@ eye-stalks towards you.
```
Replacement in crawl-ref/source/dat/database/shout.txt at line 284 [10.37152]
B:BD[10.40130] → [10.40130:40153]
```
@The_monster@ quivers.
```
[10.40130]
[7.15294]
```
VISUAL:@The_monster@ quivers.
```
Replacement in crawl-ref/source/dat/database/shout.txt at line 293 [10.37152]
B:BD[10.40553] → [3.2869:2912]
```
@The_monster@ waves @possessive@ rhizomes.
```
[10.40553]
[10.40560]
```
VISUAL:@The_monster@ waves @possessive@ rhizomes.
```
Replacement in crawl-ref/source/dat/database/shout.txt at line 301 [10.37152]
B:BD[10.40670] → [12.1402:1438]
```
@The_monster@ @says@, "@imp_taunt@"
```
[10.40670]
[3.2913]
```
SOUND:@The_monster@ @says@, "@imp_taunt@"
```
Replacement in crawl-ref/source/dat/database/shout.txt at line 305 [10.37152]
B:BD[3.2933] → [3.2933:2989]
```
@The_monster@'s fur bristles in rage as it notices you.
```
[3.2933]
[10.40704]
```
VISUAL:@The_monster@'s fur bristles in rage as it notices you.
```
Replacement in crawl-ref/source/dat/database/shout.txt at line 321 [10.37152]
B:BD[13.2851] → [13.2851:2900]
```
@The_monster@ shouts, "Attack, my pets! Attack!"
```
[13.2851]
[3.2990]
```
SOUND:@The_monster@ shouts, "Attack, my pets! Attack!"
```

Don't give shout/talk messages if they're on the TALK_VISUAL channel

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1200 [6.16817]

Replacement in crawl-ref/source/monstuff.cc at line 8128 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8136 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8139 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8152 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8157 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8165 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8170 [6.1396662]

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

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

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

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

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

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

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

Replacement in crawl-ref/source/dat/database/shout.txt at line 266 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 270 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 276 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 280 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 284 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 293 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 301 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 305 [10.37152]

Replacement in crawl-ref/source/dat/database/shout.txt at line 321 [10.37152]