fiddlerwoaroof/crawl - Change ND3T5LCZATC63EVQ6SLI7XXMSUL7XICJDNLH3UCYUDEFWTA3N5MQC

Some more improvements for (you guessed it) the tiles.

Hey, I can't help it! :)

Fix 1872624: Detect creatures revealing too much info The tiles drawn for detected monsters are now mons_genus(monster). It's not quite as strict as only showing the letter in ASCII (e.g. merfolk, minotaur and elephant slug have different genus but one common letter), but it's certainly better than showing the actual monster.

Some more changes to L-click action in inventory, this time adding rods to the mix that can now be evoked rather than unwielded.

Also:

Fix cut-off of first digit in item quantities > 99
show friendly monsters on map overview as lightred (hostiles remain darkred)
show player on map overview as white even when zooming around in X-mode
general clean-up

And, not tile-related: FR 1819454: * add mutation line for gourmand behaviour of Ogres and Troll.

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

Created by j-p-e-g on January 17, 2008

ND3T5LCZATC63EVQ6SLI7XXMSUL7XICJDNLH3UCYUDEFWTA3N5MQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tiles.h at line 43 [4.7013]

B:BD[4.8360] → [4.8360:8434]

void tile_place_monster(int gx, int gy, int idx, bool foreground = true);

[4.8360]

[4.8434]

void tile_place_monster(int gx, int gy, int idx, bool foreground = true,
                        bool detected = false);

Insertion in crawl-ref/source/tile2.cc at line 2828 [4.13289]
[4.92784]
[4.92784]
```
        int help = num;
```

Replacement in crawl-ref/source/tile2.cc at line 2830 [4.13289]

B:BD[4.92785] → [4.92785:92838]

        int c100 = num/100;
        num -= c100*100;

[4.92785]

[4.92838]

        int c100 = help/100;
        help -= c100*100;

Replacement in crawl-ref/source/tile2.cc at line 2834 [4.13289]

B:BD[4.92866] → [4.92866:92927]

            TilePutch('0'+ c100, r->backbuf, dx+offset, dy);

[4.92866]

[4.92927]

            TilePutch('0' + c100, r->backbuf, dx+offset, dy);

Replacement in crawl-ref/source/tile2.cc at line 2837 [4.13289]
B:BD[4.92974] → [4.92974:93000]
```
        int c10 = num/10;
```
[4.92974]
[4.93000]
```
        int c10 = help/10;
```

Replacement in crawl-ref/source/tile2.cc at line 2840 [4.13289]

B:BD[4.93035] → [4.93035:93095]

            TilePutch('0'+ c10, r->backbuf, dx+offset, dy);

[4.93035]

[4.93095]

            TilePutch('0' + c10, r->backbuf, dx+offset, dy);

Replacement in crawl-ref/source/tile2.cc at line 2843 [4.13289]

B:BD[4.93142] → [4.93142:93224]

        int c1 = num % 10;
        TilePutch('0'+ c1, r->backbuf, dx+offset, dy);

[4.93142]

[4.93224]

        int c1 = help % 10;
        TilePutch('0' + c1, r->backbuf, dx+offset, dy);

Replacement in crawl-ref/source/tile2.cc at line 2894 [4.13289]

B:BD[4.94356] → [4.94356:94476]

        int idx0 = (i>=n) ? -1 : idx[i];
        char key = (iflags[i]&TILEI_FLAG_FLOOR) ? 0 : index_to_letter(idx[i]);

[4.94356]

[4.94476]

        int idx0  = (i>=n) ? -1 : idx[i];
        char key  = (iflags[i]&TILEI_FLAG_FLOOR) ? 0 : index_to_letter(idx[i]);

Replacement in crawl-ref/source/tile2.cc at line 2900 [4.13289]
B:BD[4.94592] → [4.94592:94633]
```
             && key   == itemlist_key[i]
```
[4.94592]
[4.94633]
```
             && key    == itemlist_key[i]
```
Replacement in crawl-ref/source/tile2.cc at line 2929 [4.13289]
B:BD[4.95413] → [4.95413:95446]
```
    int num0 = itemlist_num[ix];
```
[4.95413]
[4.95446]
```
    int num0  = itemlist_num[ix];
```
Replacement in crawl-ref/source/tile1.cc at line 67 [4.96318]
B:BD[4.97886] → [5.139:177]
```
int tileidx_monster_base(int mon_idx)
```
[4.97886]
[4.97919]
```
int tileidx_monster_base(int mon_idx, bool detected)
```

Insertion in crawl-ref/source/tile1.cc at line 72 [4.96318]

[2.294]

[4.97977]

    
    int type = mon->type;
    if (detected)
        type = mons_genus(type);

Replacement in crawl-ref/source/tile1.cc at line 77 [4.96318]
B:BD[4.97978] → [2.295:318]
```
    switch (mon->type)
```
[4.97978]
[5.231]
```
    switch (type)
```
Replacement in crawl-ref/source/tile1.cc at line 795 [4.96318]
B:BD[5.22180] → [5.22180:22213]
```
int tileidx_monster(int mon_idx)
```
[5.22180]
[5.22213]
```
int tileidx_monster(int mon_idx, bool detected)
```
Replacement in crawl-ref/source/tile1.cc at line 797 [4.96318]
B:BD[5.22215] → [5.22215:22259]
```
    int ch = tileidx_monster_base(mon_idx);
```
[5.22215]
[4.117888]
```
    int ch = tileidx_monster_base(mon_idx, detected);
```

Replacement in crawl-ref/source/tile1.cc at line 3612 [4.96318]

B:BD[4.213057] → [4.213057:213123]

void tile_place_monster(int gx, int gy, int idx, bool foreground)

[4.213057]

[4.213123]

void tile_place_monster(int gx, int gy, int idx, bool foreground, bool detected)

Replacement in crawl-ref/source/tile1.cc at line 3622 [4.96318]
B:BD[4.213266] → [4.213266:213300]
```
    int t = tileidx_monster(idx);
```
[4.213266]
[4.213300]
```
    int t = tileidx_monster(idx, detected);
```
Replacement in crawl-ref/source/spells2.cc at line 192 [6.569242]
B:BD[4.234071] → [4.234071:234121]
```
    tile_place_monster(gridx, gridy, idx, false);
```
[4.234071]
[4.234121]
```
    tile_place_monster(gridx, gridy, idx, false, true);
```

Replacement in crawl-ref/source/mutation.cc at line 1294 [6.1263003]

B:BD[7.1026] → [8.1173:1186]

[7.1026]

[8.1186]

            // Gourmand is *not* identical to being saprovorous, therefore...
            if (i == MUT_SAPROVOROUS
                && (you.species == SP_TROLL || you.species == SP_OGRE))
            {
                result += EOL "You like to eat raw meat.";
            }

Insertion in crawl-ref/source/libgui.cc at line 31 [4.5793336]
[4.5794038]
[4.5794038]
```
#include "mon-util.h"
```

Replacement in crawl-ref/source/libgui.cc at line 327 [4.5793336]

B:BD[4.5803654] → [4.5803654:5803719]

    const coord_def gc(x,y);
    unsigned int feature = grd(gc);

[4.5803654]

[4.5803719]

    
    if (x == you.x_pos && y == you.y_pos)
        c = MAP_WHITE; // player position always in white
    else if (mgrd[x][y] != NON_MONSTER && mons_friendly(&menv[mgrd[x][y]])
             && upd_tile)
        c = MAP_LTRED; // friendly monsters subtly different from hostiles
    else
    {
        const coord_def gc(x,y);
        unsigned int feature = grd(gc);

Replacement in crawl-ref/source/libgui.cc at line 338 [4.5793336]

B:BD[4.5803720] → [4.5803720:5803838]

    unsigned int grid_symbol;
    unsigned short grid_color;
    get_item_symbol(feature, &grid_symbol, &grid_color);

[4.5803720]

[4.5803838]

        unsigned int grid_symbol;
        unsigned short grid_color;
        get_item_symbol(feature, &grid_symbol, &grid_color);

Replacement in crawl-ref/source/libgui.cc at line 342 [4.5793336]

B:BD[4.5803839] → [4.5803839:5804139]

    switch (what)
    {
    // In some cases (like smoke), update the gmap with the ground color
    // instead.  This keeps it prettier in the case of lava + smoke.
    case '#':
        c = gmap_col[grid_symbol & 0xff];
        break;
    default:
        c = gmap_col[what & 0xff];
        break;

[4.5803839]

[4.5804139]

        switch (what)
        {
        // In some cases (like smoke), update the gmap with the ground color
        // instead.  This keeps it prettier in the case of lava + smoke.
        case '#':
            c = gmap_col[grid_symbol & 0xff];
            break;
        default:
            c = gmap_col[what & 0xff];
            break;
        }

Deletion in crawl-ref/source/libgui.cc at line 354 [4.5793336]
B:BD[4.5804145] → [4.5804145:5804146]

Replacement in crawl-ref/source/libgui.cc at line 385 [4.5793336]

B:BD[4.5805073] → [4.5805073:5805164]

    if (x < gmap_min_x)  gmap_min_x = x;
    else
    if (x > gmap_max_x)  gmap_max_x = x;

[4.5805073]

[4.5805164]

    if (x < gmap_min_x)
        gmap_min_x = x;
    else if (x > gmap_max_x)
        gmap_max_x = x;

Replacement in crawl-ref/source/libgui.cc at line 390 [4.5793336]

B:BD[4.5805165] → [4.5805165:5805256]

    if (y < gmap_min_y)  gmap_min_y = y;
    else
    if (y > gmap_max_y)  gmap_max_y = y;

[4.5805165]

[4.5805256]

    if (y < gmap_min_y)
        gmap_min_y = y;
    else if (y > gmap_max_y)
        gmap_max_y = y;

Replacement in crawl-ref/source/libgui.cc at line 445 [4.5793336]

B:BD[4.5806406] → [4.5806406:5806448]

        buf2[ ox + oy * GXM] = MAP_WHITE;

[4.5806406]

[4.5806448]

        buf2[ ox + oy * GXM] = MAP_WHITE; // highlight centre of the map

Replacement in crawl-ref/source/libgui.cc at line 1256 [4.5793336]

B:BD[3.4095] → [3.4095:4155]

                            if (you.equip[EQ_WEAPON] == ix)

[3.4095]

[3.4155]

                            if (you.equip[EQ_WEAPON] == ix
                                && type != OBJ_MISCELLANY
                                && (!item_is_rod(you.inv[ix])
                                    || !item_type_known(you.inv[ix])))

Insertion in crawl-ref/source/libgui.cc at line 1276 [4.5793336]
[3.4786]
[3.4786]
```
                        case OBJ_MISCELLANY:
```
Deletion in crawl-ref/source/libgui.cc at line 1280 [4.5793336]
B:BD[3.4916] → [3.4916:4962]
```
                        case OBJ_STAVES + 18:
```

Insertion in crawl-ref/source/libgui.cc at line 1281 [4.5793336]

[3.5009]

                            break;
                        case OBJ_MISCELLANY + 18:
                            if (you.inv[ix].sub_type >= MISC_DECK_OF_ESCAPE
                                && you.inv[ix].sub_type <= MISC_DECK_OF_DEFENSE)
                            {
                                desc += "draw a card";
                                break;
                            }
                            // else fall-through
                        case OBJ_STAVES + 18: // rods - other staves handled above
                            desc += "*(E)voke";

Deletion in crawl-ref/source/item_use.cc at line 4486 [6.2781507]
B:BD[4.5850047] → [3.7230:7231]
Replacement in crawl-ref/source/item_use.cc at line 4488 [6.2781507]
B:BD[4.5850062] → [4.5850062:5850098]
```
    switch (you.inv[idx].base_type)
```
[4.5850062]
[4.5850098]
```
    const int type = you.inv[idx].base_type;
    switch (type)
```

Deletion in crawl-ref/source/item_use.cc at line 4493 [6.2781507]

B:BD[4.5850155] → [4.5850155:5850411]

            if (!check_warning_inscriptions(you.inv[idx], OPER_WIELD))
                return;
            if (equipped)
                wield_weapon(true, PROMPT_GOT_SPECIAL);
            else
                wield_weapon(true, idx);
            return;

Replacement in crawl-ref/source/item_use.cc at line 4494 [6.2781507]

B:BD[4.5850440] → [4.5850440:5850466]

            if (equipped)

[4.5850440]

[4.5850466]

            // wield any unwielded item of these types
            if (!equipped)

Replacement in crawl-ref/source/item_use.cc at line 4497 [6.2781507]

B:BD[4.5850480] → [4.5850480:5850616]

                if (!check_warning_inscriptions(you.inv[idx], OPER_EVOKE))
                    return;
                evoke_wielded();

[4.5850480]

[4.5850616]

                if (check_warning_inscriptions(you.inv[idx], OPER_WIELD))
                    wield_weapon(true, idx);
                return;

Replacement in crawl-ref/source/item_use.cc at line 4501 [6.2781507]

B:BD[4.5850630] → [4.5850630:5850647]

            else

[4.5850630]

[4.5850647]

            // evoke misc. items and known rods
            if (type == OBJ_MISCELLANY
                ||item_is_rod(you.inv[idx]) && item_type_known(you.inv[idx]))

Replacement in crawl-ref/source/item_use.cc at line 4505 [6.2781507]

B:BD[4.5850661] → [4.5850661:5850805]

                if (!check_warning_inscriptions(you.inv[idx], OPER_WIELD))
                    return;
                wield_weapon(true, idx);

[4.5850661]

[4.5850805]

                if (check_warning_inscriptions(you.inv[idx], OPER_EVOKE))
                    evoke_wielded();
                return;

Insertion in crawl-ref/source/item_use.cc at line 4509 [6.2781507]

[4.5850819]

            // unwield unknown rods, other staves or weapons
            if (check_warning_inscriptions(you.inv[idx], OPER_WIELD))
                wield_weapon(true, PROMPT_GOT_SPECIAL); // unwield

Replacement in crawl-ref/source/item_use.cc at line 4513 [6.2781507]
B:BD[4.5850839] → [4.5850839:5850840]
[4.5850839]
[4.5850840]
```
            
```

Replacement in crawl-ref/source/item_use.cc at line 4515 [6.2781507]

B:BD[4.5850867] → [4.5850867:5850995]

            if (!check_warning_inscriptions(you.inv[idx], OPER_THROW))
                return;
            throw_anything(idx);

[4.5850867]

[4.5850995]

            if (check_warning_inscriptions(you.inv[idx], OPER_THROW))
                throw_anything(idx);

Replacement in crawl-ref/source/item_use.cc at line 4522 [6.2781507]

B:BD[4.5851081] → [4.5851081:5851223]

                if (!check_warning_inscriptions(you.inv[idx], OPER_TAKEOFF))
                    return;
                takeoff_armour(idx);

[4.5851081]

[4.5851223]

                if (check_warning_inscriptions(you.inv[idx], OPER_TAKEOFF))
                    takeoff_armour(idx);

Replacement in crawl-ref/source/item_use.cc at line 4525 [6.2781507]

B:BD[4.5851237] → [4.5851237:5851370]

            else
            {
                if (!check_warning_inscriptions(you.inv[idx], OPER_WEAR))
                    return;

[4.5851237]

[4.5851370]

            else if (check_warning_inscriptions(you.inv[idx], OPER_WEAR))

Deletion in crawl-ref/source/item_use.cc at line 4527 [6.2781507]
B:BD[4.5851404] → [4.5851404:5851418]
```
            }
```

Replacement in crawl-ref/source/item_use.cc at line 4530 [6.2781507]

B:BD[4.5851463] → [4.5851463:5851583]

            if (!check_warning_inscriptions(you.inv[idx], OPER_ZAP))
                return;
            zap_wand(idx);

[4.5851463]

[4.5851583]

            if (check_warning_inscriptions(you.inv[idx], OPER_ZAP))
                zap_wand(idx);

Replacement in crawl-ref/source/item_use.cc at line 4543 [6.2781507]

B:BD[4.5851627] → [4.5851627:5851754]

            if (!check_warning_inscriptions(you.inv[idx], OPER_EAT))
                return;
            eat_food(false, idx);

[4.5851627]

[4.5851754]

            if (check_warning_inscriptions(you.inv[idx], OPER_EAT))
                eat_food(false, idx);

Replacement in crawl-ref/source/item_use.cc at line 4551 [6.2781507]

B:BD[9.3165] → [9.3165:3279]

∅:D[9.3279] → [10.5359:5389]

B:BD[10.5359] → [10.5359:5389]

                handle_read_book(idx);
                return;
            }
            // else it's a spellbook
            learn_spell(idx);

[9.3165]

[10.5389]

                if (check_warning_inscriptions(you.inv[idx], OPER_READ))
                    handle_read_book(idx);
            } // else it's a spellbook
            else if (check_warning_inscriptions(you.inv[idx], OPER_MEMORISE))
                learn_spell(idx);

Replacement in crawl-ref/source/item_use.cc at line 4559 [6.2781507]

B:BD[4.5851825] → [4.5851825:5851949]

            if (!check_warning_inscriptions(you.inv[idx], OPER_READ))
                return;
            read_scroll(idx);

[4.5851801]

[4.5851949]

            if (check_warning_inscriptions(you.inv[idx], OPER_READ))
                read_scroll(idx);

Replacement in crawl-ref/source/item_use.cc at line 4566 [6.2781507]

B:BD[4.5852038] → [4.5852038:5852176]

                if (!check_warning_inscriptions(you.inv[idx], OPER_REMOVE))
                    return;
                remove_ring(idx);

[4.5852038]

[4.5852176]

                if (check_warning_inscriptions(you.inv[idx], OPER_REMOVE))
                    remove_ring(idx);

Replacement in crawl-ref/source/item_use.cc at line 4569 [6.2781507]

B:BD[4.5852190] → [4.5852190:5852324]

            else
            {
                if (!check_warning_inscriptions(you.inv[idx], OPER_PUTON))
                    return;

[4.5852190]

[4.5852324]

            else if (check_warning_inscriptions(you.inv[idx], OPER_PUTON))

Deletion in crawl-ref/source/item_use.cc at line 4571 [6.2781507]
B:BD[4.5852364] → [4.5852364:5852378]
```
            }
```

Replacement in crawl-ref/source/item_use.cc at line 4574 [6.2781507]

B:BD[4.5852425] → [4.5852425:5852544]

            if (!check_warning_inscriptions(you.inv[idx], OPER_QUAFF))
                return;
            drink(idx);

[4.5852425]

[4.5852544]

            if (check_warning_inscriptions(you.inv[idx], OPER_QUAFF))
                drink(idx);

Some more improvements for (you guessed it) the tiles.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tiles.h at line 43 [4.7013]

Insertion in crawl-ref/source/tile2.cc at line 2828 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2830 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2834 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2837 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2840 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2843 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2894 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2900 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 2929 [4.13289]

Replacement in crawl-ref/source/tile1.cc at line 67 [4.96318]

Insertion in crawl-ref/source/tile1.cc at line 72 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 77 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 795 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 797 [4.96318]