fiddlerwoaroof/crawl - Change HFXCFYFH2X3BIZR55ZADL3CV4MQJEEHDSIJZ7YSTHO3HTZP7GWEAC

Fixed mass confusion working only on natural creatures (cbus).

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

Created by dshaligram on June 14, 2007

HFXCFYFH2X3BIZR55ZADL3CV4MQJEEHDSIJZ7YSTHO3HTZP7GWEAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/beam.h at line 57 [4.4124541]

B:BD[4.4126410] → [4.4126410:4126469]

bool mass_enchantment( int wh_enchant, int pow, int who );

[4.4126410]

[4.4126469]

bool mass_enchantment( enchant_type wh_enchant, int pow, int who );

Insertion in crawl-ref/source/beam.cc at line 1799 [4.4128068]

[4.4186901]


static bool monster_resists_mass_enchantment(monsters *monster,
                                             enchant_type wh_enchant,
                                             int pow)
{
    // assuming that the only mass charm is control undead:
    if (wh_enchant == ENCH_CHARM)
    {
        if (mons_friendly(monster))
            return (true);
        if (mons_class_holiness(monster->type) != MH_UNDEAD)
            return (true);
        if (check_mons_resist_magic( monster, pow ))
        {
            simple_monster_message(monster, mons_immune_magic(monster) ?
                                   " is unaffected." : " resists.");
            return (true);
        }
    }
    else if (wh_enchant == ENCH_CONFUSION
             || mons_holiness(monster) == MH_NATURAL)
    {
        if (check_mons_resist_magic( monster, pow ))
        {
            simple_monster_message(monster, mons_immune_magic(monster) ?
                                   " is unaffected." : " resists.");
            return (true);
        }
    }
    else  // trying to enchant an unnatural creature doesn't work
    {
        simple_monster_message(monster, " is unaffected.");
        return (true);
    }

Insertion in crawl-ref/source/beam.cc at line 1836 [4.4128068]
[4.4186902]
[4.4186902]
```
    return (false);
}
```

Replacement in crawl-ref/source/beam.cc at line 1840 [4.4128068]

B:BD[4.4186947] → [4.4186947:4187008]

bool mass_enchantment( int wh_enchant, int pow, int origin )

[4.4186947]

[4.4187008]

bool mass_enchantment( enchant_type wh_enchant, int pow, int origin )

Deletion in crawl-ref/source/beam.cc at line 1857 [4.4128068]

B:BD[4.4187345] → [4.4187345:4187524]


        // assuming that the only mass charm is control undead:
        if (wh_enchant == ENCH_CHARM)
        {
            if (mons_friendly(monster))
                continue;

Replacement in crawl-ref/source/beam.cc at line 1858 [4.4128068]

B:BD[4.4187525] → [5.1232078:1232143]

∅:D[5.1232143] → [4.4187584:4187682]

B:BD[4.4187584] → [4.4187584:4187682]

B:BD[4.4187682] → [3.1469:1619]

∅:D[3.1619] → [4.4187744:4187795]

B:BD[4.4187744] → [4.4187744:4187795]

B:BD[4.4187795] → [5.1232144:1232199]

∅:D[5.1232199] → [4.4187856:4187937]

B:BD[4.4187856] → [4.4187856:4187937]

B:BD[4.4187937] → [3.1620:1770]

∅:D[3.1770] → [4.4187999:4188193]

B:BD[4.4187999] → [4.4187999:4188193]

            if (mons_class_holiness(monster->type) != MH_UNDEAD)
                continue;
            if (check_mons_resist_magic( monster, pow ))
            {
                simple_monster_message(monster, mons_immune_magic(monster) ?
                                       " is unaffected." : " resists.");
                continue; 
            }
        }
        else if (mons_holiness(monster) == MH_NATURAL)
        {
            if (check_mons_resist_magic( monster, pow ))
            {
                simple_monster_message(monster, mons_immune_magic(monster) ?
                                       " is unaffected." : " resists.");
                continue;
            }
        }
        else  // trying to enchant an unnatural creature doesn't work
        {
            simple_monster_message(monster, " is unaffected.");

[4.4187525]

[4.4188193]

        if (monster->has_ench(wh_enchant))

Deletion in crawl-ref/source/beam.cc at line 1860 [4.4128068]
B:BD[4.4188215] → [4.4188215:4188225]
```
        }
```

Replacement in crawl-ref/source/beam.cc at line 1861 [4.4128068]

B:BD[4.4188226] → [2.36139:36209]

∅:D[2.36209] → [4.4188274:4188296]

B:BD[4.4188274] → [4.4188274:4188296]

        if (monster->has_ench(static_cast<enchant_type>(wh_enchant)))
            continue;

[4.4188226]

[4.4188296]

        if (monster_resists_mass_enchantment(monster, wh_enchant, pow))
            continue;

Replacement in crawl-ref/source/beam.cc at line 1864 [4.4128068]

B:BD[4.4188297] → [2.36210:36280]

        if (monster->add_ench(static_cast<enchant_type>(wh_enchant)))

[4.4188297]

[4.4188345]

        if (monster->add_ench(wh_enchant))