fiddlerwoaroof/crawl - Change OA23BLZCR5RGLIEHO3J3QQDH4UP33ZTDECXO3ITMP5TUCELKJT6AC

Make sure (very) ugly things never resist polymorph beams.

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

Created by dolorous on September 19, 2009

OA23BLZCR5RGLIEHO3J3QQDH4UP33ZTDECXO3ITMP5TUCELKJT6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 588 [5.1699344]

B:BD[3.5611] → [4.3193:3228]

    if (mons_is_shapeshifter(mon))

[3.5611]

[4.3228]

    if (mon->type == MONS_UGLY_THING || mon->type == MONS_VERY_UGLY_THING)

Replacement in crawl-ref/source/mon-util.cc at line 591 [5.1699344]

B:BD[4.3252] → [2.4333:4408]

    if (mon->type == MONS_UGLY_THING || mon->type == MONS_VERY_UGLY_THING)

[4.3252]

[2.4408]

    if (mons_is_shapeshifter(mon))

Insertion in crawl-ref/source/mon-util.cc at line 7962 [5.1699344]

[6.2878]

    // Polymorphing a shapeshifter will make it revert to its original
    // form.

Deletion in crawl-ref/source/mon-util.cc at line 7966 [5.1699344]
∅:D[7.2748] → [8.344:345]
∅:D[6.2998] → [8.344:345]
∅:D[9.21759] → [8.344:345]
B:BD[8.344] → [8.344:345]

Replacement in crawl-ref/source/beam.cc at line 4888 [5.4128068]

∅:D[10.6636] → [6.3447:3516]

B:BD[6.3447] → [6.3447:3516]

        if (flavour != BEAM_POLYMORPH || !mons_is_shapeshifter(mon))

[10.6636]

[6.3516]

        // (Very) ugly things and shapeshifters will never resist
        // polymorph beams.
        if (flavour == BEAM_POLYMORPH
            && (mon->type == MONS_UGLY_THING
                || mon->type == MONS_VERY_UGLY_THING
                || mons_is_shapeshifter(mon)))
        {
            ;
        }
        else
        {

Insertion in crawl-ref/source/beam.cc at line 4901 [5.4128068]
[6.3611]
[11.11773]
```
        }
```