fiddlerwoaroof/crawl - Change HAI4YDKI72OBDT5KMMVCO3DOU765OPWCU7GTRKTALFNSDOI4R2LAC

Beogh orcs will follow the PC downstairs even if they're not directly adjacent to the player, but are adjacent to other friendly orcs that are (in)directly adjacent to the player.

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

Created by dshaligram on October 26, 2007

HAI4YDKI72OBDT5KMMVCO3DOU765OPWCU7GTRKTALFNSDOI4R2LAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 105 [5.224557]

B:BD[5.226272] → [5.226272:226330]

void tag_followers( void )
{   
    int count_x, count_y;

[5.226272]

[5.226330]

static bool tag_follower_at(const coord_def &pos)
{
    if (!in_bounds(pos) || pos == you.pos())
        return (false);

Replacement in crawl-ref/source/stuff.cc at line 110 [5.224557]

B:BD[5.226331] → [5.226331:226587]

    for (count_x = you.x_pos - 1; count_x <= you.x_pos + 1; count_x++)
    {   
        for (count_y = you.y_pos - 1; count_y <= you.y_pos + 1; count_y++)
        {   
            if (count_x == you.x_pos && count_y == you.y_pos)
                continue;

[5.226331]

[5.226587]

    if (mgrd(pos) == NON_MONSTER)
        return (false);

Replacement in crawl-ref/source/stuff.cc at line 113 [5.224557]

B:BD[5.226588] → [5.226588:226669]

            if (mgrd[count_x][count_y] == NON_MONSTER)
                continue;

[5.226588]

[5.226669]

    monsters *fmenv = &menv[mgrd(pos)];

Replacement in crawl-ref/source/stuff.cc at line 115 [5.224557]

B:BD[5.226670] → [5.226670:226738]

            struct monsters *fmenv = &menv[mgrd[count_x][count_y]];

[5.226670]

[5.226738]

    if (fmenv->type == MONS_PLAYER_GHOST
        || !fmenv->alive()
        || mons_is_stationary(fmenv)
        || fmenv->incapacitated())
    {
        return (false);
    }

Replacement in crawl-ref/source/stuff.cc at line 123 [5.224557]

B:BD[5.226739] → [2.135:372]

∅:D[6.105] → [5.227417:227474]

∅:D[2.372] → [5.227417:227474]

B:BD[5.227417] → [5.227417:227474]

            if (fmenv->type == MONS_PANDEMONIUM_DEMON
                || fmenv->type == MONS_PLAYER_GHOST  // cdl
                || !fmenv->alive()
                || mons_is_stationary(fmenv)
                || fmenv->incapacitated())
            {   
                continue;
            }

[5.226739]

[5.227474]

    if (!monster_habitable_grid(fmenv, DNGN_FLOOR))
        return (false);

Replacement in crawl-ref/source/stuff.cc at line 126 [5.224557]
B:BD[5.227475] → [7.103984:104044]
∅:D[7.104044] → [5.227535:227561]
B:BD[5.227535] → [5.227535:227561]
```
            if (!monster_habitable_grid(fmenv, DNGN_FLOOR))
                continue;
```
[5.227475]
[5.227561]
```
    if (fmenv->speed_increment < 50)
        return (false);
```

Replacement in crawl-ref/source/stuff.cc at line 129 [5.224557]

B:BD[5.227562] → [5.227562:227633]

            if (fmenv->speed_increment < 50)
                continue;

[5.227562]

[5.227633]

    // only friendly monsters, or those actively seeking the
    // player, will follow up/down stairs.
    if (!(mons_friendly(fmenv) ||
          (fmenv->behaviour == BEH_SEEK && fmenv->foe == MHITYOU)))
    {
        return (false);
    }

Replacement in crawl-ref/source/stuff.cc at line 137 [5.224557]

B:BD[5.227634] → [7.104045:104165]

∅:D[7.104165] → [5.227756:227929]

B:BD[5.227756] → [5.227756:227929]

            // only friendly monsters, or those actively seeking the
            // player, will follow up/down stairs.
            if (!(mons_friendly(fmenv) ||
                (fmenv->behaviour == BEH_SEEK && fmenv->foe == MHITYOU)))
            {   
                continue;
            }

[5.227634]

[5.227929]

    // Monsters that are not directly adjacent are subject to more
    // stringent checks.
    if ((pos - you.pos()).abs() > 2)
    {
        if (!mons_friendly(fmenv))
            return (false);

Replacement in crawl-ref/source/stuff.cc at line 144 [5.224557]

B:BD[5.227930] → [5.227930:228033]

            // monster is chasing player through stairs:
            fmenv->flags |= MF_TAKING_STAIRS;

[5.227930]

[5.228033]

        // Orcs will follow Beogh worshippers.
        if (!(mons_species(fmenv->type) == MONS_ORC
              && you.religion == GOD_BEOGH))
            return (false);
    }

Insertion in crawl-ref/source/stuff.cc at line 150 [5.224557]

[5.228034]

    // monster is chasing player through stairs:
    fmenv->flags |= MF_TAKING_STAIRS;

Replacement in crawl-ref/source/stuff.cc at line 154 [5.224557]

B:BD[5.228056] → [8.136:203]

B:BD[8.203] → [9.135:195]

            mprf(MSGCH_DIAGNOSTICS, "%s is marked for following.",
                 fmenv->name(DESC_CAP_THE, true).c_str() );

[5.228056]

[3.140]

    mprf(MSGCH_DIAGNOSTICS, "%s is marked for following.",
         fmenv->name(DESC_CAP_THE, true).c_str() );

Insertion in crawl-ref/source/stuff.cc at line 157 [5.224557]

[3.147]

[5.228237]

    return (true);
}
static int follower_tag_radius2()
{
    // If only friendlies are adjacent, we set a max radius of 6, otherwise
    // only adjacent friendlies may follow.
    coord_def p;
    for (p.x = you.x_pos - 1; p.x <= you.x_pos + 1; ++p.x)
        for (p.y = you.y_pos - 1; p.y <= you.y_pos + 1; ++p.y)
        {
            if (p == you.pos())
                continue;
            if (const monsters *mon = monster_at(p))
            {
                if (!mons_friendly(mon))
                    return (2);
            }

Insertion in crawl-ref/source/stuff.cc at line 176 [5.224557]

[5.228247]

    return (6 * 6);
}
void tag_followers()
{
    const int radius2 = follower_tag_radius2();
    int n_followers = 18;
    std::vector<coord_def> places[2];
    int place_set = 0;
    places[place_set].push_back(you.pos());
    memset(travel_point_distance, 0, sizeof(travel_distance_grid_t));
    while (!places[place_set].empty())
    {
        for (int i = 0, size = places[place_set].size(); i < size; ++i)
        {
            const coord_def &p = places[place_set][i];
            coord_def fp;
            for (fp.x = p.x - 1; fp.x <= p.x + 1; ++fp.x)
                for (fp.y = p.y - 1; fp.y <= p.y + 1; ++fp.y)
                {
                    if (fp == p || (fp - you.pos()).abs() > radius2
                        || !in_bounds(fp) || travel_point_distance[fp.x][fp.y])
                    {
                        continue;
                    }
                    travel_point_distance[fp.x][fp.y] = 1;
                    if (tag_follower_at(fp))
                    {
                        // If we've run out of our follower allowance, bail.
                        if (--n_followers <= 0)
                            return;
                        places[!place_set].push_back(fp);
                    }
                }
        }
        places[place_set].clear();
        place_set = !place_set;

Insertion in crawl-ref/source/files.cc at line 783 [5.3084589]

[10.28946]

[11.1152]

static bool grab_follower_at(const coord_def &pos)
{
    if (pos == you.pos())
        return (false);
    
    monsters *fmenv = monster_at(pos);
    if (!fmenv || !fmenv->alive())
        return (false);
        
    // monster has to be already tagged in order to follow:
    if (!testbits( fmenv->flags, MF_TAKING_STAIRS ))
        return (false);
#if DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "%s is following to %s.",
         fmenv->name(DESC_CAP_THE, true).c_str(),
         level_id::current().describe().c_str());
#endif
    fmenv->set_transit(level_id::current());
    fmenv->destroy_inventory();
    monster_cleanup(fmenv);
    return (true);
}

Replacement in crawl-ref/source/files.cc at line 829 [5.3084589]

B:BD[12.9388] → [12.9388:9544]


            // monster has to be already tagged in order to follow:
            if (!testbits( fmenv->flags, MF_TAKING_STAIRS ))
                continue;

[12.9388]

[12.9544]

        }
    }

Replacement in crawl-ref/source/files.cc at line 832 [5.3084589]

B:BD[12.9545] → [4.581:610]

            if (!can_follow)

[12.9545]

[4.610]

    if (can_follow)
    {
        memset(travel_point_distance, 0, sizeof(travel_distance_grid_t));
        std::vector<coord_def> places[2];
        int place_set = 0;
        places[place_set].push_back(you.pos());
        while (!places[place_set].empty())
        {
            for (int i = 0, size = places[place_set].size(); i < size; ++i)

Replacement in crawl-ref/source/files.cc at line 842 [5.3084589]

B:BD[4.624] → [4.624:773]

                // Monster can't follow us, so clear the follower flag.
                fmenv->flags &= ~MF_TAKING_STAIRS;
                continue;

[4.624]

[4.773]

                const coord_def &p = places[place_set][i];
                coord_def fp;
                for (fp.x = p.x - 1; fp.x <= p.x + 1; ++fp.x)
                    for (fp.y = p.y - 1; fp.y <= p.y + 1; ++fp.y)
                    {
                        if (!in_bounds(fp) || travel_point_distance[fp.x][fp.y])
                            continue;
                        travel_point_distance[fp.x][fp.y] = 1;
                        if (grab_follower_at(fp))
                            places[!place_set].push_back(fp);
                    }

Replacement in crawl-ref/source/files.cc at line 854 [5.3084589]

B:BD[4.787] → [4.787:800]

∅:D[4.800] → [12.9545:9567]

B:BD[12.9545] → [12.9545:9567]

B:BD[12.9567] → [4.801:979]

∅:D[4.979] → [12.9641:9648]

∅:D[13.1791] → [12.9641:9648]

∅:D[9.2946] → [12.9641:9648]

∅:D[14.11655] → [12.9641:9648]

B:BD[12.9641] → [12.9641:9648]

B:BD[12.9649] → [11.1182:1235]

∅:D[11.1235] → [12.9717:9793]

B:BD[12.9717] → [12.9717:9793]

            
#if DEBUG_DIAGNOSTICS
            mprf(MSGCH_DIAGNOSTICS, "%s is following to %s.",
                 fmenv->name(DESC_CAP_THE, true).c_str(),
                 level_id::current().describe().c_str());
#endif
            fmenv->set_transit(level_id::current());
            fmenv->destroy_inventory();
            monster_cleanup(fmenv);

[4.787]

[12.9793]

            places[place_set].clear();
            place_set = !place_set;

Insertion in crawl-ref/source/files.cc at line 858 [5.3084589]

[12.9809]


    // Clear flags on the followers that didn't make it.
    for (int i = 0; i < MAX_MONSTERS; ++i)
    {
        monsters *mons = &menv[i];
        if (!mons->alive())
            continue;
        mons->flags &= ~MF_TAKING_STAIRS;
    }