fiddlerwoaroof/crawl - Change TPPJRQ2NTCV3GI2VRHEXQJREDERPJODCJWUG5WCOQGN4REPPPAMAC

Fix 1869850: Targeting now respects mimics' (un)known status correctly,

         so that * and &#x2f; work for unknown ones, and + and - for known
     ones. Also, mimics become known if you hit them since the
     resulting message (&quot;moderately damaged&quot; or &quot;looks slightly
     unstable&quot;) will give that away anyway.

Implement the first part of FR 1903048: Added a range parameter to direction(), so that when targeting for weapons of reaching we can check whether a monster is within the range of 2 squares (grid_distance). Does not handle submerged monsters. Eventually, this could be used to also limit max range for certain spells (Freeze, I'm looking at you!)

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

Created by j-p-e-g on March 31, 2008

TPPJRQ2NTCV3GI2VRHEXQJREDERPJODCJWUG5WCOQGN4REPPPAMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-util.cc at line 759 [5.245665]

B:BD[5.264942] → [6.250:318]

    direction( spelld, restrict, mode, false, needs_path, prompt );

[5.264942]

[5.264983]

    direction( spelld, restrict, mode, -1, false, needs_path, prompt );

Replacement in crawl-ref/source/spells1.cc at line 105 [5.616635]

B:BD[5.618358] → [2.164:228]

            direction(beam, DIR_TARGET, TARG_ANY, false, false,

[5.618358]

[2.228]

            direction(beam, DIR_TARGET, TARG_ANY, -1, false, false,

Replacement in crawl-ref/source/spells1.cc at line 492 [5.616635]

B:BD[5.623830] → [6.1078:1145]

        direction( spelld, DIR_TARGET, TARG_ENEMY, false, false );

[5.623830]

[5.623883]

        direction( spelld, DIR_TARGET, TARG_ENEMY, -1, false, false );

Replacement in crawl-ref/source/item_use.cc at line 1514 [5.2781507]

B:BD[7.5797] → [7.5797:5869]

    direction( target, DIR_NONE, TARG_ENEMY, false, true, NULL, &beh );

[7.5797]

[7.5869]

    direction( target, DIR_NONE, TARG_ENEMY, -1, false, true, NULL, &beh );

Replacement in crawl-ref/source/it_use3.cc at line 260 [5.2870456]
B:BD[5.2878067] → [8.1212:1257]
```
    direction(beam, DIR_TARGET, TARG_ENEMY);
```
[5.2878067]
[9.349]
```
    direction(beam, DIR_TARGET, TARG_ENEMY, 2);
```

Replacement in crawl-ref/source/effects.cc at line 1918 [5.3382105]

B:BD[5.3427440] → [6.1348:1413]

        direction( targ, DIR_TARGET, TARG_ENEMY, false, false );

[5.3427440]

[5.3427491]

        direction( targ, DIR_TARGET, TARG_ENEMY, -1, false, false );

Deletion in crawl-ref/source/effects.cc at line 2027 [5.3382105]
B:BD[3.9909] → [3.9909:9915]
```
    {
```
Deletion in crawl-ref/source/effects.cc at line 2043 [5.3382105]
B:BD[3.10418] → [3.10418:10424]
```
    }
```

Replacement in crawl-ref/source/direct.h at line 150 [5.3696722]

B:BD[10.14217] → [10.14217:14292]

B:BD[10.14292] → [6.1417:1535]

                targ_mode_type mode = TARG_ANY, bool just_looking = false,
                bool needs_path = true, const char *prompt = NULL,
                targeting_behaviour *mod = NULL );

[10.14217]

[5.3697568]

                targ_mode_type mode = TARG_ANY, int range = -1,
                bool just_looking = false, bool needs_path = true,
                const char *prompt = NULL, targeting_behaviour *mod = NULL );

Replacement in crawl-ref/source/direct.cc at line 88 [5.3697945]

B:BD[11.451609] → [11.451609:451764]

static bool find_object( int x, int y, int mode );
static bool find_monster( int x, int y, int mode );
static bool find_feature( int x, int y, int mode );

[11.451609]

[8.1670]

static bool find_object(  int x, int y, int mode, int range );
static bool find_monster( int x, int y, int mode, int range );
static bool find_feature( int x, int y, int mode, int range );

Replacement in crawl-ref/source/direct.cc at line 94 [5.3697945]

B:BD[8.1797] → [8.1797:1913]

                                 bool (*targ)(int, int, int),
                                 int mode = TARG_ANY,

[8.1797]

[8.1913]

                                 bool (*targ)(int, int, int, int),
                                 int mode = TARG_ANY, int range = -1,

Replacement in crawl-ref/source/direct.cc at line 101 [5.3697945]

∅:D[12.16751] → [8.2088:2188]

B:BD[8.2088] → [8.2088:2188]

                         bool (*targ)(int, int, int),
                         int mode = TARG_ANY,

[12.16751]

[8.2188]

                         bool (*targ)(int, int, int, int),
                         int mode = TARG_ANY, int range = -1,

Replacement in crawl-ref/source/direct.cc at line 124 [5.3697945]
B:BD[8.4098] → [8.4098:4107]
```
    do {
```
[8.4098]
[13.5648]
```
    do
    {
```

Replacement in crawl-ref/source/direct.cc at line 146 [5.3697945]

B:BD[8.4491] → [8.4491:4558]

    } while ( !moves.isCancel && moves.dx == 0 && moves.dy == 0 );

[8.4491]

[8.4558]

    }
    while ( !moves.isCancel && moves.dx == 0 && moves.dy == 0 );

Insertion in crawl-ref/source/direct.cc at line 249 [5.3697945]

[14.17721]

static bool _is_target_in_range(int x, int y, int range)
{
    // range doesn't matter
    if (range == -1)
        return true;
        
    return (grid_distance(you.x_pos, you.y_pos, x, y) <= range);
}

Replacement in crawl-ref/source/direct.cc at line 265 [5.3697945]

B:BD[14.18159] → [14.18159:18227]

                            targ_mode_type mode, bool just_looking,

[14.18159]

[14.18227]

                            targ_mode_type mode, int range, bool just_looking,

Insertion in crawl-ref/source/direct.cc at line 339 [5.3697945]

[14.20311]

        else if (!_is_target_in_range(you.prev_grd_targ.x, you.prev_grd_targ.y,
                                      range))
        {
            moves.isCancel = true;

Insertion in crawl-ref/source/direct.cc at line 344 [5.3697945]

[14.20312]

            crawl_state.cancel_cmd_repeat("Your previous target is now out of "
                                          "range.");
            return;
        }

Replacement in crawl-ref/source/direct.cc at line 371 [5.3697945]

B:BD[14.20906] → [14.20906:20993]

        if (!mons_near(montarget) ||
            !player_monster_visible( montarget ))

[14.20906]

[14.20993]

        if (!mons_near(montarget)
            || !player_monster_visible( montarget ))

Insertion in crawl-ref/source/direct.cc at line 380 [5.3697945]

[14.21137]

        else if (!_is_target_in_range(you.prev_grd_targ.x, you.prev_grd_targ.y,
                                      range))
        {
            moves.isCancel = true;

Insertion in crawl-ref/source/direct.cc at line 385 [5.3697945]

[14.21138]

            crawl_state.cancel_cmd_repeat("Your previous target is now out of "
                                          "range.");
            return;
        }

Replacement in crawl-ref/source/direct.cc at line 426 [5.3697945]

B:BD[15.7859] → [13.5710:5765]

               targ_mode_type mode, bool just_looking,

[15.7859]

[6.1537]

               targ_mode_type mode, int range, bool just_looking,

Replacement in crawl-ref/source/direct.cc at line 438 [5.3697945]

B:BD[14.21498] → [14.21498:21560]

        direction_again(moves, restricts, mode, just_looking,

[14.21498]

[14.21560]

        direction_again(moves, restricts, mode, range, just_looking,

Replacement in crawl-ref/source/direct.cc at line 481 [5.3697945]

B:BD[16.703] → [16.703:778]

            if (mons_near(montarget) && player_monster_visible(montarget))

[16.703]

[16.778]

            if ( mons_near(montarget) && player_monster_visible(montarget)
                 && !mons_friendly(montarget) // not made friendly since then
                 && _is_target_in_range(montarget->x, montarget->y, range) )

Replacement in crawl-ref/source/direct.cc at line 695 [5.3697945]

B:BD[17.2139] → [17.2139:2210]

                                    find_feature, thing_to_find, true,

[17.2139]

[17.2210]

                                    find_feature, thing_to_find, range, true,

Replacement in crawl-ref/source/direct.cc at line 783 [5.3697945]

B:BD[8.9558] → [8.9558:9617]

                                     find_object, 0, true,

[8.9558]

[8.9617]

                                     find_object, 0, range, true,

Replacement in crawl-ref/source/direct.cc at line 802 [5.3697945]

B:BD[8.10282] → [8.10282:10362]

                                     find_monster, mode, Options.target_wrap ))

[8.10282]

[8.10362]

                                     find_monster, mode, range,
                                     Options.target_wrap))

Replacement in crawl-ref/source/direct.cc at line 1116 [5.3697945]
B:BD[11.458211] → [11.458211:458262]
```
static bool find_monster( int x, int y, int mode )
```
[11.458211]
[11.458262]
```
static bool find_monster( int x, int y, int mode, int range = -1)
```
Deletion in crawl-ref/source/direct.cc at line 1118 [5.3697945]
B:BD[11.458264] → [11.458264:458305]
```
    const int targ_mon = mgrd[ x ][ y ];
```

Replacement in crawl-ref/source/direct.cc at line 1119 [5.3697945]

B:BD[18.1641] → [18.1641:1690]

            && x == you.x_pos && y == you.y_pos)

[18.1641]

[18.1690]

         && x == you.x_pos && y == you.y_pos)
    {

Insertion in crawl-ref/source/direct.cc at line 1122 [5.3697945]
[18.1713]
[18.1713]
```
    }
```

Replacement in crawl-ref/source/direct.cc at line 1124 [5.3697945]

∅:D[18.1718] → [11.458305:458726]

B:BD[11.458305] → [11.458305:458726]

B:BD[11.458726] → [19.979377:979458]

    return (targ_mon != NON_MONSTER 
        && in_los(x, y)
        && player_monster_visible( &(menv[targ_mon]) )
        && !mons_is_mimic( menv[targ_mon].type )
        && (mode == TARG_ANY
            || (mode == TARG_FRIEND && mons_friendly( &menv[targ_mon] ))
            || (mode == TARG_ENEMY 
                && !mons_friendly( &menv[targ_mon] )
                && 
                (Options.target_zero_exp || 
                    !mons_class_flag( menv[targ_mon].type, M_NO_EXP_GAIN )) )));

[18.1718]

[11.458801]

    // don't target out of range
    if (!_is_target_in_range(x, y, range))
        return (false);
        
    const int targ_mon = mgrd[ x ][ y ];
    
    // Is target a (known) monster?
    if (targ_mon == NON_MONSTER || !in_los(x,y)
        || !player_monster_visible( &(menv[targ_mon]) )
        || mons_is_mimic(menv[targ_mon].type)
           && !(menv[targ_mon].flags & MF_KNOWN_MIMIC))
    {
        return (false);
    }
    
    // Now compare target modes.
    if (mode == TARG_ANY)
        return true;
        
    if (mode == TARG_FRIEND)
        return (mons_friendly(&menv[targ_mon] ));
        
    if (mode != TARG_ENEMY)
        return false;
        
    return ( !mons_friendly( &menv[targ_mon] )
             && (Options.target_zero_exp
                 || !mons_class_flag( menv[targ_mon].type, M_NO_EXP_GAIN )) );

Replacement in crawl-ref/source/direct.cc at line 1154 [5.3697945]
B:BD[11.458804] → [11.458804:458855]
```
static bool find_feature( int x, int y, int mode )
```
[11.458804]
[11.458855]
```
static bool find_feature( int x, int y, int mode, int /* range */)
```
Replacement in crawl-ref/source/direct.cc at line 1163 [5.3697945]
B:BD[11.459049] → [11.459049:459097]
```
static bool find_object(int x, int y, int mode)
```
[11.459049]
[11.459097]
```
static bool find_object(int x, int y, int mode, int /* range */)
```

Insertion in crawl-ref/source/direct.cc at line 1165 [5.3697945]

[11.459099]

    // First, check for mimics.
    bool is_mimic = false;
    const int mons = mgrd[ x ][ y ];
    if (mons != NON_MONSTER
        && player_monster_visible( &(menv[mons]) )
        && mons_is_mimic(menv[mons].type)
        && !(menv[mons].flags & MF_KNOWN_MIMIC))
    {
        is_mimic = true;
    }

Replacement in crawl-ref/source/direct.cc at line 1177 [5.3697945]

B:BD[11.459132] → [11.459132:459236]

B:BD[11.459236] → [20.11277:11306]

B:BD[20.11306] → [21.18442:18548]

    // The square need not be in LOS if the stash tracker knows this item.
    return (item != NON_ITEM
            && (in_los(x, y)
                || (Options.target_oos && is_terrain_seen(x, y)
                    && is_stash(x, y))));

[11.459132]

[11.459399]

    if (item == NON_ITEM && !is_mimic)
        return false;
        
    return (in_los(x, y) || Options.target_oos && is_terrain_seen(x, y)
                            && (is_stash(x, y) || is_mimic));

Replacement in crawl-ref/source/direct.cc at line 1256 [5.3697945]

∅:D[12.17162] → [8.12461:12587]

B:BD[8.12461] → [8.12461:12587]

                         bool (*find_targ)( int x, int y, int mode ),
                         int mode, bool wrap, int los )

[12.17162]

[5.3713157]

                         bool (*find_targ)( int x, int y, int mode, int range ),
                         int mode, int range, bool wrap, int los )

Replacement in crawl-ref/source/direct.cc at line 1321 [5.3697945]

B:BD[11.462934] → [18.1776:1831]

            if (find_targ(you.x_pos, you.y_pos, mode))

[11.462934]

[22.927]

            if (find_targ(you.x_pos, you.y_pos, mode, range))

Replacement in crawl-ref/source/direct.cc at line 1328 [5.3697945]

B:BD[22.1125] → [18.1895:1966]

                               false, next_los(direction, los, wrap));

[22.1125]

[11.463071]

                               range, false, next_los(direction, los, wrap));

Replacement in crawl-ref/source/direct.cc at line 1333 [5.3697945]

B:BD[22.1202] → [18.1967:2038]

                               false, next_los(direction, los, wrap));

[22.1202]

[4.24552]

                               range, false, next_los(direction, los, wrap));

Replacement in crawl-ref/source/direct.cc at line 1461 [5.3697945]
B:BD[5.3717592] → [12.17885:17930]
```
        if (find_targ(targ_x, targ_y, mode))
```
[5.3717592]
[12.17930]
```
        if (find_targ(targ_x, targ_y, mode, range))
```

Replacement in crawl-ref/source/direct.cc at line 1470 [5.3697945]

B:BD[11.464753] → [11.464753:464826]

        find_square(ctrx, ctry, mfp, direction, find_targ, mode, false,

[11.464753]

[11.464826]

        find_square(ctrx, ctry, mfp, direction, find_targ, mode, range, false,

Replacement in crawl-ref/source/direct.cc at line 1472 [5.3697945]

B:BD[11.464878] → [11.464878:464950]

      : find_square(minx, maxy, mfp, direction, find_targ, mode, false,

[11.464878]

[11.464950]

      : find_square(minx, maxy, mfp, direction, find_targ, mode, range, false,

Replacement in crawl-ref/source/direct.cc at line 1481 [5.3697945]

B:BD[8.13042] → [8.13042:13184]

                                 bool (*find_targ)( int x, int y, int mode ),
                                 int mode, bool wrap, int los )

[8.13042]

[8.13184]

                                 bool (*find_targ)( int x, int y, int mode,
                                                    int range ),
                                 int mode, int range, bool wrap, int los )

Replacement in crawl-ref/source/direct.cc at line 1485 [5.3697945]

B:BD[8.13186] → [23.1119:1260]

    const char r =  find_square(grid2viewX(tx), grid2viewY(ty),
                                mfp, direction, find_targ, mode, wrap, los);

[8.13186]

[8.13333]

    const char r =  find_square(grid2viewX(tx), grid2viewY(ty), mfp,
                                direction, find_targ, mode, range, wrap, los);

Insertion in crawl-ref/source/beam.cc at line 2350 [5.4128068]

[5.4201225]

[24.37754]

    bool should_id = !testbits(mimic->flags, MF_KNOWN_MIMIC)
                     && player_monster_visible(mimic) && mons_near(mimic);
    // If we got here, we at least got a resists message, if not
    // a full wounds printing. Thus, might as well id the mimic.

Insertion in crawl-ref/source/beam.cc at line 2356 [5.4128068]

[24.37788]

[5.4201280]

    {
        if (should_id)
            mimic->flags |= MF_KNOWN_MIMIC;

Replacement in crawl-ref/source/beam.cc at line 2361 [5.4128068]

B:BD[5.4201296] → [5.4201296:4201347]


    monster_teleport( mimic, !one_chance_in(3) );

[5.4201296]

[5.4201347]

    }
    
    const bool instant_tele = !one_chance_in(3);
    monster_teleport( mimic, instant_tele );
    
    // at least for this short while, we know it's a mimic
    if (!instant_tele && should_id)
        mimic->flags |= MF_KNOWN_MIMIC;

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

B:BD[17.3340] → [17.3340:3394]

        direction(lmove, DIR_TARGET, TARG_ANY, true);

[17.3340]

[11.551110]

        direction(lmove, DIR_TARGET, TARG_ANY, -1, true);