fiddlerwoaroof/crawl - Change DMG73XDQHY2X2PHKWIY56XKD3O4NPGZKKIO6GX3IV2LLRVXPGKYQC

Add a line on good gods disapproving of certain items to their

description (evil_item). Same for evil_eating.

In another step on the way to monster pathfinding, take the shortest path and extract a vector of waypoints out of it.

When experimenting with ways to do this I noticed that grid_see_grid is not symmetrical (A may see B but not vice versa); I'm not sure what effects that could have. It won't directly affect the player as the checks for monster sees player and player sees monster both use the player LoS, but it could have an effect on friendly monsters fighting enemy ones, I guess.

Also, I don't think num_feats_between needs the shortest beam available (called with false now). In fact, that seemed to hurt visibility a bit, probably because of attempting to take vision obstructing shortcuts. If this reasoning is wrong, please speak up and/or correct it. (I sure hope not because the shortest beam calculation has some more overhead that can be avoided this way.)

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

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

DMG73XDQHY2X2PHKWIY56XKD3O4NPGZKKIO6GX3IV2LLRVXPGKYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1103 [7.16817]
∅:D[5.2409] → [6.857:908]
B:BD[6.857] → [6.857:908]
```
            env.show[ex][ey] = DNGN_INVIS_EXPOSED;
```
[5.2409]
[8.12]
```
            env.show[ex][ey]     = DNGN_INVIS_EXPOSED;
```
Replacement in crawl-ref/source/view.cc at line 1109 [7.16817]
B:BD[6.991] → [6.991:1028]
```
    // mimics are always left on map
```
[6.991]
[6.1028]
```
    // Mimics are always left on map.
```

Replacement in crawl-ref/source/view.cc at line 1113 [7.16817]

B:BD[6.1103] → [6.1103:1166]

    env.show[ex][ey] = monster->type + DNGN_START_OF_MONSTERS;

[6.1103]

[6.1166]

    env.show[ex][ey]     = monster->type + DNGN_START_OF_MONSTERS;

Replacement in crawl-ref/source/view.cc at line 1459 [7.16817]
∅:D[5.3468] → [6.3861:3896]
B:BD[6.3861] → [6.3861:3896]
```
    env.show[ex][ey] = DNGN_CLOUD;
```
[5.3468]
[9.425]
```
    env.show[ex][ey]     = DNGN_CLOUD;
```
Replacement in crawl-ref/source/view.cc at line 2333 [7.16817]
∅:D[5.6470] → [10.928:975]
B:BD[10.928] → [10.928:975]
```
        // yeah, yeah, this is O(n^2). I know.
```
[5.6470]
[10.975]
```
        // Yeah, yeah, this is O(n^2). I know.
```
Replacement in crawl-ref/source/view.cc at line 2335 [7.16817]
B:BD[10.999] → [10.999:1043]
```
        for ( int i = 0; i < fullray; ++i )
```
[10.999]
[10.1043]
```
        for (int i = 0; i < fullray; ++i)
```

Replacement in crawl-ref/source/view.cc at line 2338 [7.16817]

B:BD[7.66403] → [11.29587:29657]

        for ( cellray = 0; cellray < raylengths[fullray]; ++cellray )

[7.66403]

[11.29657]

        for (cellray = 0; cellray < raylengths[fullray]; ++cellray)

Replacement in crawl-ref/source/view.cc at line 2340 [7.16817]

B:BD[11.29667] → [11.29667:29729]

B:BD[11.29729] → [10.1085:1146]

            if ( ray_coord_x[cellray + cur_offset] == absx &&
                 ray_coord_y[cellray + cur_offset] == absy )

[11.29667]

[10.1146]

            if (ray_coord_x[cellray + cur_offset] == absx
                && ray_coord_y[cellray + cur_offset] == absy)

Replacement in crawl-ref/source/view.cc at line 2349 [7.16817]

B:BD[7.66709] → [11.29793:29842]

                // check if we're blocked so far

[7.66709]

[11.29842]

                // Check if we're blocked so far.

Replacement in crawl-ref/source/view.cc at line 2353 [7.16817]

B:BD[12.3023] → [13.311:372]

                for ( inray = 0; inray <= cellray; ++inray )

[12.3023]

[10.1221]

                for (inray = 0; inray <= cellray; ++inray)

Replacement in crawl-ref/source/view.cc at line 2422 [7.16817]

∅:D[14.1221] → [12.5721:5751]

B:BD[12.5721] → [12.5721:5751]

B:BD[12.5751] → [14.1222:1263]

B:BD[14.1263] → [5.6724:6929]

                if ( !blocked
                     &&  (!find_shortest
                          || _superior_ray(shortest, imbalance,
                                           real_length, cimbalance,
                                           slope_diff, ray_slope_diff)))

[14.1221]

[7.67261]

                if (!blocked
                    &&  (!find_shortest
                         || _superior_ray(shortest, imbalance,
                                          real_length, cimbalance,
                                          slope_diff, ray_slope_diff)))

Replacement in crawl-ref/source/view.cc at line 2428 [7.16817]
B:BD[7.67279] → [11.30214:30246]
```
                    // success!
```
[7.67279]
[14.1466]
```
                    // Success!
```
Insertion in crawl-ref/source/view.cc at line 2440 [7.16817]
[11.30483]
[11.30483]
Insertion in crawl-ref/source/view.cc at line 2443 [7.16817]
[11.30565]
[5.6930]

Replacement in crawl-ref/source/view.cc at line 2446 [7.16817]

B:BD[12.6085] → [12.6085:6122]

                        return true;

[12.6085]

[7.67328]

                        return (true);

Replacement in crawl-ref/source/view.cc at line 2455 [7.16817]
∅:D[8.450] → [15.553:579]
∅:D[12.6208] → [15.553:579]
B:BD[11.30694] → [15.553:579]
```
    if ( allow_fallback )
```
[8.450]
[15.579]
```
    if (allow_fallback)
```
Replacement in crawl-ref/source/view.cc at line 2459 [7.16817]
B:BD[11.30790] → [11.30790:30824]
```
        if ( targetx == sourcex )
```
[11.30790]
[14.1662]
```
        if (targetx == sourcex)
```
Replacement in crawl-ref/source/view.cc at line 2463 [7.16817]
∅:D[15.609] → [11.30872:30915]
B:BD[11.30872] → [11.30872:30915]
```
            ray.slope = targety - sourcey;
```
[15.609]
[11.30915]
```
            ray.slope  = targety - sourcey;
```
Replacement in crawl-ref/source/view.cc at line 2465 [7.16817]
B:BD[11.30959] → [11.30959:30992]
```
            if ( ray.slope < 0 )
```
[11.30959]
[11.30992]
```
            if (ray.slope < 0)
```
Replacement in crawl-ref/source/view.cc at line 2470 [7.16817]
∅:D[10.1318] → [11.31109:31130]
B:BD[11.31109] → [11.31109:31130]
```
        return true;
```
[10.1318]
[11.31130]
```
        return (true);
```
Replacement in crawl-ref/source/view.cc at line 2472 [7.16817]
B:BD[11.31136] → [11.31136:31154]
```
    return false;
```
[11.31136]
[16.680]
```
    return (false);
```
Deletion in crawl-ref/source/view.cc at line 2490 [7.16817]
B:BD[16.1257] → [16.1257:1335]
```
    find_ray( sourcex, sourcey, targetx, targety, true, ray, 0, true, true );
```

Insertion in crawl-ref/source/view.cc at line 2491 [7.16817]

[16.1336]

    // We don't need to find the shortest beam, any beam will suffice.
    find_ray( sourcex, sourcey, targetx, targety, true, ray, 0, false, true );

Replacement in crawl-ref/source/view.cc at line 3504 [7.16817]
B:BD[7.79084] → [17.79:108]
```
// Returns true if succeeded
```
[7.79084]
[18.117]
```
// Returns true if succeeded.
```
Replacement in crawl-ref/source/view.cc at line 3617 [7.16817]
B:BD[7.88244] → [7.88244:88299]
```
// realize that this is simply a repackaged version of
```
[7.87783]
[7.88299]
```
// Realize that this is simply a repackaged version of
```
Replacement in crawl-ref/source/view.cc at line 3621 [7.16817]
B:BD[7.88419] → [7.88419:88447]
```
    // early out -- no foe!
```
[7.88419]
[7.88447]
```
    // Early out -- no foe!
```
Replacement in crawl-ref/source/view.cc at line 3636 [7.16817]
B:BD[7.88832] → [7.88832:88857]
```
    // must be a monster
```
[7.88832]
[19.134]
```
    // Must be a monster.
```
Replacement in crawl-ref/source/view.cc at line 3648 [7.16817]
B:BD[7.89142] → [7.89142:89193]
```
}                               // end mons_near()
```
[7.89142]
[20.59]
```
}
```

Replacement in crawl-ref/source/view.cc at line 3686 [7.16817]

B:BD[11.39823] → [21.999:1070]

// answers the question: "Is a grid within character's line of sight?"

[11.39823]

[21.1070]

// Answers the question: "Is a grid within character's line of sight?"

Insertion in crawl-ref/source/view.cc at line 3709 [7.16817]

[22.503]

// XXX: It turns out the beams are not symmetrical, i.e. switching
// pos1 and pos2 may result in small variations.

Insertion in crawl-ref/source/monplace.h at line 306 [7.1638277]
[3.3166]
[3.3166]
```
    std::vector<coord_def> calc_waypoints(void);
```

Replacement in crawl-ref/source/monplace.cc at line 2332 [7.1641732]

B:BD[3.6441] → [3.6441:6551]

                mprf("Adding (%d,%d) to hash (total dist = %d)",
                     npos.x, npos.y, total);

[3.6441]

[3.6551]

//                mprf("Adding (%d,%d) to hash (total dist = %d)",
//                     npos.x, npos.y, total);

Replacement in crawl-ref/source/monplace.cc at line 2341 [7.1641732]

B:BD[3.6719] → [3.6719:6823]

                mprf("Improving (%d,%d) to total dist %d",
                     npos.x, npos.y, total);

[3.6719]

[3.6823]

//                mprf("Improving (%d,%d) to total dist %d",
//                     npos.x, npos.y, total);

Deletion in crawl-ref/source/monplace.cc at line 2371 [7.1641732]
B:BD[3.7468] → [3.7468:7536]
```
//    mprf("minlength: %d, maxlength: %d", min_length, max_length);
```

Replacement in crawl-ref/source/monplace.cc at line 2380 [7.1641732]

B:BD[3.7813] → [3.7813:7928]

            mprf("Returning (%d, %d) as best pos with total dist %d.",
                 pos.x, pos.y, min_length);

[3.7813]

[3.7928]

//            mprf("Returning (%d, %d) as best pos with total dist %d.",
//                 pos.x, pos.y, min_length);

Replacement in crawl-ref/source/monplace.cc at line 2408 [7.1641732]

B:BD[3.8428] → [3.8428:8567]

        mprf("prev: (%d, %d), pos: (%d, %d)", Compass[dir].x, Compass[dir].y,
                                              pos.x, pos.y);

[3.8428]

[3.8567]

//        mprf("prev: (%d, %d), pos: (%d, %d)", Compass[dir].x, Compass[dir].y,
//                                              pos.x, pos.y);

Insertion in crawl-ref/source/monplace.cc at line 2419 [7.1641732]

[3.8730]

[11.462927]

}
// Reduces the path coordinates to only a couple of key waypoints needed
// to reach the target.
std::vector<coord_def> monster_pathfind::calc_waypoints()
{
    std::vector<coord_def> path = backtrack();
    // If no path found, nothing to be done.
    if (path.empty())
        return path;
    dungeon_feature_type can_move;
    if (mons_amphibious(mons_is_zombified(mons) ? mons->base_monster
                                                : mons->type))
    {
        can_move = DNGN_DEEP_WATER;
    }
    else
        can_move = DNGN_SHALLOW_WATER;
    std::vector<coord_def> waypoints;
    pos = path[0];
    for (unsigned int i = 1; i < path.size(); i++)
    {
        if (grid_see_grid(pos.x, pos.y, path[i].x, path[i].y, can_move))
            continue;
        else
        {
            pos = path[i-1];
            waypoints.push_back(pos);
        }
    }
    return waypoints;

Replacement in crawl-ref/source/mon-util.cc at line 1272 [7.1699344]
B:BD[7.1716659] → [7.1716659:1716714]
```
// this nice routine we keep in exactly the way it was
```
[7.1716659]
[7.1716714]
```
// This nice routine we keep in exactly the way it was-
```
Replacement in crawl-ref/source/mon-util.cc at line 1284 [7.1699344]
B:BD[7.1716946] → [7.1716946:1716998]
```
}                               // end hit_points()
```
[7.1716946]
[7.1716998]
```
}
```
Replacement in crawl-ref/source/mon-util.cc at line 1288 [7.1699344]
B:BD[7.1717134] → [2.2549:2600]
```
// XXX: rename to mons_class_* to be like the rest
```
[7.1717134]
[7.1717134]
```
// XXX: Rename to mons_class_* to be like the rest.
```

Replacement in crawl-ref/source/mon-util.cc at line 6082 [7.1699344]

B:BD[23.7716] → [23.7716:7823]

        const bool needs_message =
            spawned && mons_near(this) && player_monster_visible(this);

[23.7716]

[24.11915]

        const bool needs_message = spawned && mons_near(this)
                                   && player_monster_visible(this);

Insertion in crawl-ref/source/mon-util.cc at line 6092 [7.1699344]
[23.8124]
[23.8124]
Replacement in crawl-ref/source/enum.h at line 866 [7.3287960]
B:BD[25.2863] → [26.4275:4324]
```
    // lowest/highest grid value which is a wall
```
[25.2863]
[27.3894]
```
    // Lowest/highest grid value which is a wall.
```
Replacement in crawl-ref/source/enum.h at line 870 [7.3287960]
B:BD[25.2999] → [27.3929:3968]
```
    // Random wall types for big rooms
```
[25.2999]
[27.3968]
```
    // Random wall types for big rooms.
```
Replacement in crawl-ref/source/enum.h at line 874 [7.3287960]
B:BD[27.4049] → [26.4325:4367]
```
    // highest grid value which is opaque
```
[27.4049]
[25.3046]
```
    // Highest grid value which is opaque.
```
Replacement in crawl-ref/source/enum.h at line 877 [7.3287960]
B:BD[7.3307969] → [26.4368:4419]
```
    // lowest grid value which can be seen through
```
[7.3307969]
[25.3089]
```
    // Lowest grid value which can be seen through.
```

Replacement in crawl-ref/source/enum.h at line 880 [7.3287960]

B:BD[28.2930] → [26.4420:4477]

    // highest grid value which can't be reached through

[28.2930]

[26.4477]

    // Highest grid value which can't be reached through.

Replacement in crawl-ref/source/enum.h at line 888 [7.3287960]

B:BD[28.3007] → [26.4629:4690]

    // lowest grid value which can be passed by walking etc.

[28.3007]

[28.3073]

    // Lowest grid value which can be passed by walking etc.

Replacement in crawl-ref/source/directn.cc at line 1018 [7.3697945]

B:BD[29.5934381] → [29.5934381:5934463]

B:BD[29.5934463] → [30.7510:7680]

        // tiles always need a beam redraw if show_beam is true (and if valid...)
        if ( need_beam_redraw
             || show_beam && find_ray(you.x_pos, you.y_pos, moves.tx, moves.ty,
                                      true, ray, 0, true) )

[29.5934381]

[29.5934593]

        // Tiles always need a beam redraw if show_beam is true (and valid...)
        if (need_beam_redraw
            || show_beam && find_ray(you.x_pos, you.y_pos, moves.tx, moves.ty,
                                     true, ray, 0, true) )

Insertion in crawl-ref/source/describe.cc at line 1639 [7.3736416]

[31.15007]

[7.3841714]

    case OBJ_CORPSES:
        if (item.sub_type == CORPSE_SKELETON)
            break;
        // intentional fall-through

Insertion in crawl-ref/source/describe.cc at line 1692 [7.3736416]

[32.11066]

[33.10868]

            if (is_good_god(you.religion) && is_player_same_species(item.plus)
                || you.religion == GOD_ZIN
                   && mons_intel(item.plus) >= I_NORMAL)
            {
                description << "$$" << god_name(you.religion) << " disapproves "
                               "of eating such meat.";
            }

Deletion in crawl-ref/source/describe.cc at line 1761 [7.3736416]
∅:D[31.16405] → [7.3843103:3843125]
B:BD[7.3843103] → [7.3843103:3843125]
```
    case OBJ_CORPSES:
```

Insertion in crawl-ref/source/describe.cc at line 1799 [7.3736416]

[34.467]

[7.3843992]

    }
    if (is_good_god(you.religion) && is_evil_item(item)
        && item_type_known(item))
    {
        description << "$$" << god_name(you.religion) << " disapproves of the "
                    << "use of such an item.";

Replacement in crawl-ref/source/describe.cc at line 1843 [7.3736416]
B:BD[7.3844089] → [35.4178:4226]
```
// Return true if spells can be shown to player
```
[7.3844089]
[35.4226]
```
// Returns true if spells can be shown to player.
```

Insertion in crawl-ref/source/debug.cc at line 4104 [7.4016436]

[3.12445]

        mpr(path_str.c_str());
        mprf("-> path length: %d", path.size());

Insertion in crawl-ref/source/debug.cc at line 4107 [7.4016436]

[3.12446]

        mpr(EOL);
        path = mp.calc_waypoints();
        path_str = "";
        mpr(EOL);
        mpr("And here are the needed waypoints: ");
        for (unsigned int i = 0; i < path.size(); i++)
        {
            snprintf(info, INFO_SIZE, "(%d, %d)  ", path[i].x, path[i].y);
            path_str += info;
        }

Insertion in crawl-ref/source/debug.cc at line 4118 [7.4016436]
[3.12477]
[3.12477]
```
        mprf("-> #waypoints: %d", path.size());
```
Deletion in crawl-ref/settings/food_colouring.txt at line 11 [36.12654]
B:BD[36.13947] → [4.3742:3768]
```
inv = $evil:.*evil_item.*
```
Insertion in crawl-ref/settings/food_colouring.txt at line 12 [36.12654]
[4.3796]
[37.6395]
```
inv = $evil:.*evil_item.*
```

Add a line on good gods disapproving of certain items to their

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1103 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1109 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1113 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1459 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2333 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2335 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2338 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2340 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2349 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2353 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2422 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2428 [7.16817]

Insertion in crawl-ref/source/view.cc at line 2440 [7.16817]

Insertion in crawl-ref/source/view.cc at line 2443 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2446 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2455 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2459 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2463 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2465 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2470 [7.16817]

Replacement in crawl-ref/source/view.cc at line 2472 [7.16817]

Deletion in crawl-ref/source/view.cc at line 2490 [7.16817]

Insertion in crawl-ref/source/view.cc at line 2491 [7.16817]

Replacement in crawl-ref/source/view.cc at line 3504 [7.16817]

Replacement in crawl-ref/source/view.cc at line 3617 [7.16817]

Replacement in crawl-ref/source/view.cc at line 3621 [7.16817]

Replacement in crawl-ref/source/view.cc at line 3636 [7.16817]

Replacement in crawl-ref/source/view.cc at line 3648 [7.16817]

Replacement in crawl-ref/source/view.cc at line 3686 [7.16817]

Insertion in crawl-ref/source/view.cc at line 3709 [7.16817]

Insertion in crawl-ref/source/monplace.h at line 306 [7.1638277]

Replacement in crawl-ref/source/monplace.cc at line 2332 [7.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2341 [7.1641732]

Deletion in crawl-ref/source/monplace.cc at line 2371 [7.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2380 [7.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2408 [7.1641732]

Insertion in crawl-ref/source/monplace.cc at line 2419 [7.1641732]

Replacement in crawl-ref/source/mon-util.cc at line 1272 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1284 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1288 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6082 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 6092 [7.1699344]

Replacement in crawl-ref/source/enum.h at line 866 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 870 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 874 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 877 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 880 [7.3287960]

Replacement in crawl-ref/source/enum.h at line 888 [7.3287960]

Replacement in crawl-ref/source/directn.cc at line 1018 [7.3697945]

Insertion in crawl-ref/source/describe.cc at line 1639 [7.3736416]

Insertion in crawl-ref/source/describe.cc at line 1692 [7.3736416]

Deletion in crawl-ref/source/describe.cc at line 1761 [7.3736416]

Insertion in crawl-ref/source/describe.cc at line 1799 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 1843 [7.3736416]

Insertion in crawl-ref/source/debug.cc at line 4104 [7.4016436]

Insertion in crawl-ref/source/debug.cc at line 4107 [7.4016436]

Insertion in crawl-ref/source/debug.cc at line 4118 [7.4016436]

Deletion in crawl-ref/settings/food_colouring.txt at line 11 [36.12654]

Insertion in crawl-ref/settings/food_colouring.txt at line 12 [36.12654]