fiddlerwoaroof/crawl - Change 6EZYOF7W56XYRLZ7JSIX3DLQS7BOYVQP7TSSCNU7WIJT4FPZIM6QC

Disallow permanent abominations created via Twisted Resurrection from

taking stairs, and consolidate the logic for this and other stair-ignoring undead in a monsters::can_use_stairs() function.

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

Created by dolorous on November 1, 2008

6EZYOF7W56XYRLZ7JSIX3DLQS7BOYVQP7TSSCNU7WIJT4FPZIM6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 344 [6.224557]

B:BD[5.431] → [5.431:503]

        || mons_is_stationary(fmenv)
        || fmenv->incapacitated())

[5.431]

[5.503]

        || !fmenv->can_use_stairs()
        || fmenv->incapacitated()
        || mons_is_stationary(fmenv))

Deletion in crawl-ref/source/stuff.cc at line 365 [6.224557]

B:BD[3.254] → [3.254:432]

∅:D[3.432] → [6.227633:227634]

∅:D[5.921] → [6.227633:227634]

B:BD[6.227633] → [6.227633:227634]

    // Zombified undead (not including enslaved souls) will not follow
    // you.
    if (mons_is_zombified(fmenv) && !mons_enslaved_intact_soul(fmenv))
        return (false);

Replacement in crawl-ref/source/stuff.cc at line 372 [6.224557]

B:BD[7.282] → [3.433:591]

        // Non-zombified undead (including enslaved souls) will follow
        // Yredelemnul worshippers, and orcs will follow Beogh
        // worshippers.

[7.282]

[7.401]

        // Undead will follow Yredelemnul worshippers, and orcs will
        // follow Beogh worshippers.

Deletion in crawl-ref/source/stuff.cc at line 375 [6.224557]
∅:D[7.475] → [5.1092:1120]
B:BD[5.1092] → [5.1092:1120]
∅:D[5.1120] → [6.227929:227930]
B:BD[6.227929] → [6.227929:227930]
B:BD[6.227930] → [3.592:724]
```
            return (false);
        if (you.religion == GOD_YREDELEMNUL
            && mons_is_zombified(fmenv) && !mons_enslaved_intact_soul(fmenv))
        {
```
Deletion in crawl-ref/source/stuff.cc at line 376 [6.224557]
B:BD[7.581] → [3.725:735]
```
        }
```
Insertion in crawl-ref/source/mon-util.h at line 614 [6.1682293]
[2.7773]
[6.1694947]
```
bool mons_twisted_resurrection_abomination(const monsters *mon);
```

Insertion in crawl-ref/source/mon-util.cc at line 956 [6.1699344]

[2.11078]

[8.8827]

}
bool mons_twisted_resurrection_abomination(const monsters *mon)
{
    return (mons_holiness(mon) == MH_UNDEAD
        && (mon->type == MONS_ABOMINATION_SMALL
            || mon->type == MONS_ABOMINATION_LARGE)
        && !mons_enslaved_twisted_soul(mon)
        && !mons_is_summoned(mon));

Insertion in crawl-ref/source/mon-util.cc at line 5458 [6.1699344]

[9.11783]

[10.14090]

bool monsters::can_use_stairs() const
{
    return (!mons_twisted_resurrection_abomination(this)
        && (!mons_is_zombified(this)
            || mons_enslaved_intact_soul(this)));
}

Replacement in crawl-ref/source/mon-util.cc at line 5472 [6.1699344]

B:BD[4.2526] → [4.2526:2634]

                   && (!mons_is_zombified(this)
                       || mons_enslaved_intact_soul(this)))

[4.2526]

[11.12634]

                   && can_use_stairs())

Insertion in crawl-ref/source/externs.h at line 1156 [6.3270163]
[9.14061]
[10.15518]
```
    bool can_use_stairs() const;
```