fiddlerwoaroof/crawl - Change GQF26J3LYUS35FFHOV4N26QHSJIA5GXMNBXVVKDGX7YMFBFJK4LQC

Implement 2022051: Skip hjklyubn (well, currently only bhjkl) when

targetting via monster list, so you can both directly target a monster and manually move your cursor. Has the side-effect of reallowing direct selection of monsters via 'x'.

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

Created by j-p-e-g on July 23, 2008

GQF26J3LYUS35FFHOV4N26QHSJIA5GXMNBXVVKDGX7YMFBFJK4LQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/output.cc at line 1345 [6.1088282]

[5.6277]

}
static char _mlist_index_to_letter(int index)
{
    index += 'a';
    if (index >= 'b')
        index++;
    if (index >= 'h')
        index++;
    if (index >= 'j')
        index++;
    if (index >= 'k')
        index++;
    if (index >= 'l')
        index++;
    return (index);

Replacement in crawl-ref/source/output.cc at line 1387 [6.1088282]

B:BD[7.4268] → [7.4268:4327]

            cprintf( stringize_glyph('a' + idx).c_str() );

[7.4268]

[7.4327]

            cprintf( stringize_glyph(_mlist_index_to_letter(idx)).c_str() );

Replacement in crawl-ref/source/newgame.cc at line 3799 [6.1132300]
B:BD[8.11688] → [8.11688:11722]
```
        you.species = SP_UNKNOWN;
```
[8.11688]
[8.11722]
```
        you.species  = SP_UNKNOWN;
```
Replacement in crawl-ref/source/fight.cc at line 3421 [6.3140790]
∅:D[9.2161] → [10.386:443]
B:BD[11.68096] → [10.386:443]
```
    if (weapon && attacker->id() != MONS_DANCING_WEAPON)
```
[9.2161]
[12.701]
```
    if (weapon)
```

Replacement in crawl-ref/source/fight.cc at line 3432 [6.3140790]

B:BD[12.1083] → [12.1083:1157]

        result += " with ";
        result += weapon->name(DESC_NOCAP_A);

[12.1083]

[12.1157]


        if (attacker->id() != MONS_DANCING_WEAPON)
        {
            result += " with ";
            result += weapon->name(DESC_NOCAP_A);
        }

Replacement in crawl-ref/source/fight.cc at line 3735 [6.3140790]

B:BD[11.75240] → [11.75240:75313]

        if ((one_chance_in(20) || (damage_done > 0 && one_chance_in(3)))

[11.75240]

[11.75313]

        if ((one_chance_in(20) || damage_done > 0 && one_chance_in(3))

Replacement in crawl-ref/source/directn.cc at line 91 [6.3697945]

B:BD[13.451609] → [4.44839:45109]

static bool _find_object(  const coord_def& where, int mode, bool need_path, int range );
static bool _find_monster( const coord_def& where, int mode, bool need_path, int range );
static bool _find_feature( const coord_def& where, int mode, bool need_path, int range );

[13.451609]

[14.1670]

static bool _find_object(  const coord_def& where, int mode, bool need_path,
                           int range );
static bool _find_monster( const coord_def& where, int mode, bool need_path,
                           int range );
static bool _find_feature( const coord_def& where, int mode, bool need_path,
                           int range );

Replacement in crawl-ref/source/directn.cc at line 99 [6.3697945]

B:BD[7.6122] → [4.45110:45198]

static bool _find_mlist( const coord_def& where, int mode, bool need_path, int range );

[7.6122]

[7.6200]

static bool _find_mlist( const coord_def& where, int mode, bool need_path,
                         int range );

Insertion in crawl-ref/source/directn.cc at line 498 [6.3697945]

[7.6849]

}
static int _mlist_letter_to_index(char idx)
{
    if (idx >= 'b')
        idx--;
    if (idx >= 'h')
        idx--;
    if (idx >= 'j')
        idx--;
    if (idx >= 'k')
        idx--;
    if (idx >= 'l')
        idx--;
    return (idx - 'a');

Replacement in crawl-ref/source/directn.cc at line 530 [6.3697945]

B:BD[7.6878] → [2.3716:3784]

    if (!just_looking && may_target_monster && restricts != DIR_DIR

[7.6878]

[2.3784]

    if (may_target_monster && restricts != DIR_DIR

Replacement in crawl-ref/source/directn.cc at line 707 [6.3697945]

B:BD[7.7192] → [7.7192:7258]

            const int idx = key_command - CMD_TARGET_CYCLE_MLIST;

[7.7192]

[4.46036]

            const int idx = _mlist_letter_to_index(key_command + 'a'
                                                   - CMD_TARGET_CYCLE_MLIST);

Replacement in crawl-ref/source/directn.cc at line 1351 [6.3697945]

B:BD[7.8458] → [4.47261:47351]

static bool _find_mlist( const coord_def& where, int idx, bool need_path, int range = -1)

[7.8458]

[7.8538]

static bool _find_mlist( const coord_def& where, int idx, bool need_path,
                         int range = -1)

Insertion in crawl-ref/source/directn.cc at line 2750 [6.3697945]

[15.6679]

[7.9604]

    command_type cmd = key_to_command(key, KC_TARGETING);
    if (cmd >= CMD_MIN_TARGET && cmd < CMD_TARGET_CYCLE_TARGET_MODE)
        return (cmd);

Deletion in crawl-ref/source/directn.cc at line 2760 [6.3697945]
B:BD[15.8243] → [3.11920:11978]
```
    command_type cmd = key_to_command(key, KC_TARGETING);
```
Replacement in crawl-ref/source/directn.cc at line 2764 [6.3697945]
B:BD[15.8597] → [3.12093:12109]
```
    return cmd;
```
[15.8597]
[15.8639]
```
    return (cmd);
```