fiddlerwoaroof/crawl - Change SLS2XJULEDJ4THKXXVQ2XPTO47773EYMG4FPIRDN63BXY3QLMSLQC

Implement FR#1756327: Polymorph other always works on shapeshifters, reverting them to their original form (they immediately polymorph again on their turn). Wand of polymorph other description mentions it being effective against shapechangers.

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

Created by evktalo on July 11, 2009

SLS2XJULEDJ4THKXXVQ2XPTO47773EYMG4FPIRDN63BXY3QLMSLQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 1929 [3.1396662]

B:BD[3.1423960] → [3.1423960:1424054]

        || new_mclass == MONS_SHAPESHIFTER
        || new_mclass == MONS_GLOWING_SHAPESHIFTER

Replacement in crawl-ref/source/mon-util.cc at line 2188 [3.1699344]

B:BD[2.3968] → [2.3968:4005]

        result += " shaped shifter";

[2.3968]

[2.4005]

    {
        // If momentarily in original form, don't display "shaped shifter".
        if (mons_genus(mon.type) != MONS_SHAPESHIFTER) 
        {
            result += " shaped shifter";
        }
    }

Insertion in crawl-ref/source/mon-util.cc at line 7818 [3.1699344]

[4.21759]

[5.344]


    if (this->has_ench(ENCH_GLOWING_SHAPESHIFTER))
        return (monster_polymorph(this, MONS_GLOWING_SHAPESHIFTER));

Insertion in crawl-ref/source/mon-util.cc at line 7822 [3.1699344]

[5.345]

[6.2749]

    if (this->has_ench(ENCH_SHAPESHIFTER))
        return (monster_polymorph(this, MONS_SHAPESHIFTER));

Replacement in crawl-ref/source/dat/descript/items.txt at line 1580 [8.62757]

B:BD[7.33081] → [7.33081:33138]

another form. It doesn't work on you, so don't even try.

[7.33081]

[9.50342]

another form. It is especially effective against shape-changing
creatures. It doesn't work on you, so don't even try.

Replacement in crawl-ref/source/beam.cc at line 4737 [3.4128068]

B:BD[3.4242946] → [10.59490:59544]

∅:D[10.59544] → [11.11740:11773]

B:BD[11.11740] → [11.11740:11773]

        if (check_mons_resist_magic(mon, ench_power))
            return (MON_RESIST);

[3.4242946]

[11.11773]

        
        if (flavour != BEAM_POLYMORPH || !mons_is_shapeshifter(mon))
            if (check_mons_resist_magic(mon, ench_power))
                return (MON_RESIST);