fiddlerwoaroof/crawl - Change OPNCHI4UGN7WBIYPAXVV2C4N22ZSWROA435FJCY5UZVXKWRYQ42QC

Remove the M_WALL_SHIELDED flag. Instead, use the function

mons_is_wall_shielded() to determine whether a monster can pass through/be shielded by walls, as it's a more flexible approach. The function currently only checks for a monster class with a rock habitat, but it could be expanded to allow for other cases.

Replace the M_WALL_SHIELDED flag with the M_INSUBSTANTIAL flag, and check for the latter instead of hardcoding a list of monsters in mons_is_insubstantial().

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

Created by dolorous on January 5, 2008

OPNCHI4UGN7WBIYPAXVV2C4N22ZSWROA435FJCY5UZVXKWRYQ42QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1777 [10.1396662]

∅:D[8.270] → [9.723:902]

B:BD[9.723] → [9.723:902]

// a wall and is immune to most attacks while in a wall
// (M_WALL_SHIELDED), unless the monster has a spell or special/nearby
// ability which isn't affected by M_WALL_SHIELDED.

[8.270]

[10.1439764]

// a wall and is immune to most attacks while in a wall, unless
// the monster has a spell or special/nearby ability which isn't
// affected by the wall.

Replacement in crawl-ref/source/monstuff.cc at line 2116 [10.1396662]

B:BD[9.904] → [9.904:974]

            // XXX: If a monster can move through solid grids then it

[9.904]

[9.974]

            // XXX: If a monster can move through solid grids, then it

Replacement in crawl-ref/source/monstuff.cc at line 2118 [10.1396662]

B:BD[9.1047] → [9.1047:1338]

            // it can move through.  If it has M_WALL_SHIELDED is will
            // be (mostly) safe as soon as it enters the wall, and even
            // if it doesn't once it moves again it will be on the other
            // side of the wall and likely beyond the reach of the player.

[9.1047]

[10.1450023]

            // it can move through.  It will be (mostly) safe as soon as
            // it enters the wall, and even if it isn't, once it moves
            // again it will be on the other side of the wall and likely
            // beyond the reach of the player.

Replacement in crawl-ref/source/mon-util.h at line 119 [10.1682293]

B:BD[9.1791] → [9.1791:1869]

    M_WALL_SHIELDED     = (1<<24),        // Shielded from attacks if in wall

[9.1791]

[4.209]

    M_INSUBSTANTIAL     = (1<<24),        // is insubstantial

Insertion in crawl-ref/source/mon-util.h at line 625 [10.1682293]
[6.465]
[6.465]
```
bool mons_is_wall_shielded(int mc);
```
Replacement in crawl-ref/source/mon-util.cc at line 360 [10.1699344]
B:BD[3.744] → [3.744:753]
```
        
```
[3.744]
[11.469699]

Insertion in crawl-ref/source/mon-util.cc at line 395 [10.1699344]

[12.2344]

[13.484]

bool mons_is_wall_shielded(int mc)
{
    return (mons_habitat(mc) == HT_ROCK);
}

Replacement in crawl-ref/source/mon-util.cc at line 404 [10.1699344]

B:BD[13.609] → [6.947:1545]

    switch (mc)
    {
    // vortices
    case MONS_FIRE_VORTEX:
    case MONS_SPATIAL_VORTEX:
    // elementals
    case MONS_FIRE_ELEMENTAL:
    case MONS_AIR_ELEMENTAL:
    case MONS_WATER_ELEMENTAL:
    // vapours
    case MONS_INSUBSTANTIAL_WISP:
    case MONS_VAPOUR:
    // ghosts and some undead
    case MONS_PLAYER_GHOST:
    case MONS_HUNGRY_GHOST:
    case MONS_SHADOW:
    case MONS_SMOKE_DEMON:
    case MONS_SHADOW_WRAITH:
    // others
    case MONS_BALL_LIGHTNING:
    case MONS_GIANT_SPORE:
    case MONS_ORB_OF_FIRE:
        return true;
    default:
        return false;
    }

[13.609]

[13.1280]

    return mons_class_flag(mc, M_INSUBSTANTIAL);

Replacement in crawl-ref/source/mon-util.cc at line 2419 [10.1699344]
B:BD[14.1812] → [7.588:629]
```
    if (mons_habitat(mclass) == HT_ROCK)
```
[14.1812]
[14.1977]
```
    if (mons_is_wall_shielded(mclass))
```
Replacement in crawl-ref/source/mon-data.h at line 392 [10.1826214]
B:BD[10.1835811] → [11.495128:495157]
```
    M_LEVITATE | M_CONFUSED,
```
[10.1835811]
[11.495157]
```
    M_LEVITATE | M_CONFUSED | M_INSUBSTANTIAL,
```
Replacement in crawl-ref/source/mon-data.h at line 517 [10.1826214]
B:BD[10.1839028] → [11.496396:496412]
```
    M_LEVITATE,
```
[10.1839028]
[11.496412]
```
    M_LEVITATE | M_INSUBSTANTIAL,
```
Replacement in crawl-ref/source/mon-data.h at line 865 [10.1826214]
B:BD[10.1847681] → [11.499716:499742]
```
    M_SEE_INVIS | M_EVIL,
```
[10.1847681]
[11.499742]
```
    M_SEE_INVIS | M_EVIL | M_INSUBSTANTIAL,
```
Replacement in crawl-ref/source/mon-data.h at line 876 [10.1826214]
B:BD[10.1847957] → [15.1010:1048]
```
    M_SENSE_INVIS | M_FLIES | M_EVIL,
```
[10.1847957]
[11.499864]
```
    M_SENSE_INVIS | M_FLIES | M_EVIL | M_INSUBSTANTIAL,
```

Replacement in crawl-ref/source/mon-data.h at line 1458 [10.1826214]

B:BD[11.506330] → [11.506330:506395]

    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC,

[11.506330]

[11.506395]

    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC | M_INSUBSTANTIAL,

Replacement in crawl-ref/source/mon-data.h at line 1468 [10.1826214]
B:BD[10.1863805] → [11.506476:506516]
```
    M_LEVITATE | M_SEE_INVIS | M_FLIES,
```
[10.1863805]
[11.506516]
```
    M_LEVITATE | M_SEE_INVIS | M_FLIES | M_INSUBSTANTIAL,
```
Replacement in crawl-ref/source/mon-data.h at line 1635 [10.1826214]
B:BD[10.1868154] → [11.508209:508245]
```
    M_LEVITATE | M_SPECIAL_ABILITY,
```
[10.1868154]
[11.508245]
```
    M_LEVITATE | M_SPECIAL_ABILITY | M_INSUBSTANTIAL,
```

Replacement in crawl-ref/source/mon-data.h at line 1646 [10.1826214]

B:BD[10.1868471] → [11.508394:508463]

    M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED,

[10.1868471]

[11.508463]

    M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED | M_INSUBSTANTIAL,

Replacement in crawl-ref/source/mon-data.h at line 2214 [10.1826214]
B:BD[10.1882668] → [11.514247:514285]
```
    M_SPELLCASTER | M_FLIES | M_EVIL,
```
[10.1882668]
[11.514285]
```
    M_SPELLCASTER | M_FLIES | M_EVIL | M_INSUBSTANTIAL,
```
Replacement in crawl-ref/source/mon-data.h at line 2346 [10.1826214]
B:BD[10.1886503] → [11.516067:516116]
```
    M_LEVITATE | M_SEE_INVIS | M_INVIS | M_EVIL,
```
[10.1886503]
[11.516116]
```
    M_LEVITATE | M_SEE_INVIS | M_INVIS | M_EVIL | M_INSUBSTANTIAL,
```
Replacement in crawl-ref/source/mon-data.h at line 2390 [10.1826214]
B:BD[10.1887664] → [11.516494:516523]
```
    M_LEVITATE | M_CONFUSED,
```
[10.1887664]
[11.516523]
```
    M_LEVITATE | M_CONFUSED | M_INSUBSTANTIAL,
```

Replacement in crawl-ref/source/mon-data.h at line 3593 [10.1826214]

B:BD[10.1915241] → [11.534523:534585]

    M_FLIES | M_CONFUSED | M_SPELLCASTER | M_SPECIAL_ABILITY,

[10.1915241]

[5.286]

    M_FLIES | M_CONFUSED | M_SPELLCASTER | M_SPECIAL_ABILITY | M_INSUBSTANTIAL,

Replacement in crawl-ref/source/mon-data.h at line 3604 [10.1826214]
B:BD[10.1915546] → [11.534682:534725]
```
    M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
```
[10.1915546]
[2.85]
```
    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_INSUBSTANTIAL,
```

Replacement in crawl-ref/source/mon-data.h at line 3794 [10.1826214]

∅:D[16.2440] → [17.6072:6153]

B:BD[10.1920883] → [17.6072:6153]

    M_FIGHTER | M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_FLIES | M_UNIQUE,

[16.2440]

[11.537054]

    M_FIGHTER | M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_FLIES | M_UNIQUE | M_INSUBSTANTIAL,

Replacement in crawl-ref/source/mon-data.h at line 3934 [10.1826214]
B:BD[14.2555] → [9.1966:2009]
```
        //M_NO_FLAGS,
    M_WALL_SHIELDED,
```
[14.2555]
[14.2571]
```
    M_NO_FLAGS,
```

Replacement in crawl-ref/source/fight.cc at line 507 [10.3140790]

B:BD[9.2253] → [9.2253:2309]

        && mons_class_flag(def->type, M_WALL_SHIELDED))

[9.2253]

[9.2309]

        && mons_is_wall_shielded(def->type))

Replacement in crawl-ref/source/beam.cc at line 1251 [10.4128068]

B:BD[9.3733] → [9.3733:3942]

B:BD[9.3942] → [8.443:478]

// Affect monster in wall unless it can shield itself using the wall
// (M_WALL_SHIELDED).  The wall will always shield the monster if the
// beam bounces off the wall, and a monster can't use a metal wall to
// shield itself from electricity.

[9.3733]

[9.3976]

// Affect monster in wall unless it can shield itself using the wall.
// The wall will always shield the monster if the beam bounces off the
// wall, and a monster can't use a metal wall to shield itself from
// electricity.

Replacement in crawl-ref/source/beam.cc at line 1270 [10.4128068]

B:BD[8.515] → [8.515:573]

        if (!mons_class_flag(mon->type, M_WALL_SHIELDED))

[8.515]

[9.4439]

        if (!mons_is_wall_shielded(mon->type))

Remove the M_WALL_SHIELDED flag. Instead, use the function

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1777 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2116 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2118 [10.1396662]

Replacement in crawl-ref/source/mon-util.h at line 119 [10.1682293]

Insertion in crawl-ref/source/mon-util.h at line 625 [10.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 360 [10.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 395 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 404 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2419 [10.1699344]

Replacement in crawl-ref/source/mon-data.h at line 392 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 517 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 865 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 876 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1458 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1468 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1635 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1646 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2214 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2346 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2390 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3593 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3604 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3794 [10.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3934 [10.1826214]

Replacement in crawl-ref/source/fight.cc at line 507 [10.3140790]

Replacement in crawl-ref/source/beam.cc at line 1251 [10.4128068]

Replacement in crawl-ref/source/beam.cc at line 1270 [10.4128068]