fiddlerwoaroof/crawl - Change 7YOLWXW6IGMACXG76S2HFA4VWZ7CJMIB6NAIVEZPAARJ3ZNHOHGQC

Implement [2535038]: monsters now have a chance of shouting whenever

they are woken up, unless it's by a successful stab. (The previous behaviour made them shout only when they were woken up by the player walking around.)

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

Created by haranp on February 17, 2009

7YOLWXW6IGMACXG76S2HFA4VWZ7CJMIB6NAIVEZPAARJ3ZNHOHGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1007 [7.16817]

B:BD[5.4476] → [6.898:1007]

    if (!force && (!you.turn_is_over
                   || x_chance_in_y(you.skills[SK_STEALTH], 30)))
    {

[5.4476]

[8.86]

    if (!force && x_chance_in_y(you.skills[SK_STEALTH], 30))

Deletion in crawl-ref/source/view.cc at line 1009 [7.16817]
B:BD[8.102] → [6.1008:1014]
```
    }
```
Deletion in crawl-ref/source/view.cc at line 1259 [7.16817]
∅:D[3.163] → [5.7355:7403]
B:BD[7.40454] → [5.7355:7403]
```
                handle_monster_shouts(monster);
```

Replacement in crawl-ref/source/monstuff.h at line 109 [7.1390580]

B:BD[4.4786] → [4.4786:4860]

                     int src = MHITNOT, coord_def src_pos = coord_def());

[4.4786]

[7.1392736]

                     int src = MHITNOT, coord_def src_pos = coord_def(),
                     bool allow_shout = true);

Replacement in crawl-ref/source/monstuff.cc at line 2494 [7.1396662]
∅:D[4.4959] → [9.23786:23826]
B:BD[10.2749] → [9.23786:23826]
```
                     coord_def src_pos)
```
[4.4959]
[7.1436485]
```
                     coord_def src_pos, bool allow_shout)
```
Insertion in crawl-ref/source/monstuff.cc at line 2507 [7.1396662]
[11.2867]
[7.1436674]
```
    bool was_sleeping     = mons_is_sleeping(mon);
```

Insertion in crawl-ref/source/monstuff.cc at line 2674 [7.1396662]

[7.1439071]

    // If it woke up, it might shout.
    if (was_sleeping && !mons_is_sleeping(mon) && allow_shout)
        handle_monster_shouts(mon);

Replacement in crawl-ref/source/fight.cc at line 868 [7.3140790]

B:BD[12.3214] → [2.6110:6177]

        behaviour_event(defender_as_monster(), ME_WHACK, MHITYOU);

[12.3214]

[13.2763]

        // However, successful stabs inhibit shouting.
        behaviour_event(defender_as_monster(), ME_WHACK, MHITYOU,
                        coord_def(), !stab_attempt);

Implement [2535038]: monsters now have a chance of shouting whenever

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1007 [7.16817]

Deletion in crawl-ref/source/view.cc at line 1009 [7.16817]

Deletion in crawl-ref/source/view.cc at line 1259 [7.16817]

Replacement in crawl-ref/source/monstuff.h at line 109 [7.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 2494 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2507 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2674 [7.1396662]

Replacement in crawl-ref/source/fight.cc at line 868 [7.3140790]