fiddlerwoaroof/crawl - Change 3CMMAOYW3XCVFBCT2RT6YH5BLVAWQT62QXXWWCMWIZKDFZBY4M2QC

Orc battle cry fixes (shouldn't affect berserk/confused/paralysed monsters). Affected orcs are woken up if they happen to be asleep (<3).

Ensorcelled hibernation should not work on berserk creatures.

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

Created by dshaligram on October 24, 2007

3CMMAOYW3XCVFBCT2RT6YH5BLVAWQT62QXXWWCMWIZKDFZBY4M2QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 6245 [4.962854]

B:BD[2.675] → [2.675:720]

    if (asleep())   // No cumulative sleeps.

[2.675]

[2.720]

    if (duration[DUR_BERSERKER] || asleep())   // No cumulative sleeps.

Insertion in crawl-ref/source/mstuff2.cc at line 2228 [4.1340842]

[5.1094]

                && !mons->has_ench(ENCH_BERSERK)
                && !mons->paralysed()
                && !mons->confused()

Replacement in crawl-ref/source/mstuff2.cc at line 2238 [4.1340842]
∅:D[3.279] → [5.1419:1436]
B:BD[5.1419] → [5.1419:1436]
```
                
```
[3.279]
[5.1436]
```
                    
```

Insertion in crawl-ref/source/mstuff2.cc at line 2253 [4.1340842]

[5.2013]


                    if (mons->asleep())
                        behaviour_event( mons, ME_DISTURB, MHITNOT,
                                         chief->x, chief->y );

Deletion in crawl-ref/source/mstuff2.cc at line 2264 [4.1340842]
B:BD[6.948] → [6.948:962]
```
            {
```

Replacement in crawl-ref/source/mstuff2.cc at line 2266 [4.1340842]

B:BD[5.2245] → [6.963:1024]

                noisy(15, chief->x, chief->y);
            }

[5.2245]


            // The yell happens whether you happen to see it or not.
            noisy(15, chief->x, chief->y);

Insertion in crawl-ref/source/mon-util.cc at line 5014 [4.1699344]
[7.418]
[7.418]
```
    if (has_ench(ENCH_BERSERK))
        return;
```