fiddlerwoaroof/crawl - Change SKWBAGSAB625IIN4UP3NCPRX2H3KCPC2LULHS2A7JVRLO3EUBJDAC

Apply patch 1952761 by jarpian (wasp): targetting with the monster list.

I've updated the patch to the current mlist code, but there are still a couple of bugs that will need to be ironed out. For example, monsters are picked by comparing their attitude and type, which is not sufficient in the case of (non-collapsed) zombies, as well as mimics or ghosts. Also if the number of monsters in the visible list is greater than its rows (because some appear in the same row) then monsters outside of the visible list can be targetted. I guess this is an unintended feature. :) I'm certain there'll be more bugs, though.

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

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

SKWBAGSAB625IIN4UP3NCPRX2H3KCPC2LULHS2A7JVRLO3EUBJDAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 5031 [10.16817]
[8.339]
[9.6634]
```
            update_monster_pane();
```
Deletion in crawl-ref/source/view.cc at line 5034 [10.16817]
B:BD[9.6641] → [2.29:64]
```
            update_monster_pane();
```
Replacement in crawl-ref/source/output.h at line 56 [10.1087719]
B:BD[11.2674] → [12.2779:2811]
```
void update_monster_pane(void);
```
[11.2674]
[10.1088238]
```
void update_monster_pane();
```

Insertion in crawl-ref/source/output.h at line 68 [10.1087719]

[13.501]

[10.1088240]

#ifndef USE_TILE
// Monster info used by the pane; precomputes some data
// to help with sorting and rendering.
class monster_pane_info
{
 public:
    static bool less_than(const monster_pane_info& m1,
                          const monster_pane_info& m2, bool zombified = true);
    monster_pane_info(const monsters* m);
    void to_string(int count, std::string& desc, int& desc_color) const;
    const monsters* m_mon;
    mon_attitude_type m_attitude;
    int m_difficulty;
    int m_brands;
    bool m_fullname;
};
void get_monster_pane_info(std::vector<monster_pane_info>& mons);

Insertion in crawl-ref/source/output.h at line 90 [10.1087719]
[10.1088247]
```
#endif
```

Replacement in crawl-ref/source/output.cc at line 1173 [10.1088282]

B:BD[14.2771] → [14.2771:2891]


// Monster info used by the pane; precomputes some data
// to help with sorting and rendering.
class monster_pane_info

[14.2771]

[14.2891]

monster_pane_info::monster_pane_info(const monsters *m)
    : m_mon(m)

Replacement in crawl-ref/source/output.cc at line 1176 [10.1088282]

B:BD[14.2893] → [14.2893:2957]

B:BD[14.2957] → [6.2551:2630]

∅:D[6.2630] → [14.3013:3080]

B:BD[14.3013] → [14.3013:3080]

B:BD[14.3340] → [14.3340:3380]

B:BD[14.3380] → [5.2605:2699]

∅:D[5.2699] → [14.3463:3523]

B:BD[14.3463] → [14.3463:3523]

B:BD[14.3523] → [15.2527:2603]

B:BD[15.2603] → [12.7072:7112]

∅:D[12.7112] → [14.3626:3649]

B:BD[14.3626] → [14.3626:3649]

B:BD[14.3649] → [12.7113:7221]

∅:D[12.7221] → [14.3754:3808]

B:BD[14.3754] → [14.3754:3808]

B:BD[14.3808] → [16.2550:2578]

∅:D[16.2578] → [14.3808:3814]

B:BD[14.3808] → [14.3808:3814]

 public:
    static bool less_than(const monster_pane_info& m1,
                          const monster_pane_info& m2, bool zombified = true);
    monster_pane_info(const monsters* m)
        : m_mon(m)
    {
        m_attitude = mons_attitude(m);
        // Currently, difficulty is defined as "average hp".  Leaks too
        // much info?
        const monsterentry* me = get_monster_data(m->type);
        m_difficulty = me->hpdice[0] * (me->hpdice[1] + (me->hpdice[2]>>1))
                       + me->hpdice[3];
        m_brands = 0;
        if (mons_looks_stabbable(m))   m_brands |= 1;
        if (mons_looks_distracted(m))  m_brands |= 2;
        if (m->has_ench(ENCH_BERSERK)) m_brands |= 4;
        m_fullname = true;
    }

[14.2893]

[14.3814]

    // XXX: this doesn't take into account ENCH_NEUTRAL, but that's probably
    // a bug for mons_attitude, not this.
    // XXX: also, mons_attitude_type should be sorted hostile/neutral/friendly;
    // will break saves a little bit though.
    m_attitude = mons_attitude(m);

Replacement in crawl-ref/source/output.cc at line 1182 [10.1088282]

B:BD[14.3815] → [14.3815:3888]

    void to_string(int count, std::string& desc, int& desc_color) const;

[14.3815]

[14.3888]

    // Currently, difficulty is defined as "average hp".  Leaks too much info?
    const monsterentry* me = get_monster_data(m->type);
    m_difficulty = me->hpdice[0] * (me->hpdice[1] + (me->hpdice[2]>>1))
        + me->hpdice[3];

Replacement in crawl-ref/source/output.cc at line 1187 [10.1088282]

B:BD[14.3889] → [16.2579:2608]

∅:D[16.2608] → [14.3916:3950]

B:BD[14.3916] → [14.3916:3950]

B:BD[14.3950] → [16.2609:2711]

∅:D[16.2711] → [14.3990:3993]

B:BD[14.3990] → [14.3990:3993]

    const monsters*   m_mon;
    mon_attitude_type m_attitude;
    int               m_difficulty;
    int               m_brands;
    bool              m_fullname;
};

[14.3889]

[14.3993]

    m_brands = 0;
    if (mons_looks_stabbable(m))   m_brands |= 1;
    if (mons_looks_distracted(m))  m_brands |= 2;
    if (m->has_ench(ENCH_BERSERK)) m_brands |= 4;
}

Replacement in crawl-ref/source/output.cc at line 1330 [10.1088282]

B:BD[14.6280] → [6.3182:3308]

static void _print_next_monster_desc(
    const std::vector<monster_pane_info>& mons, int& start,
    bool zombified = false)

[14.6280]

[14.6373]

static void _print_next_monster_desc(const std::vector<monster_pane_info>& mons,
                                     int& start, bool zombified = false,
                                     int idx = -1)

Insertion in crawl-ref/source/output.cc at line 1347 [10.1088282]

[17.3048]

[14.6931]


        // for targeting
        if (idx >= 0)
        {
            textcolor(WHITE);
            cprintf( stringize_glyph('a' + idx).c_str() );
            cprintf(" - ");
            printed += 4;
        }

Insertion in crawl-ref/source/output.cc at line 1437 [10.1088282]

[14.7608]

[3.2540]

void get_monster_pane_info(std::vector<monster_pane_info>& mons)
{
    std::vector<monsters*> visible;
    get_playervisible_monsters(visible);
    for (unsigned int i = 0; i < visible.size(); i++)
    {
        if (Options.target_zero_exp
            || !mons_class_flag( visible[i]->type, M_NO_EXP_GAIN ))
        {
            mons.push_back(monster_pane_info(visible[i]));
        }
    }
    std::sort(mons.begin(), mons.end(), monster_pane_info::less_than);
}

Replacement in crawl-ref/source/output.cc at line 1462 [10.1088282]

B:BD[14.8000] → [14.8000:8091]

B:BD[14.8091] → [18.11543:11601]

∅:D[18.11601] → [19.2538:2548]

B:BD[14.8145] → [19.2538:2548]

B:BD[19.2548] → [18.11602:11642]

∅:D[18.11642] → [19.2591:2764]

B:BD[19.2591] → [19.2591:2764]

∅:D[19.2764] → [14.8204:8211]

B:BD[14.8204] → [14.8204:8211]

    {
        std::vector<monsters*> visible;
        get_playervisible_monsters(visible);
        for (unsigned int i = 0; i < visible.size(); i++)
        {
            if (Options.target_zero_exp
                || !mons_class_flag( visible[i]->type, M_NO_EXP_GAIN ))
            {
                mons.push_back(monster_pane_info(visible[i]));
            }
        }
    }

[14.8000]

[14.8211]

    get_monster_pane_info(mons);

Deletion in crawl-ref/source/output.cc at line 1495 [10.1088282]
B:BD[14.8310] → [20.2961:2962]
Replacement in crawl-ref/source/output.cc at line 1499 [10.1088282]
B:BD[14.8448] → [20.2963:3006]
```
        cgotoxy(1, 1+i_print, GOTO_MLIST);
```
[14.8448]
[14.8499]
```
        cgotoxy(1, 1 + i_print, GOTO_MLIST);
```

Replacement in crawl-ref/source/output.cc at line 1501 [10.1088282]

B:BD[14.8560] → [20.3007:3075]

B:BD[20.3075] → [6.3947:4010]

        if ((i_print >= skip_lines) && (i_mons < (int)mons.size()))
            _print_next_monster_desc(mons, i_mons, zombified);

[14.8560]

[14.8651]

        if (i_print >= skip_lines && i_mons < (int) mons.size())
        {
             _print_next_monster_desc(mons, i_mons, zombified,
                        Options.mlist_targetting == MLIST_TARGET_ON ? i_print
                                                                    : -1);
        }

Replacement in crawl-ref/source/output.cc at line 1514 [10.1088282]

B:BD[17.5289] → [17.5289:5364]

        cgotoxy(crawl_view.mlistsz.x-4, crawl_view.mlistsz.y, GOTO_MLIST);

[17.5289]

[17.5364]

        cgotoxy(crawl_view.mlistsz.x - 4, crawl_view.mlistsz.y, GOTO_MLIST);

Deletion in crawl-ref/source/output.cc at line 1565 [10.1088282]
B:BD[21.206296] → [21.206296:206302]
```
    {
```
Replacement in crawl-ref/source/output.cc at line 1567 [10.1088282]
B:BD[21.206372] → [21.206372:206378]
```
    }
```
[21.206372]
[21.206378]

Replacement in crawl-ref/source/output.cc at line 2122 [10.1088282]

B:BD[13.4707] → [22.756:807]

    // how exactly did you get to show the status?

[13.4707]

[23.9068]

    // How exactly did you get to show the status?
    // It's not so unreasonable anymore now that the new overview screen is
    // dumped. When the player dies while paralysed it's important information.

Insertion in crawl-ref/source/output.cc at line 2128 [10.1088282]

[4.2641]

[22.808]

    if (you.duration[DUR_PETRIFIED])
        text += "petrified, ";

Insertion in crawl-ref/source/initfile.cc at line 618 [10.2957258]
[24.3439]
[24.3439]
```
    mlist_targetting = 0;
```
Insertion in crawl-ref/source/externs.h at line 1617 [10.3270163]
[24.8195]
[24.8195]
```
    int         mlist_targetting; // not actually a real option
```

Insertion in crawl-ref/source/enum.h at line 589 [10.3287960]

[25.2295]

    CMD_TARGET_CYCLE_MLIST = 2000, // for indices a-z in the monster list
    CMD_TARGET_CYCLE_MLIST_END = 2025,
    CMD_TARGET_TOGGLE_MLIST,

Insertion in crawl-ref/source/enum.h at line 2800 [10.3287960]

[26.7055]

[10.3376769]

};
#ifndef USE_TILE
enum mlist_targetting_type
{
    MLIST_TARGET_OFF = 0,
    MLIST_TARGET_HIDDEN,
    MLIST_TARGET_ON

Insertion in crawl-ref/source/enum.h at line 2809 [10.3287960]
[10.3376772]
[10.3376772]
```
#endif
```
Insertion in crawl-ref/source/directn.cc at line 61 [10.3697945]
[10.3698882]
[10.3698882]
```
#include "output.h"
```

Insertion in crawl-ref/source/directn.cc at line 95 [10.3697945]

[27.1671]

[28.14369]

#ifndef USE_TILE
static bool _find_mlist( int x, int y, int mode, bool need_path, int range );
#endif

Replacement in crawl-ref/source/directn.cc at line 441 [10.3697945]

B:BD[29.885] → [29.885:951]

//---------------------------------------------------------------

[29.885]

[30.7805]

//--------------------------------------------------------------
#ifndef USE_TILE
// XXX: Hack - can't pass mlist entries into _find_mlist().
std::vector<monster_pane_info> mlist;
static void _fill_monster_list(void)
{
    std::vector<monster_pane_info> temp;
    get_monster_pane_info(temp);
    // Get the unique entries.
    mlist.clear();
    int start = 0, end = 1;
    while (start < (int) temp.size())
    {
        mlist.push_back(temp[start]);
        for (end = start + 1; end < (int) temp.size(); ++end)
            if (monster_pane_info::less_than(temp[start], temp[end]))
                  break;
        start = end;
    }
}
#endif

Insertion in crawl-ref/source/directn.cc at line 476 [10.3697945]

[31.5960]

[32.21426]


#ifndef USE_TILE
    if (!just_looking && Options.mlist_targetting == MLIST_TARGET_HIDDEN)
    {
        Options.mlist_targetting = MLIST_TARGET_ON;
        _fill_monster_list();
    }
#endif

Insertion in crawl-ref/source/directn.cc at line 542 [10.3697945]
[33.435]
[34.2748]

Insertion in crawl-ref/source/directn.cc at line 642 [10.3697945]

[35.9501]

[27.6137]


#ifndef USE_TILE
        if (key_command >= CMD_TARGET_CYCLE_MLIST
            && key_command <= CMD_TARGET_CYCLE_MLIST_END)
        {
            const int idx = key_command - CMD_TARGET_CYCLE_MLIST;
            if (_find_square_wrapper(moves.tx, moves.ty, monsfind_pos, 1,
                                     _find_mlist, needs_path, idx, range,
                                     Options.target_wrap))
            {
                moves.tx = monsfind_pos[0];
                moves.ty = monsfind_pos[1];
            }
            else if (!skip_iter)
                flush_input_buffer(FLUSH_ON_FAILURE);
        }
#endif

Insertion in crawl-ref/source/directn.cc at line 720 [10.3697945]

[36.4473]

            break;
#ifndef USE_TILE
        case CMD_TARGET_TOGGLE_MLIST:
            if (Options.mlist_targetting == MLIST_TARGET_ON)
                Options.mlist_targetting = MLIST_TARGET_OFF;
            else
                Options.mlist_targetting = MLIST_TARGET_ON;
            update_monster_pane();
            if (Options.mlist_targetting == MLIST_TARGET_ON)
                _fill_monster_list();

Insertion in crawl-ref/source/directn.cc at line 734 [10.3697945]
[36.4492]
[36.4492]
```
#endif
```

Insertion in crawl-ref/source/directn.cc at line 868 [10.3697945]

[32.21871]

[37.3515]


#ifndef USE_TILE
            if (Options.mlist_targetting == MLIST_TARGET_ON)
                Options.mlist_targetting = MLIST_TARGET_HIDDEN;
#endif

Insertion in crawl-ref/source/directn.cc at line 910 [10.3697945]

[7.7570]

[37.4065]


#ifndef USE_TILE
            if (Options.mlist_targetting == MLIST_TARGET_ON)
                Options.mlist_targetting = MLIST_TARGET_HIDDEN;
#endif

Replacement in crawl-ref/source/directn.cc at line 1104 [10.3697945]
∅:D[9.5934609] → [25.3762:3794]
B:BD[38.3171] → [25.3762:3794]
```
        if ( need_beam_redraw )
```
[9.5934609]
[25.3794]
```
        if (need_beam_redraw)
```

Insertion in crawl-ref/source/directn.cc at line 1244 [10.3697945]

[39.16940]

[21.458208]

}
#ifndef USE_TILE
static bool _find_mlist( int x, int y, int idx, bool need_path, int range = -1)
{
    if ((int) mlist.size() <= idx)
        return (false);
    if (!_is_target_in_range(x, y, range) || !in_los(x,y))
        return (false);
    const int targ_mon = mgrd[ x ][ y ];
    if (targ_mon == NON_MONSTER)
        return (false);
    int real_idx = 0;
    for (unsigned int i = 0; i < mlist.size()-1; i++)
    {
        if (real_idx == idx)
        {
            real_idx = i;
            break;
        }
        // While the monsters are identical, don't increase real_idx.
        if (mlist[i].m_mon->type == mlist[i+1].m_mon->type
            && mlist[i].m_attitude == mlist[i+1].m_attitude)
        {
            continue;
        }
        real_idx++;
    }
    monsters *mon  = &menv[targ_mon];
    const monsters *monl = mlist[real_idx].m_mon;
    extern mon_attitude_type mons_attitude(const monsters *m);
    return (mons_attitude(mon) == mlist[idx].m_attitude
            && mon->type == monl->type);

Insertion in crawl-ref/source/directn.cc at line 1284 [10.3697945]
[21.458210]
[21.458210]
```
#endif
```

Replacement in crawl-ref/source/directn.cc at line 1678 [10.3697945]

B:BD[28.18672] → [28.18672:18798]

                                  bool need_path, int mode, int range, bool wrap,
                                  int los )

[28.18672]

[27.13184]

                                  bool need_path, int mode, int range,
                                  bool wrap, int los )

Replacement in crawl-ref/source/directn.cc at line 2622 [10.3697945]

B:BD[31.6679] → [31.6679:6698]

    switch ( key )

[31.6679]

[31.6698]

#ifndef USE_TILE
    // Overrides the movement keys while mlist_targetting is active.
    if (Options.mlist_targetting == MLIST_TARGET_ON && islower(key))
        return static_cast<command_type> (CMD_TARGET_CYCLE_MLIST + (key - 'a'));
#endif
    switch (key)

Insertion in crawl-ref/source/directn.cc at line 2667 [10.3697945]
[31.7582]
[40.9956]
```
    case CONTROL('L'): return CMD_TARGET_TOGGLE_MLIST;
```

Insertion in crawl-ref/source/command.cc at line 732 [10.4082507]

[41.565]

[36.6260]

#ifndef USE_TILE
    "<w>Ctrl-L</w> : toggle targetting via monster list\n"
#endif

Replacement in crawl-ref/docs/crawl_manual.txt at line 253 [43.108269]

B:BD[42.4191] → [42.4191:4197]

from.

[42.4191]

[42.4197]

from. Within target mode you can directly target single monsters by use 
of the monster list. Use Ctrl-L to toggle this on or off.

Apply patch 1952761 by jarpian (wasp): targetting with the monster list.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 5031 [10.16817]

Deletion in crawl-ref/source/view.cc at line 5034 [10.16817]

Replacement in crawl-ref/source/output.h at line 56 [10.1087719]

Insertion in crawl-ref/source/output.h at line 68 [10.1087719]

Insertion in crawl-ref/source/output.h at line 90 [10.1087719]

Replacement in crawl-ref/source/output.cc at line 1173 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1176 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1182 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1187 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1330 [10.1088282]

Insertion in crawl-ref/source/output.cc at line 1347 [10.1088282]

Insertion in crawl-ref/source/output.cc at line 1437 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1462 [10.1088282]

Deletion in crawl-ref/source/output.cc at line 1495 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1499 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1501 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1514 [10.1088282]

Deletion in crawl-ref/source/output.cc at line 1565 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 1567 [10.1088282]

Replacement in crawl-ref/source/output.cc at line 2122 [10.1088282]

Insertion in crawl-ref/source/output.cc at line 2128 [10.1088282]

Insertion in crawl-ref/source/initfile.cc at line 618 [10.2957258]

Insertion in crawl-ref/source/externs.h at line 1617 [10.3270163]

Insertion in crawl-ref/source/enum.h at line 589 [10.3287960]

Insertion in crawl-ref/source/enum.h at line 2800 [10.3287960]

Insertion in crawl-ref/source/enum.h at line 2809 [10.3287960]

Insertion in crawl-ref/source/directn.cc at line 61 [10.3697945]