fiddlerwoaroof/crawl - Change 3V52MSSK7QX7FWLLUW63DTWCBAJEK674EFZLKP45FLZ5KZKVARHAC

Added to classes actor, monsters and player the method can_pass_through(),

which returns true for a grid that the monster or player can pass trhough. Also added new monster type "rock worm" to demonstrate a monster which can pass through solid walls.

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

Created by zelgadis on October 14, 2007

3V52MSSK7QX7FWLLUW63DTWCBAJEK674EFZLKP45FLZ5KZKVARHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 158 [5.569242]

B:BD[4.149978] → [4.149978:150045]

            if (map_bounds(gx, gy) && !grid_is_solid(grd[gx][gy]))

[4.149978]

[4.150045]

            if (map_bounds(gx, gy)
                && mon->can_pass_through(grd[gx][gy]))

Replacement in crawl-ref/source/player.cc at line 172 [5.962854]
B:BD[4.337966] → [4.337966:338008]
```
    ASSERT( !grid_is_solid( new_grid ) );
```
[4.337966]
[4.338008]
```
    ASSERT( you.can_pass_through( new_grid ) );
```

Insertion in crawl-ref/source/player.cc at line 5409 [5.962854]

[6.3245]

bool player::can_pass_through(const dungeon_feature_type grid) const
{
    return !grid_is_solid(grid);
}
bool player::can_pass_through(const int _x, const int _y) const
{
    return can_pass_through(grd[_x][_y]);
}
bool player::can_pass_through(const coord_def &c) const
{
    return can_pass_through(grd(c));
}

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

B:BD[5.1420721] → [4.418177:418250]

                && !grid_is_solid(grd[parent->x + jex][parent->y + jey])

[5.1420721]

[5.1420802]

                && parent->can_pass_through(parent->x + jex, parent->y + jey)

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

B:BD[7.5087] → [7.5087:5155]

                         if (in_bounds(c) && !grid_is_solid(grd(c))

[7.5087]

[7.5155]

                         if (in_bounds(c) && monster->can_pass_through(c)

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

B:BD[5.1511143] → [7.5933:6046]

                 if (grid_is_solid(
                         grd[ monster->x + mmov_x ][ monster->y + mmov_y ]))

[5.1511143]

[7.6046]

                 if (!monster->can_pass_through(monster->x + mmov_x,
                                                monster->y + mmov_y))

Insertion in crawl-ref/source/monstuff.cc at line 4858 [5.1396662]
[5.1530130]
[5.1530130]
```
    bool no_water = false;
```
Replacement in crawl-ref/source/monstuff.cc at line 4860 [5.1396662]
B:BD[5.1530196] → [5.1530196:1530231]
```
        okmove = DNGN_WATER_STUCK;
```
[5.1530196]
[5.1530231]
```
        //okmove = DNGN_WATER_STUCK;
        no_water = true;
```

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

B:BD[4.443782] → [4.443782:443833]

            int target_grid = grd[targ_x][targ_y];

[4.443782]

[4.443833]

            dungeon_feature_type target_grid = grd[targ_x][targ_y];

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

B:BD[5.1531851] → [5.1531851:1531906]

            else if (grd[ targ_x ][ targ_y ] < okmove)

[5.1531851]

[5.1531906]

            else if (!monster->can_pass_through(target_grid)
                     || (no_water && target_grid >= DNGN_DEEP_WATER
                         && target_grid <= DNGN_WATER_STUCK))

Insertion in crawl-ref/source/monstuff.cc at line 5596 [5.1396662]
[5.1553568]
[5.1553568]
```
    case MONS_ROCK_WORM:
        return (DNGN_ROCK_WALL);
```

Insertion in crawl-ref/source/monplace.cc at line 59 [5.1641732]

[4.451500]

    if (grid_wanted >= DNGN_ROCK_WALL
        && grid_wanted <= DNGN_CLEAR_PERMAROCK_WALL)
    {
        return (actual_grid >= DNGN_ROCK_WALL &&
                actual_grid <= DNGN_CLEAR_PERMAROCK_WALL);
    }

Replacement in crawl-ref/source/monplace.cc at line 1627 [5.1641732]

B:BD[4.459908] → [8.296:351]

    if (force_place && !grid_is_solid(grd[cr_x][cr_y])

[4.459908]

[8.351]

    if (force_place && mons_class_can_pass(cls, grd[cr_x][cr_y])

Insertion in crawl-ref/source/mon-util.h at line 651 [5.1682293]
[9.18823]
[9.18823]
```
bool mons_class_can_pass(const int mclass, const dungeon_feature_type grid);
```

Insertion in crawl-ref/source/mon-util.cc at line 2392 [5.1699344]

[6.8489]

}
bool mons_class_can_pass(const int mclass, const dungeon_feature_type grid)
{
    // Permanent walls can't be passed through.
    if (grid == DNGN_CLEAR_PERMAROCK_WALL || grid == DNGN_PERMAROCK_WALL)
        return false;
    switch (mclass)
    {
    case MONS_ROCK_WORM:
        return (grid >= DNGN_ROCK_WALL && grid <= DNGN_CLEAR_PERMAROCK_WALL);
    }
    return !grid_is_solid(grid);
}
bool monsters::can_pass_through(const dungeon_feature_type grid) const
{
    return mons_class_can_pass(type, grid);

Insertion in crawl-ref/source/mon-util.cc at line 2414 [5.1699344]

[6.8492]

[10.369]

bool monsters::can_pass_through(const int _x, const int _y) const
{
    return can_pass_through(grd[_x][_y]);
}
bool monsters::can_pass_through(const coord_def &c) const
{
    return can_pass_through(grd(c));
}

Insertion in crawl-ref/source/mon-data.h at line 3897 [5.1826214]
[5.1924940]
[5.1924947]
```
// begin "move through rock" monsters {mpc}
```

Insertion in crawl-ref/source/mon-data.h at line 3899 [5.1826214]

[5.1924949]

[5.1925278]

    MONS_ROCK_WORM, 'w', BROWN, "rock worm",
    M_NO_FLAGS,
    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
    0, 10, MONS_WORM, MONS_ROCK_WORM, MH_NATURAL, -3,
    { {AT_BITE, AF_PLAIN, 20}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
    { 5, 5, 5, 0 },
    3, 12, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_PLANT, 
    12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
},
// end "move through rock" monsters {mpc}
{

Replacement in crawl-ref/source/luadgn.cc at line 1063 [12.1232]

B:BD[11.11792] → [2.1658:1799]

    "unseen", "closed_door", "secret_door", "rock_wall", "stone_wall",
    "metal_wall", "green_crystal_wall", "wax_wall", "permarock_wall",

[11.11792]

[2.1799]

    "unseen", "closed_door", "secret_door", "wax_wall", "metal_wall",
    "green_crystal_wall", "rock_wall", "stone_wall", "permarock_wall",

Insertion in crawl-ref/source/externs.h at line 86 [5.3270163]

[6.81471]


    virtual bool can_pass_through(const dungeon_feature_type grid) const = 0;
    virtual bool can_pass_through(const int x, const int y) const = 0;
    virtual bool can_pass_through(const coord_def &c) const = 0;

Insertion in crawl-ref/source/externs.h at line 754 [5.3270163]

[6.82914]

    bool      can_pass_through(const dungeon_feature_type grid) const;
    bool      can_pass_through(const int x, const int y) const;
    bool      can_pass_through(const coord_def &c) const;

Insertion in crawl-ref/source/externs.h at line 1021 [5.3270163]

[6.83725]

    bool      can_pass_through(const dungeon_feature_type grid) const;
    bool      can_pass_through(const int x, const int y) const;
    bool      can_pass_through(const coord_def &c) const;

Insertion in crawl-ref/source/enum.h at line 796 [5.3287960]

[2.2479]

[5.3307592]

    DNGN_WAX_WALL,
    DNGN_METAL_WALL,
    DNGN_GREEN_CRYSTAL_WALL,           //    5

Deletion in crawl-ref/source/enum.h at line 801 [5.3287960]
B:BD[5.3307633] → [2.2480:2527]
∅:D[2.2527] → [5.3307723:3307752]
B:BD[5.3307723] → [5.3307723:3307752]
B:BD[5.3307752] → [2.2528:2547]
```
    DNGN_METAL_WALL,                   //    5
    DNGN_GREEN_CRYSTAL_WALL,
    DNGN_WAX_WALL,
```
Replacement in crawl-ref/source/enum.h at line 808 [5.3287960]
B:BD[2.2917] → [2.2917:2952]
```
    DNGN_MINWALL = DNGN_ROCK_WALL,
```
[2.2917]
[2.2952]
```
    DNGN_MINWALL = DNGN_WAX_WALL,
```

Insertion in crawl-ref/source/enum.h at line 811 [5.3287960]

[2.2999]

    // Random wall types for big rooms
    DNGN_RNDWALL_MIN = DNGN_METAL_WALL,
    DNGN_RNDWALL_MAX = DNGN_STONE_WALL,

Insertion in crawl-ref/source/enum.h at line 1757 [5.3287960]
[4.922290]
[4.922290]
```
    // Monsters which move through rock:
    MONS_ROCK_WORM = 440,
```

Replacement in crawl-ref/source/dungeon.cc at line 2745 [5.3429798]

B:BD[5.3585840] → [5.3585840:3585900]

        if (j > 0 && grd[sx + dx][sy + dy] > DNGN_ROCK_WALL

[5.3585840]

[5.3585900]

        if (j > 0 && grd[sx + dx][sy + dy] > DNGN_MINWALL

Replacement in crawl-ref/source/dungeon.cc at line 6418 [5.3429798]

B:BD[5.3677570] → [13.14128:14209]

        type_2 = static_cast<dungeon_feature_type>(DNGN_ROCK_WALL + random2(4));

[5.3677570]

[5.3677616]

    {
        const int minwall = DNGN_RNDWALL_MIN;
        const int range   = DNGN_RNDWALL_MAX - DNGN_RNDWALL_MIN + 1;
        type_2 = static_cast<dungeon_feature_type>(minwall + random2(range));
    }

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 1203 [16.17579]
[14.56375]
[15.25955]
```
%%%%
rock worm
A large worm which moves through rock as if it were air.
```

Replacement in crawl-ref/source/acr.cc at line 3606 [5.4397395]

B:BD[4.1280665] → [4.1280665:1280728]

                || grid_is_solid(grd[new_targ_x][new_targ_y]))

[4.1280665]

[5.4473480]

            || !you.can_pass_through(new_targ_x, new_targ_y))

Replacement in crawl-ref/source/acr.cc at line 3621 [5.4397395]

B:BD[3.10948] → [3.10948:11011]

    const bool          targ_solid = grid_is_solid(targ_grid);

[3.10948]

[3.11011]

    const bool           targ_pass  = you.can_pass_through(targ_x, targ_y);

Replacement in crawl-ref/source/acr.cc at line 3680 [5.4397395]
B:BD[5.4477191] → [4.1281557:1281602]
```
    if (!attacking && !targ_solid && moving)
```
[5.4477191]
[5.4477245]
```
    if (!attacking && targ_pass && moving)
```
Replacement in crawl-ref/source/acr.cc at line 3697 [5.4397395]
B:BD[4.1282267] → [4.1282267:1282292]
```
    else if (targ_solid)
```
[4.1282267]
[5.4480216]
```
    else if (!targ_pass)
```

Added to classes actor, monsters and player the method can_pass_through(),

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells2.cc at line 158 [5.569242]

Replacement in crawl-ref/source/player.cc at line 172 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5409 [5.962854]

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/monplace.cc at line 59 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1627 [5.1641732]

Insertion in crawl-ref/source/mon-util.h at line 651 [5.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 2392 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2414 [5.1699344]

Insertion in crawl-ref/source/mon-data.h at line 3897 [5.1826214]

Insertion in crawl-ref/source/mon-data.h at line 3899 [5.1826214]

Replacement in crawl-ref/source/luadgn.cc at line 1063 [12.1232]

Insertion in crawl-ref/source/externs.h at line 86 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 754 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 1021 [5.3270163]

Insertion in crawl-ref/source/enum.h at line 796 [5.3287960]

Deletion in crawl-ref/source/enum.h at line 801 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 808 [5.3287960]

Insertion in crawl-ref/source/enum.h at line 811 [5.3287960]

Insertion in crawl-ref/source/enum.h at line 1757 [5.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 2745 [5.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 6418 [5.3429798]

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 1203 [16.17579]

Replacement in crawl-ref/source/acr.cc at line 3606 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 3621 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 3680 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 3697 [5.4397395]