fiddlerwoaroof/crawl - Change LH4OYDEWEON5QNUCM74R7MNBJDP7O4XRETY74ZMYSXUXYQV427PAC

Enable monsters to move around glass structures if they can see the

player through the walls. Don't use pathfinding to target other monsters, only the player! Monsters of different intelligence have different limits on the distance they may travel to circumvent an obstacle, i.e. zombies will only use a range of 2, whereas highly intelligent monsters can expertly find their way through (transparent) labyrinths, though there's a chance they'll forget their target if they don't see it, so for very long and winding paths it's likely they don't ever arrive.

Will probably affect performance, though I did test on entire levels turned transparent with Vitrification and things seemed to run more or less smoothly.

Ideally, monsters should also be able to move around other obstacles that don't affect visibility (such as water, lava, or statues) but that is currently not possible.

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

Created by j-p-e-g on June 10, 2008

LH4OYDEWEON5QNUCM74R7MNBJDP7O4XRETY74ZMYSXUXYQV427PAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.h at line 53 [6.161012]

B:BD[5.274] → [3.173:734]

    TAG_MINOR_PIETY    = 2,     // Added piety_hysteresis
    TAG_MINOR_QUIVER   = 3,     // Added quiver
    TAG_MINOR_MAPMARK  = 4,     // Added sizes to map markers
    TAG_MINOR_MONNAM   = 5,     // Monsters get individual names
    TAG_MINOR_MONBASE  = 6,     // Zombie base monster gets its own field.
    TAG_MINOR_FPICKUP  = 7,     // Added pickup option for allied monsters.
    TAG_MINOR_MPATROL  = 8,     // Added monster patrol points.
    TAG_MINOR_PATHFIND = 9,     // Added monster pathfinding.
    TAG_MINOR_VERSION  = 9      // Current version

[5.274]

[5.493]

    TAG_MINOR_PIETY    =  2,     // Added piety_hysteresis
    TAG_MINOR_QUIVER   =  3,     // Added quiver
    TAG_MINOR_MAPMARK  =  4,     // Added sizes to map markers
    TAG_MINOR_MONNAM   =  5,     // Monsters get individual names
    TAG_MINOR_MONBASE  =  6,     // Zombie base monster gets its own field.
    TAG_MINOR_FPICKUP  =  7,     // Added pickup option for allied monsters.
    TAG_MINOR_MPATROL  =  8,     // Added monster patrol points.
    TAG_MINOR_PATHFIND =  9,     // Added monster pathfinding.
    TAG_MINOR_TRTARGET = 10,     // Added travel target.
    TAG_MINOR_VERSION  = 10      // Current version

Insertion in crawl-ref/source/tags.cc at line 1772 [6.164589]
[7.453]
[3.736]
```
    int help = m.travel_target;
    marshallByte(th, help);
```

Insertion in crawl-ref/source/tags.cc at line 2044 [6.164589]

[7.549]


    if (_tag_minor_version >= TAG_MINOR_TRTARGET)
    {
        int help = unmarshallByte(th);
        m.travel_target = static_cast<montravel_target_type>(help);
    }

Deletion in crawl-ref/source/monstuff.cc at line 2323 [6.1396662]
B:BD[6.1439584] → [6.1439584:1439585]
Insertion in crawl-ref/source/monstuff.cc at line 2324 [6.1396662]
[7.4883]
[6.1439585]
```
//#define DEBUG_PATHFIND
```
Insertion in crawl-ref/source/monstuff.cc at line 2345 [6.1396662]
[6.1439988]
[2.3266]
```
    bool trans_wall_block = trans_wall_blocking(mon->x, mon->y);
```

Insertion in crawl-ref/source/monstuff.cc at line 2370 [6.1396662]

[6.1440770]

[7.5222]

    dungeon_feature_type can_move;
    if (mons_amphibious(mons_is_zombified(mon) ?
        mon->base_monster : mon->type))
    {
        can_move = DNGN_DEEP_WATER;
    }
    else
        can_move = DNGN_SHALLOW_WATER;

Replacement in crawl-ref/source/monstuff.cc at line 2468 [6.1396662]
B:BD[6.1442374] → [6.1442374:1442403]
```
    // validate target again
```
[6.1442374]
[8.13644]
```
    // Validate target again.
```

Replacement in crawl-ref/source/monstuff.cc at line 2487 [6.1396662]

B:BD[6.1442817] → [6.1442817:1442887]

                foe_x = you.x_pos;
                foe_y = you.y_pos;

[6.1442817]

[6.1442887]

                foe_x   = you.x_pos;
                foe_y   = you.y_pos;

Replacement in crawl-ref/source/monstuff.cc at line 2507 [6.1396662]
B:BD[6.1443587] → [6.1443587:1443633]
```
        // take care of monster state changes
```
[6.1443587]
[7.5680]
```
        // Take care of monster state changes.
```

Insertion in crawl-ref/source/monstuff.cc at line 2536 [6.1396662]

[6.1444364]

[7.5774]

                if (mon->foe == MHITYOU && travelling
                    && mon->travel_target == MTRAV_PLAYER)
                {
#ifdef DEBUG_PATHFIND
                    mpr("Player out of LoS... start wandering.");
#endif
                    new_beh = BEH_WANDER;
                    // We've got a target, so we'll continue on our way.
                    break;
                }

Replacement in crawl-ref/source/monstuff.cc at line 2575 [6.1396662]

B:BD[6.1445197] → [9.9798:9849]

                            if (check_awaken(mon))

[6.1445197]

[6.1445263]

                            if (random2(you.skills[SK_STEALTH]/3))

Insertion in crawl-ref/source/monstuff.cc at line 2631 [6.1396662]

[6.1447273]

[7.6048]

                if (proxPlayer && !trans_wall_block)
                {
                    if (travelling && mon->travel_target != MTRAV_PATROL)
                    {
                        mon->travel_path.clear();
                        mon->travel_target = MTRAV_NONE;
                    }
                }
                else if (proxPlayer && trans_wall_block
                         && (mon->travel_target != MTRAV_UNREACHABLE
                             || one_chance_in(8)))
                {
#ifdef DEBUG_PATHFIND
                    mprf("%s: Player out of reach! What now?",
                         mon->name(DESC_PLAIN).c_str());
#endif
                    // If we're already on our way, do nothing.
                    if (travelling && mon->travel_target == MTRAV_PLAYER)
                    {
#ifdef DEBUG_PATHFIND
                        mpr("Already travelling...");
#endif
                        int len = mon->travel_path.size();
                        coord_def targ = mon->travel_path[len - 1];
                        if (grid_see_grid(targ.x, targ.y, you.x_pos, you.y_pos)
                            && !trans_wall_blocking(targ.x, targ.y))
                        {
#ifdef DEBUG_PATHFIND
                            mpr("Target still valid...");
#endif
                            // Current target still valid?
                            if (mon->x == mon->travel_path[0].x
                                && mon->y == mon->travel_path[0].y)
                            {
                                // Get next waypoint.
                                mon->travel_path.erase(
                                    mon->travel_path.begin() );
                                if (!mon->travel_path.empty())
                                {
                                    mon->target_x = mon->travel_path[0].x;
                                    mon->target_y = mon->travel_path[0].y;
                                    break;
                                }
                            }
                            else if (grid_see_grid(mon->x, mon->y,
                                                   mon->travel_path[0].x,
                                                   mon->travel_path[0].y,
                                                   can_move))
                            {
                                mon->target_x = mon->travel_path[0].x;
                                mon->target_y = mon->travel_path[0].y;
                                break;
                            }
                        }
                    }
                    // Use pathfinding to find a (new) path to the player.
                    const int dist = grid_distance(mon->x, mon->y,
                                                   you.x_pos, you.y_pos);
#ifdef DEBUG_PATHFIND
                    mprf("Need to calculate a path... (dist = %d)", dist);
#endif
                    const bool native =
                        mons_is_native_in_branch(mon, you.where_are_you);
                    int range = 0;
                    switch (mons_intel(mon->type))
                    {
                    case I_PLANT:
                        range = 2;
                        break;
                    case I_INSECT:
                        range = 3;
                        break;
                    case I_ANIMAL:
                        range = 5;
                        break;
                    case I_NORMAL:
                        range = 10;
                        break;
                    default:
                        // Highly intelligent monsters can find their way
                        // anywhere.
                        range = 0;
                        break;
                    }
                    if (range && native)
                        range += 3;
                    if (range > 0 && dist > range)
                    {
                        mon->travel_target = MTRAV_UNREACHABLE;
#ifdef DEBUG_PATHFIND
                        mprf("Distance too great, don't attempt pathfinding! (%s)",
                             mon->name(DESC_PLAIN).c_str());
#endif
                    }
                    else
                    {
#ifdef DEBUG_PATHFIND
                        mprf("Need a path for %s from (%d, %d) to (%d, %d), "
                             "max. dist = %d",
                             mon->name(DESC_PLAIN).c_str(), mon->x, mon->y,
                             you.x_pos, you.y_pos, range);
#endif
                        monster_pathfind mp;
                        if (range > 0)
                            mp.set_range(range);
                        if (mp.start_pathfind(mon, coord_def(you.x_pos,
                                                             you.y_pos)))
                        {
                            mon->travel_path = mp.calc_waypoints();
                            if (!mon->travel_path.empty())
                            {
                                // Okay then, we found a path. Let's use it!
                                mon->target_x = mon->travel_path[0].x;
                                mon->target_y = mon->travel_path[0].y;
                                mon->travel_target = MTRAV_PLAYER;
                                break;
                            }
                            else
                            {
#ifdef DEBUG_PATHFIND
                                mpr("No path found!");
#endif
                                mon->travel_target = MTRAV_UNREACHABLE;
                            }
                        }
                        else
                        {
#ifdef DEBUG_PATHFIND
                            mpr("No path found!");
#endif
                            mon->travel_target = MTRAV_UNREACHABLE;
                        }
                    }
                }

Replacement in crawl-ref/source/monstuff.cc at line 2817 [6.1396662]

B:BD[10.7355] → [3.4091:4217]

                || !travelling && (one_chance_in(20)
                                   || testbits( mon->flags, MF_BATTY )))

[10.7355]

[6.1449129]

                || one_chance_in(20)
                || testbits( mon->flags, MF_BATTY ))

Insertion in crawl-ref/source/monstuff.cc at line 2832 [6.1396662]

[3.4692]

#ifdef DEBUG_PATHFIND
                        mpr("Arrived at first waypoint.");
#endif

Insertion in crawl-ref/source/monstuff.cc at line 2838 [6.1396662]

[3.4885]

                        {
#ifdef DEBUG_PATHFIND
                            mpr("We reached the end of our path: stop "
                                "travelling.");
#endif
                            mon->travel_target = MTRAV_NONE;

Replacement in crawl-ref/source/monstuff.cc at line 2845 [6.1396662]

B:BD[3.4933] → [3.4933:5060]


                        mon->target_x = mon->travel_path[0].x;
                        mon->target_y = mon->travel_path[0].y;

[3.4933]

[3.5060]

                        }
                        else
                        {
                            mon->target_x = mon->travel_path[0].x;
                            mon->target_y = mon->travel_path[0].y;

Replacement in crawl-ref/source/monstuff.cc at line 2851 [6.1396662]

B:BD[3.5082] → [3.5082:5198]

                        mprf("Next waypoint: (%d, %d)",
                             mon->target_x, mon->target_y);

[3.5082]

[3.5198]

                            mprf("Next waypoint: (%d, %d)",
                                 mon->target_x, mon->target_y);

Insertion in crawl-ref/source/monstuff.cc at line 2854 [6.1396662]
[3.5205]
[3.5205]
```
                        }
```

Replacement in crawl-ref/source/monstuff.cc at line 2856 [6.1396662]

B:BD[3.5227] → [3.5227:5252]

                    else

[3.5227]

[3.5252]

                    else if (!grid_see_grid(mon->x, mon->y,
                                            mon->travel_path[0].x,
                                            mon->travel_path[0].y, can_move))

Insertion in crawl-ref/source/monstuff.cc at line 2860 [6.1396662]

[3.5274]

#ifdef DEBUG_PATHFIND
                        mpr("Can't see waypoint grid.");
#endif

Deletion in crawl-ref/source/monstuff.cc at line 2871 [6.1396662]

B:BD[3.5680] → [3.5680:6062]

                        dungeon_feature_type can_move;
                        if (mons_amphibious(mons_is_zombified(mon) ?
                            mon->base_monster : mon->type))
                        {
                            can_move = DNGN_DEEP_WATER;
                        }
                        else
                            can_move = DNGN_SHALLOW_WATER;

Replacement in crawl-ref/source/monstuff.cc at line 2886 [6.1396662]

B:BD[3.6797] → [3.6797:6838]

                        if (erase != -1)

[3.6797]

[3.6838]

                        if (erase > 0)

Insertion in crawl-ref/source/monstuff.cc at line 2888 [6.1396662]

[3.6864]

#ifdef DEBUG_PATHFIND
                            mprf("Need to erase %d of %d waypoints.",
                                 erase, mon->travel_path.size());
#endif

Insertion in crawl-ref/source/monstuff.cc at line 2904 [6.1396662]
[3.7452]
[3.7452]
```
/*
```

Replacement in crawl-ref/source/monstuff.cc at line 2906 [6.1396662]

B:BD[3.7501] → [3.7501:7582]

                            if (mp.start_pathfind(mon, mon->patrol_point, true))

[3.7501]

[3.7582]

                            int len = mon->travel_path.size();
                            if (mp.start_pathfind(mon, mon->travel_path[len-1]))

Insertion in crawl-ref/source/monstuff.cc at line 2915 [6.1396662]

[3.7965]

                                else
                                {
                                    mon->travel_target = MTRAV_NONE;
                                    need_target = true;
                                }

Insertion in crawl-ref/source/monstuff.cc at line 2923 [6.1396662]

[3.8058]

*/
                                // Or just forget about the whole thing.

Insertion in crawl-ref/source/monstuff.cc at line 2926 [6.1396662]

[3.8116]

                                mon->travel_target = MTRAV_NONE;

Replacement in crawl-ref/source/monstuff.cc at line 2928 [6.1396662]
B:BD[3.8168] → [3.8168:8198]
```
                            }
```
[3.8168]
[3.8198]
```
//                            }
```

Insertion in crawl-ref/source/monstuff.cc at line 2931 [6.1396662]

[3.8246]

                    else
                    {
#ifdef DEBUG_PATHFIND
                        mpr("All clear. Continue travelling.");
#endif
                    }

Insertion in crawl-ref/source/monstuff.cc at line 2941 [6.1396662]
[7.6196]
[11.5157]
```
                    need_target = false;
```

Insertion in crawl-ref/source/monstuff.cc at line 2965 [6.1396662]

[12.7887]

                                mon->travel_target = MTRAV_NONE;
                                need_target = true;

Replacement in crawl-ref/source/monstuff.cc at line 2977 [6.1396662]

B:BD[3.8362] → [3.8362:8443]

                            if (mp.start_pathfind(mon, mon->patrol_point, true))

[3.8362]

[3.8443]

                            if (mp.start_pathfind(mon, mon->patrol_point))

Insertion in crawl-ref/source/monstuff.cc at line 2984 [6.1396662]

[3.8792]

                                    mon->travel_target = MTRAV_PATROL;
                                }
                                else
                                {
                                    mon->target_x = mon->patrol_point.x;
                                    mon->target_y = mon->patrol_point.y;

Replacement in crawl-ref/source/monstuff.cc at line 2995 [6.1396662]

B:BD[3.8971] → [3.8971:9040]

                                mon->patrol_point = coord_def(0, 0);

[3.8971]

[3.9040]

                                mon->patrol_point  = coord_def(0, 0);
                                mon->travel_target = MTRAV_NONE;
                                need_target = true;

Replacement in crawl-ref/source/monstuff.cc at line 3011 [6.1396662]
B:BD[7.6519] → [3.9447:9485]
```
                else if (need_target)
```
[7.6519]
[7.6540]
```
                if (need_target)
```

Insertion in crawl-ref/source/monstuff.cc at line 3030 [6.1396662]

[8.13902]

[6.1449626]

                if (travelling && mon->travel_target != MTRAV_PATROL)
                {
#ifdef DEBUG_PATHFIND
                    mpr("It's been too long! Stop travelling.");
#endif
                    mon->travel_path.clear();
                    mon->travel_target = MTRAV_NONE;
                }

Replacement in crawl-ref/source/monstuff.cc at line 3042 [6.1396662]
B:BD[6.1449683] → [6.1449683:1449715]
```
            // check for healed
```
[6.1449683]
[6.1449715]
```
            // Check for healed.
```
Insertion in crawl-ref/source/monplace.h at line 321 [6.1638277]
[13.3048]
[13.3048]
```
    void set_range(int r);
```

Insertion in crawl-ref/source/monplace.h at line 342 [6.1638277]

[13.3652]


    // Maximum range to search between start and target. None, if zero.
    int range;

Insertion in crawl-ref/source/monplace.cc at line 2300 [6.1641732]
[13.4235]
[13.4235]
```
//#define DEBUG_PATHFIND
```

Replacement in crawl-ref/source/monplace.cc at line 2302 [6.1641732]

B:BD[13.4272] → [13.4272:4326]

    : mons(), target(), min_length(0), dist(), prev()

[13.4272]

[13.4326]

    : mons(), target(), range(0), min_length(0), max_length(0), dist(), prev()

Insertion in crawl-ref/source/monplace.cc at line 2310 [6.1641732]

[13.4374]

void monster_pathfind::set_range(int r)
{
    if (r >= 0)
        range = r;
}

Insertion in crawl-ref/source/monplace.cc at line 2394 [6.1641732]

[13.5999]

            continue;
        // Ignore this grid if it takes us above the allowed distance.
        if (range && estimated_cost(npos) > range)

Replacement in crawl-ref/source/mon-util.cc at line 2696 [6.1699344]

B:BD[14.5429] → [3.11071:11123]

      target_x(0), target_y(0), patrol_point(0, 0),

[14.5429]

[3.11123]

      target_x(0), target_y(0), patrol_point(0, 0), travel_target(MTRAV_NONE),

Replacement in crawl-ref/source/mon-util.cc at line 2748 [6.1699344]
B:BD[15.8167] → [7.11615:11651]
```
    patrol_point = coord_def(0, 0);
```
[15.8167]
[3.11380]
```
    patrol_point  = coord_def(0, 0);
    travel_target = MTRAV_NONE;
```
Insertion in crawl-ref/source/mon-util.cc at line 2771 [6.1699344]
[7.11694]
[3.11406]
```
    travel_target     = mon.travel_target;
```

Deletion in crawl-ref/source/items.cc at line 2250 [6.2584728]

B:BD[16.6806] → [4.2631:2736]

#ifdef CLUA_BINDINGS
                    && clua.callbooleanfn(true, "ch_autopickup", "u", &item)
#endif

Insertion in crawl-ref/source/externs.h at line 1027 [6.3270163]
[7.14028]
[3.12615]
```
    montravel_target_type travel_target;
```

Replacement in crawl-ref/settings/init.txt at line 92 [6.4830895]

B:BD[17.2462] → [18.10833:10856]

B:BD[18.10856] → [4.8383:8517]

autopickup = $?!+"/%)
# Note that ")" have to be in the above list for pickup.lua
# (autopickup a butchering tool if you don't already have one)
# to work.

[17.2462]

[18.11021]

autopickup = $?!+"/%

Enable monsters to move around glass structures if they can see the

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tags.h at line 53 [6.161012]

Insertion in crawl-ref/source/tags.cc at line 1772 [6.164589]

Insertion in crawl-ref/source/tags.cc at line 2044 [6.164589]

Deletion in crawl-ref/source/monstuff.cc at line 2323 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2324 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2345 [6.1396662]