fiddlerwoaroof/crawl - Change 7EI4HMXZ7TAWZKFZG2SXHDAX3FWFBCZLUAKOALPRFF72FS7NKVBQC

Magic-immune monsters are now "unaffected" by enchantments instead of

"resist"ing them.

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

Created by haranp on April 16, 2007

7EI4HMXZ7TAWZKFZG2SXHDAX3FWFBCZLUAKOALPRFF72FS7NKVBQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells4.cc at line 1450 [3.436250]
[3.476708]
[3.476708]
```
        // XXX Note that this might affect magic-immunes!
```

Replacement in crawl-ref/source/spells4.cc at line 1493 [3.436250]

B:BD[3.477641] → [3.477641:477698]

        simple_monster_message( defender, " resists." );

[3.477641]

[3.477698]

        simple_monster_message( defender, mons_immune_magic(defender) ?
                                " is unaffected." : " resists." );

Replacement in crawl-ref/source/spells4.cc at line 2719 [3.436250]

B:BD[3.512329] → [3.512329:512391]

        simple_monster_message( &menv[ mons ], " resists." );

[3.512329]

[3.512391]

        simple_monster_message( &menv[mons], mons_immune_magic(&menv[mons]) ?
                                " is unaffected." : " resists." );

Replacement in crawl-ref/source/spells4.cc at line 2854 [3.436250]

B:BD[3.517422] → [3.517422:517478]

        simple_monster_message( monster, " resists." );

[3.517422]

[3.517478]

        simple_monster_message( monster, mons_immune_magic(monster) ?
                                " is unaffected." : " resists." );

Replacement in crawl-ref/source/spells2.cc at line 748 [3.569242]

B:BD[3.587686] → [3.587686:587750]

                simple_monster_message( monster, " resists." );

[3.587686]

[3.587750]

                simple_monster_message( monster, mons_immune_magic(monster) ?
                                        " is unaffected." : " resists." );

Insertion in crawl-ref/source/mon-util.h at line 200 [3.1682293]

[4.463543]

[3.1690701]

bool mons_immune_magic( const monsters *mon );
const char* mons_resist_string(const monsters *mon);

Deletion in crawl-ref/source/mon-util.h at line 203 [3.1682293]
B:BD[3.1690702] → [3.1690702:1690703]

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

[3.1708030]


bool mons_immune_magic(const monsters *mon)
{
    return seekmonster(mon->type)->resist_magic == MAG_IMMUNE;
}

Insertion in crawl-ref/source/mon-util.cc at line 657 [3.1699344]
[3.1708079]
[4.471741]
```
    if ( mons_immune_magic(mon) )
        return MAG_IMMUNE;
```

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

[3.1708570]

const char* mons_resist_string(const monsters *mon)
{
    if ( mons_immune_magic(mon) )
        return "is unaffected";
    else
        return "resists";
}

Replacement in crawl-ref/source/effects.cc at line 348 [3.3382105]

B:BD[3.3390162] → [4.938128:938178]

        if (mons_holiness(monster) != MH_NATURAL)

[3.3390162]

[3.3390220]

        if (mons_holiness(monster) != MH_NATURAL ||
            mons_immune_magic(monster))

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

B:BD[3.4187682] → [3.4187682:4187744]

                simple_monster_message(monster, " resists.");

[3.4187682]

[3.4187744]

                simple_monster_message(monster, mons_immune_magic(monster) ?
                                       " is unaffected." : " resists.");

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

B:BD[3.4187937] → [3.4187937:4187999]

                simple_monster_message(monster, " resists.");

[3.4187937]

[3.4187999]

                simple_monster_message(monster, mons_immune_magic(monster) ?
                                       " is unaffected." : " resists.");

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

B:BD[3.4242578] → [3.4242578:4242611]

            return (MON_RESIST);

[3.4242578]

[3.4242611]

            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

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

B:BD[4.1251111] → [4.1251111:1251144]

            return (MON_RESIST);

[4.1251111]

[4.1251144]

            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

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

B:BD[3.4243008] → [3.4243008:4243041]

            return (MON_RESIST);

[3.4243008]

[3.4243041]

            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

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

B:BD[3.4243281] → [3.4243281:4243314]

            return (MON_RESIST);

[3.4243281]

[3.4243314]

            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

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

B:BD[3.4243858] → [3.4243858:4243891]

            return (MON_RESIST);

[3.4243858]

[3.4243891]

            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

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

B:BD[3.4244695] → [3.4244695:4244728]

            return (MON_RESIST);

[3.4244695]

[3.4244728]

            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

Replacement in crawl-ref/source/beam.cc at line 3812 [3.4128068]
B:BD[3.4245889] → [3.4245889:4245918]
```
        return (MON_RESIST);
```
[3.4245889]
[3.4245918]
```
        return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;
```

Replacement in crawl-ref/source/abl-show.cc at line 2151 [3.4494389]

B:BD[2.1283] → [2.1283:1344]

        mprf("%s resists.", mon.name(DESC_CAP_THE).c_str());

[2.1283]

[2.1344]

        mprf("%s %s.",
             mon.name(DESC_CAP_THE).c_str(), mons_resist_string(&mon));