fiddlerwoaroof/crawl - Change ZS76S7ICRKEPANAWEMFUXMCFZM4VYUBHR4NLIB6NVSUM2VN2XWYAC

Add more consistency fixes for polymorphing shapeshifters.

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

Created by dolorous on May 3, 2008

ZS76S7ICRKEPANAWEMFUXMCFZM4VYUBHR4NLIB6NVSUM2VN2XWYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1587 [5.1396662]

B:BD[3.3112] → [4.4441:4496]

∅:D[6.2600] → [3.3163:3298]

∅:D[4.4496] → [3.3163:3298]

B:BD[3.3163] → [3.3163:3298]

B:BD[3.3298] → [4.4497:4554]

B:BD[4.4554] → [2.2568:2627]

    mon_enchant abj     = monster->get_ench(ENCH_ABJ);
    mon_enchant shifter = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
                                            ENCH_SHAPESHIFTER);
    mon_enchant charm   = monster->get_ench(ENCH_CHARM);
    mon_enchant neutral = monster->get_ench(ENCH_NEUTRAL);

[3.3112]

[7.2783]

    mon_attitude_type attitude = monster->attitude;
    unsigned int foe           = monster->foe;
    mon_enchant abj            = monster->get_ench(ENCH_ABJ);
    mon_enchant shifter        = monster->get_ench(ENCH_GLOWING_SHAPESHIFTER,
                                                   ENCH_SHAPESHIFTER);
    mon_enchant charm          = monster->get_ench(ENCH_CHARM);
    mon_enchant neutral        = monster->get_ench(ENCH_NEUTRAL);

Replacement in crawl-ref/source/monstuff.cc at line 1600 [5.1396662]

B:BD[3.3476] → [2.2628:2697]

    // Only shapeshifters retain the charm and neutral enchantments.

[3.3476]

[8.2751]

    // Only shapeshifters retain attitude, foe, and the charm and
    // neutral enchantments.

Insertion in crawl-ref/source/monstuff.cc at line 1604 [5.1396662]

[2.2704]

[8.2776]

        monster->attitude = attitude;
        monster->foe = foe;