fiddlerwoaroof/crawl - Change XX62GOJVDP352L4BH7MELNYXHMZNA6VAGF7B6RWWOSULX7VJR5YAC

Implement a basic version of "list monsters in LOS".

New command on 'F' (one of the few free keys, not documented yet).

What it does: List all monsters in sight, sorted first by attitude (hostile, neutral, friendly), then by monster type (number currently, but we could use any other measure instead).

My four current wiz-mode testing games produced the following output: a) You can see three orcs, and two neutral orcs. b) You can see a friendly orc, and a friendly elf. c) There are no monsters in sight! d) You can see a red devil, a hairy devil, an iron devil, a lemure, three ufetubi, a midge, a neutral deep elf summoner, and a friendly rat.

Also:

remove prompt for abilities with high food cost at near starving (just not possible now)
Fix 1864331: message_colour not working in message history

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

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

XX62GOJVDP352L4BH7MELNYXHMZNA6VAGF7B6RWWOSULX7VJR5YAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/misc.cc at line 1770 [6.1933596]

B:BD[5.1692] → [5.1692:1733]

B:BD[5.1733] → [7.659:710]

    bool is_safe = mons_friendly(mon) ||
        mons_class_flag(mon->type, M_NO_EXP_GAIN);

[5.1692]

[5.1822]

    bool is_safe = mons_friendly(mon)
                   || mons_class_flag(mon->type, M_NO_EXP_GAIN);

Insertion in crawl-ref/source/misc.cc at line 1786 [6.1933596]
[5.2347]
[5.2347]
```
    {
```
Insertion in crawl-ref/source/misc.cc at line 1788 [6.1933596]
[5.2373]
[5.2373]
```
    }
```

Replacement in crawl-ref/source/message.cc at line 696 [6.1993826]

B:BD[8.17821] → [8.17821:17909]

void formatted_message_history(const std::string &st_nocolor, msg_channel_type channel,

[8.17821]

[8.17909]

void formatted_message_history(const std::string &st_nocolor,
                               msg_channel_type channel,

Replacement in crawl-ref/source/message.cc at line 745 [6.1993826]
B:BD[3.2831] → [3.2831:2872]
```
        if (channel == MSGCH_TUTORIAL) {
```
[3.2831]
[3.2872]
```
        if (channel == MSGCH_TUTORIAL)
```
Replacement in crawl-ref/source/message.cc at line 747 [6.1993826]
B:BD[3.2943] → [3.2943:2960]
```
        } else {
```
[3.2943]
[3.2960]
```
        else
```
Deletion in crawl-ref/source/message.cc at line 749 [6.1993826]
B:BD[3.3021] → [3.3021:3031]
```
        }
```

Replacement in crawl-ref/source/message.cc at line 830 [6.1993826]

B:BD[9.255165] → [9.255165:255276]

    if (mcount <= 0) return std::string();
    if (mcount > NUM_STORED_MESSAGES) mcount = NUM_STORED_MESSAGES;

[9.255165]

[9.255276]

    if (mcount <= 0)
        return std::string();
        
    if (mcount > NUM_STORED_MESSAGES)
        mcount = NUM_STORED_MESSAGES;

Replacement in crawl-ref/source/message.cc at line 836 [6.1993826]

B:BD[9.255277] → [9.255277:255361]

    bool full_buffer = Store_Message[ NUM_STORED_MESSAGES - 1 ].text.length() == 0;

[9.255277]

[9.255361]

    bool full_buffer
       = (Store_Message[ NUM_STORED_MESSAGES - 1 ].text.length() == 0);

Replacement in crawl-ref/source/message.cc at line 840 [6.1993826]

B:BD[9.255456] → [9.255456:255522]

        initial = full_buffer? initial + NUM_STORED_MESSAGES : 0;

[9.255456]

[9.255522]

        initial = full_buffer ? initial + NUM_STORED_MESSAGES : 0;

Replacement in crawl-ref/source/message.cc at line 860 [6.1993826]
B:BD[9.255891] → [9.255891:255919]
```
    if (count) text += EOL;
```
[9.255891]
[9.255919]
```
    if (count)
        text += EOL;
```
Replacement in crawl-ref/source/message.cc at line 868 [6.1993826]
B:BD[6.2001975] → [6.2001975:2002014]
B:BD[6.2002014] → [10.5749599:5749625]
```
    int            win_start_line = 0;
    int            keyin;
```
[6.2001975]
[6.2002040]
```
    int        win_start_line = 0;
    int        keyin;
```

Replacement in crawl-ref/source/message.cc at line 871 [6.1993826]

B:BD[6.2002041] → [6.2002041:2002180]

    bool           full_buffer = true;
    int            num_msgs = NUM_STORED_MESSAGES;
    int            first_message = Next_Message;

[6.2002041]

[6.2002180]

    bool       full_buffer = true;
    int        num_msgs = NUM_STORED_MESSAGES;
    int        first_message = Next_Message;

Replacement in crawl-ref/source/message.cc at line 875 [6.1993826]
B:BD[6.2002181] → [6.2002181:2002235]
```
    const int      num_lines = get_number_of_lines();
```
[6.2002181]
[6.2002235]
```
    const int  num_lines = get_number_of_lines();
```
Replacement in crawl-ref/source/message.cc at line 879 [6.1993826]
B:BD[6.2002311] → [6.2002311:2002340]
```
        full_buffer = false;
```
[6.2002311]
[6.2002340]
```
        full_buffer   = false;
```

Replacement in crawl-ref/source/message.cc at line 918 [6.1993826]

B:BD[6.2003374] → [6.2003374:2003524]

            int colour = channel_to_colour( Store_Message[ line ].channel,
                                            Store_Message[ line ].param );

[6.2003374]

[6.2003524]

            int colour = prepare_message( Store_Message[ line ].text,
                                          Store_Message[ line ].channel,
                                          Store_Message[ line ].param );

Insertion in crawl-ref/source/enum.h at line 438 [6.3287960]
[6.3303697]
[6.3303697]
```
    CMD_FULL_VIEW,
```

Insertion in crawl-ref/source/acr.cc at line 1675 [6.4397395]

[11.1262963]

}
static bool _mons_hostile( const monsters *mon)
{
    return (!mons_friendly(mon) && !mons_neutral(mon));
}
static const char* _get_monster_name(const monsters *mon, bool list_a = false)
{
    std::string desc = "";
    bool adj = false;
    if (mons_friendly(mon))
    {
        desc += "friendly ";
        adj = true;
    }
    else if (mons_neutral(mon))
    {
        desc += "neutral ";
        adj = true;
    }
    if (adj && list_a)
    {
        desc = "a " + desc;
        list_a = false;
    }
    desc += mons_type_name(mon->type, (list_a ? DESC_NOCAP_A : DESC_PLAIN));
    return desc.c_str();
}
// Returns true if the first monster is more aggressive (in terms of
// hostile/neutral/friendly) than the second or, if both monsters share the
// same attitude, if the first monster has a lower type.
// If monster type and attitude are the same, return false.
static bool _compare_monsters_attitude( const monsters *m1, const monsters *m2 )
{
    if (_mons_hostile(m1) && !_mons_hostile(m2))
        return (true);
        
    if (mons_neutral(m1))
    {
        if (mons_friendly(m2))
            return (true);
        if (_mons_hostile(m2))
            return (false);
    }
    if (mons_friendly(m1) && !mons_friendly(m2))
        return (false);
    // If we get here then monsters have the same attitude.
    // FIX ME: replace with difficulty comparison
    return (m1->type < m2->type);
}
static void _list_monsters()
{
    int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
    int yend = you.y_pos + 9, xend = you.x_pos + 9;
    if ( xstart < 0 ) xstart = 0;
    if ( ystart < 0 ) ystart = 0;
    if ( xend >= GXM ) xend = GXM;
    if ( yend >= GYM ) yend = GYM;
    
    std::vector<const monsters*> mons;
    // monster check
    for ( int y = ystart; y < yend; ++y )
        for ( int x = xstart; x < xend; ++x )
            if ( see_grid(x,y) )
            {
                const unsigned short targ_monst = mgrd[x][y];
                if ( targ_monst != NON_MONSTER )
                {
                    const monsters *mon = &menv[targ_monst];
                    if ( player_monster_visible(mon)
                         && !mons_is_submerged(mon)
                         && !mons_is_mimic(mon->type))
                    {
                        mons.push_back(mon);
                    }
                }
            }
    if (mons.empty())
    {
        mpr("There are no monsters in sight!");
        return;
    }
    else if (mons.size() == 1)
    {
        mprf("You can see %s.",
             mons_type_name(mons[0]->type, DESC_NOCAP_A).c_str());
        return;
    }
    
    std::sort( mons.begin(), mons.end(), _compare_monsters_attitude );
    std::vector<std::string> describe;
    
    int count = 0;
    int size = mons.size();
    for (int i = 0; i < size; ++i)
    {
        if (i > 0 && _compare_monsters_attitude(mons[i-1], mons[i]))
        {
            if (count == 1)
                describe.push_back(_get_monster_name(mons[i-1], true));
            else
            {
                describe.push_back(number_in_words(count) + " "
                                   + pluralise(_get_monster_name(mons[i-1])));
            }
            count = 0;
        }
        count++;
    }
    // handle last monster
    if (_compare_monsters_attitude(mons[size-2], mons[size-1]))
        describe.push_back(_get_monster_name(mons[size-1], true));
    else
    {
        describe.push_back(number_in_words(count) + " "
                           + pluralise(_get_monster_name(mons[size-1])));
    }
    std::string msg  = "You can see ";
                msg += comma_separated_line(describe.begin(), describe.end(),
                                            ", and ", ", ");
                msg += ".";
    mpr(msg.c_str());

Deletion in crawl-ref/source/acr.cc at line 2040 [6.4397395]
B:BD[6.4430243] → [12.603:631]
```
        // item_check(';');
```

Insertion in crawl-ref/source/acr.cc at line 2043 [6.4397395]

[6.4430284]

[6.4430298]

    case CMD_FULL_VIEW:
        _list_monsters();
        break;

Insertion in crawl-ref/source/acr.cc at line 3391 [6.4397395]
[4.16426]
[4.16426]
```
    case 'D': return CMD_NO_CMD;
```
Replacement in crawl-ref/source/acr.cc at line 3393 [6.4397395]
∅:D[4.16469] → [11.1273945:1273978]
B:BD[11.1273945] → [11.1273945:1273978]
```
    case 'F': return CMD_NO_CMD;
```
[4.16469]
[11.1273978]
```
    case 'F': return CMD_FULL_VIEW;
```
Replacement in crawl-ref/source/acr.cc at line 3452 [6.4397395]
∅:D[13.1551] → [11.1276858:1276900]
∅:D[14.11975] → [11.1276858:1276900]
∅:D[15.25067] → [11.1276858:1276900]
B:BD[11.1276858] → [11.1276858:1276900]
```
    case CONTROL('M'): return CMD_NO_CMD;
```
[11.1276816]
[4.16585]
```
    case CONTROL('I'): return CMD_NO_CMD; // Backspace on most systems
    case CONTROL('M'): return CMD_NO_CMD; // Enter on most systems
```
Insertion in crawl-ref/source/acr.cc at line 3463 [6.4397395]
[11.1277131]
[11.1277182]
```
    case CONTROL('T'): return CMD_NO_CMD;
```

Replacement in crawl-ref/source/abl-show.cc at line 956 [6.4494389]

B:BD[2.3443] → [2.3443:3612]

        if (expected_hunger <= 150
            && !yesno("Invoking this ability might make you starve to death. "
                      "Continue anyway?", false, 'n'))

[2.3443]

[2.3612]

        if (expected_hunger <= 150)

Insertion in crawl-ref/source/abl-show.cc at line 958 [6.4494389]
[2.3622]
[2.3622]
```
            mpr("You're too hungry.");
```

Implement a basic version of "list monsters in LOS".

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/misc.cc at line 1770 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 1786 [6.1933596]

Insertion in crawl-ref/source/misc.cc at line 1788 [6.1933596]

Replacement in crawl-ref/source/message.cc at line 696 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 745 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 747 [6.1993826]

Deletion in crawl-ref/source/message.cc at line 749 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 830 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 836 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 840 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 860 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 868 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 871 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 875 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 879 [6.1993826]

Replacement in crawl-ref/source/message.cc at line 918 [6.1993826]

Insertion in crawl-ref/source/enum.h at line 438 [6.3287960]

Insertion in crawl-ref/source/acr.cc at line 1675 [6.4397395]

Deletion in crawl-ref/source/acr.cc at line 2040 [6.4397395]

Insertion in crawl-ref/source/acr.cc at line 2043 [6.4397395]

Insertion in crawl-ref/source/acr.cc at line 3391 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 3393 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 3452 [6.4397395]

Insertion in crawl-ref/source/acr.cc at line 3463 [6.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 956 [6.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 958 [6.4494389]