fiddlerwoaroof/crawl - Change HVEU33HIUHCYFINJMVSSOIRUPZGGVC7NMWUN2EADG2W373JP3WOAC

* Allow viewing of card descriptions from Triple Draw and Stack Deck.

Sort items in 'V' screen according to pickup menu sort order.
Name Xom's randart book gifts more randomly.
Colour items seen by 'x' with message colour tags and same for pickup messages.

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

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

HVEU33HIUHCYFINJMVSSOIRUPZGGVC7NMWUN2EADG2W373JP3WOAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 75 [10.13254]

B:BD[9.76] → [9.76:118]

             bool ignore_clouds = false);

[9.76]

[10.14829]

             bool ignore_clouds = false, bool inwards = false);

Replacement in crawl-ref/source/view.cc at line 2815 [10.16817]

B:BD[11.2713] → [9.732:789]

             bool clear_walls_block, bool ignore_clouds)

[11.2713]

[12.32990]

             bool clear_walls_block, bool ignore_clouds, bool inwards)

Insertion in crawl-ref/source/view.cc at line 2853 [10.16817]
[12.33743]
[9.844]

Replacement in crawl-ref/source/view.cc at line 3988 [10.16817]

B:BD[3.261] → [3.261:303]

∅:D[3.303] → [13.909:954]

B:BD[13.909] → [13.909:954]

            && crawl_view.in_grid_los(p))
        || see_grid(env.show, you.pos(), p);

[3.261]

[14.1153]

                && crawl_view.in_grid_los(p))
            || see_grid(env.show, you.pos(), p);

Replacement in crawl-ref/source/view.cc at line 4863 [10.16817]

B:BD[15.876] → [16.430:595]

∅:D[16.595] → [15.1044:1092]

B:BD[15.1044] → [15.1044:1092]

                (!map_bounds(gc)) ? 0
                : (!crawl_view.in_grid_los(gc)) ? get_envmap_char(gc.x, gc.y)
                : (gc == you.pos()) ? you.symbol
                : get_screen_glyph(gc.x, gc.y);

[15.876]

[16.596]

                  (!map_bounds(gc))             ? 0 :
                  (!crawl_view.in_grid_los(gc)) ? get_envmap_char(gc.x, gc.y) :
                  (gc == you.pos())             ? you.symbol
                                                : get_screen_glyph(gc.x, gc.y);

Replacement in crawl-ref/source/travel.cc at line 316 [17.39949]
B:BD[9.3778] → [9.3778:3822]
```
    losight(show, fgrid, pos, false, true);
```
[9.3778]
[9.3822]
```
    losight(show, fgrid, pos, false, true, true);
```

Replacement in crawl-ref/source/tilesdl.cc at line 1308 [18.19415]

B:BD[18.39738] → [18.39738:39803]

        desc.quantity = item.quantity == 1 ? -1 : item.quantity;

[18.39738]

[18.39803]

        desc.quantity = (item.quantity == 1) ? -1 : item.quantity;

Insertion in crawl-ref/source/tilesdl.cc at line 1316 [18.19415]

[18.39989]

    else if (item_is_rod(item) && item.flags & ISFLAG_KNOW_PLUSES)
        desc.quantity = item.plus / ROD_CHARGE_MULT;

Replacement in crawl-ref/source/spl-book.cc at line 1528 [10.397614]
B:BD[19.230] → [20.146:189]
```
    if ( !item_is_rod(item) || type == -1)
```
[19.230]
[17.190993]
```
    if (!item_is_rod(item) || type == -1)
```

Replacement in crawl-ref/source/spl-book.cc at line 2045 [10.397614]

B:BD[21.13569] → [22.1002:1026]

B:BD[22.1026] → [23.350:452]

∅:D[23.452] → [22.1027:1052]

B:BD[24.501] → [22.1027:1052]

∅:D[22.1052] → [24.530:555]

B:BD[24.530] → [24.530:555]

B:BD[24.555] → [22.1053:1082]

    std::string lookup;
    if (level == 1)
        lookup = "starting";
    else if (level <= 3 || level == 4 && coinflip())
        lookup = "easy";
    else if (level <= 6)
        lookup = "moderate";

[21.13569]

[24.588]

    std::string bookname;
    if (god == GOD_XOM && coinflip())
    {
        bookname = getRandNameString("book_noun") + " of "
                   + getRandNameString("Xom_book_title");
    }

Replacement in crawl-ref/source/spl-book.cc at line 2052 [10.397614]

B:BD[24.597] → [22.1083:1113]

        lookup = "difficult";

[24.597]

[22.1113]

    {
        std::string lookup;
        if (level == 1)
            lookup = "starting";
        else if (level <= 3 || level == 4 && coinflip())
            lookup = "easy";
        else if (level <= 6)
            lookup = "moderate";
        else
            lookup = "difficult";

Replacement in crawl-ref/source/spl-book.cc at line 2063 [10.397614]
B:BD[22.1114] → [22.1114:1143]
```
    lookup += " level book";
```
[22.1114]
[22.1143]
```
        lookup += " level book";
```

Replacement in crawl-ref/source/spl-book.cc at line 2065 [10.397614]

B:BD[22.1144] → [22.1144:1376]

    std::string bookname;
    // First try for names respecting the book's previous owner/author
    // (if one exists), then check for general difficulty.
    if (has_owner)
        bookname = getRandNameString(lookup + " owner");

[22.1144]

[22.1376]

        // First try for names respecting the book's previous owner/author
        // (if one exists), then check for general difficulty.
        if (has_owner)
            bookname = getRandNameString(lookup + " owner");
        if (!has_owner || bookname.empty())
            bookname = getRandNameString(lookup);

Replacement in crawl-ref/source/spl-book.cc at line 2073 [10.397614]

B:BD[22.1377] → [22.1377:1463]

    if (!has_owner || bookname.empty())
        bookname = getRandNameString(lookup);

[22.1377]

[24.631]

        bookname = uppercase_first(bookname);
        if (has_owner)
        {
            if (bookname.substr(0, 4) == "The ")
                bookname = bookname.substr(4);
            else if (bookname.substr(0, 2) == "A ")
                bookname = bookname.substr(2);
            else if (bookname.substr(0, 3) == "An ")
                bookname = bookname.substr(3);
        }

Replacement in crawl-ref/source/spl-book.cc at line 2084 [10.397614]

B:BD[24.706] → [24.706:748]

B:BD[24.748] → [23.453:749]

    bookname = uppercase_first(bookname);
    if (has_owner)
    {
        if (bookname.substr(0, 4) == "The ")
            bookname = bookname.substr(4);
        else if (bookname.substr(0, 2) == "A ")
            bookname = bookname.substr(2);
        else if (bookname.substr(0, 3) == "An ")
            bookname = bookname.substr(3);

[24.632]

[23.749]

        if (bookname.find("@level@", 0) != std::string::npos)
        {
            std::string number;
            switch (level)
            {
            case 1: number = "One"; break;
            case 2: number = "Two"; break;
            case 3: number = "Three"; break;
            case 4: number = "Four"; break;
            case 5: number = "Five"; break;
            case 6: number = "Six"; break;
            case 7: number = "Seven"; break;
            case 8: number = "Eight"; break;
            case 9: number = "Nine"; break;
            default:
                number = ""; break;
            }
            bookname = replace_all(bookname, "@level@", number);
        }

Deletion in crawl-ref/source/spl-book.cc at line 2108 [10.397614]

B:BD[23.758] → [23.758:1369]

∅:D[23.1369] → [24.820:821]

B:BD[24.820] → [24.820:821]

    if (bookname.find("@level@", 0) != std::string::npos)
    {
        std::string number;
        switch (level)
        {
        case 1: number = "One"; break;
        case 2: number = "Two"; break;
        case 3: number = "Three"; break;
        case 4: number = "Four"; break;
        case 5: number = "Five"; break;
        case 6: number = "Six"; break;
        case 7: number = "Seven"; break;
        case 8: number = "Eight"; break;
        case 9: number = "Nine"; break;
        default:
            number = ""; break;
        }
        bookname = replace_all(bookname, "@level@", number);
    }

Replacement in crawl-ref/source/spl-book.cc at line 2364 [10.397614]

B:BD[25.2591] → [25.2591:2623]

                return (false);

[25.2591]

[25.2623]

            {
                if (completely_random)
                    return (false);
                // Rather than give up at this point, choose schools randomly.
                // This way, an acquirement won't fail once the player has
                // seen all spells.
                if (!_get_weighted_discs(true, god, disc1, disc2))
                    return (false);
            }

Replacement in crawl-ref/source/spl-book.cc at line 2645 [10.397614]

B:BD[6.640] → [6.640:706]

    if (one_chance_in(20) && (owner.empty() || one_chance_in(3)))

[6.640]

[6.706]

    if (owner == "Xom" && !one_chance_in(20))
        bookname = getRandNameString("Xom_book_title");
    else if (one_chance_in(20) && (owner.empty() || one_chance_in(3)))

Insertion in crawl-ref/source/menu.cc at line 1421 [17.261322]
[12.581314]
[12.581314]
```
    {
```
Insertion in crawl-ref/source/menu.cc at line 1423 [17.261322]
[12.581362]
[12.581362]
```
    }
```

Replacement in crawl-ref/source/menu.cc at line 1752 [17.261322]

B:BD[26.1368] → [27.1235:1302]

∅:D[27.1302] → [26.1423:1483]

B:BD[26.1423] → [26.1423:1483]

    if (first_entry + pagesize < static_cast<int>(items.size()) &&
        items[first_entry + pagesize]->level != MEL_TITLE )

[26.1368]

[26.1483]

    if (first_entry + pagesize < static_cast<int>(items.size())
        && items[first_entry + pagesize]->level != MEL_TITLE)

Replacement in crawl-ref/source/items.cc at line 304 [10.2584728]
B:BD[2.3055] → [2.3055:3083]
```
    if ( !suppress_burden )
```
[2.3055]
[2.3083]
```
    if (!suppress_burden)
```
Replacement in crawl-ref/source/items.cc at line 1303 [10.2584728]
B:BD[10.2611591] → [10.2611591:2611639]
```
}                               // end pickup()
```
[10.2611591]
[10.2611639]
```
}
```

Replacement in crawl-ref/source/items.cc at line 1618 [10.2584728]

B:BD[10.2615682] → [28.7979:8047]

∅:D[28.8047] → [10.2615805:2615806]

B:BD[10.2615805] → [10.2615805:2615806]

                    mpr( you.inv[m].name(DESC_INVENTORY).c_str() );

[10.2615682]

[12.635396]

                {
                    mpr(get_message_colour_tags(you.inv[m],
                                                DESC_INVENTORY).c_str());
                }

Replacement in crawl-ref/source/items.cc at line 1629 [10.2584728]
B:BD[10.2615957] → [10.2615957:2616000]
```
    // can't combine, check for slot space
```
[10.2615957]
[10.2616000]
```
    // Can't combine, check for slot space.
```

Replacement in crawl-ref/source/items.cc at line 1686 [10.2584728]

B:BD[17.354865] → [28.8048:8111]

B:BD[28.8111] → [29.21682:21683]

        mpr( you.inv[freeslot].name(DESC_INVENTORY).c_str() );

[17.354865]

[30.80193]

    {
        mpr(get_message_colour_tags(you.inv[freeslot],
                                    DESC_INVENTORY).c_str());
    }

Deletion in crawl-ref/source/itemname.cc at line 1936 [10.2667494]
B:BD[12.716738] → [12.716738:716795]
```
        menu.load_items(items, discoveries_item_mangle);
```
Insertion in crawl-ref/source/itemname.cc at line 1937 [10.2667494]
[12.716832]
[12.716832]
```
        menu.load_items(items, discoveries_item_mangle);
```

Replacement in crawl-ref/source/itemname.cc at line 1941 [10.2667494]

B:BD[10.2765348] → [12.716879:716998]

        for ( std::vector<const item_def*>::iterator iter = items.begin();
              iter != items.end(); ++iter )

[10.2765348]

[12.716998]

        for (std::vector<const item_def*>::iterator iter = items.begin();
             iter != items.end(); ++iter)
        {

Insertion in crawl-ref/source/itemname.cc at line 1945 [10.2667494]
[12.717024]
[12.717024]
```
        }
```

Insertion in crawl-ref/source/invent.h at line 159 [10.2919073]

[12.770122]

    const menu_sort_condition *find_menu_sort_condition() const;
    void sort_menu(std::vector<InvEntry*> &items,
                   const menu_sort_condition *cond);

Deletion in crawl-ref/source/invent.h at line 165 [10.2919073]

B:BD[12.770201] → [31.6705:6873]

    void sort_menu(std::vector<InvEntry*> &items,
                   const menu_sort_condition *cond);
    const menu_sort_condition *find_menu_sort_condition() const;

Replacement in crawl-ref/source/invent.cc at line 152 [10.2920632]

B:BD[32.4331] → [33.376:525]

// returns values < 0 for edible chunks (non-rotten except for Saprovores),
// 0 for non-chunks, and values > 0 for rotten chunks for non-Saprovores

[32.4331]

// Returns values < 0 for edible chunks (non-rotten except for Saprovores),
// 0 for non-chunks, and values > 0 for rotten chunks for non-Saprovores.

Replacement in crawl-ref/source/invent.cc at line 742 [10.2920632]

B:BD[34.5113] → [8.6798:6875]

                const std::string str = "Magical Devices"; // longest string

[34.5113]

[8.6875]

                const std::string str = "Magical Staves and Rods"; // longest string

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

∅:D[35.7003] → [36.3669:3797]

B:BD[36.3669] → [36.3669:3797]

    InvMenu desc_menu(MF_SINGLESELECT | MF_ANYPRINTABLE |
                      /*MF_ALWAYS_SHOW_MORE |*/ MF_ALLOW_FORMATTING);

[35.7003]

[37.5169]

    InvMenu desc_menu(MF_SINGLESELECT | MF_ANYPRINTABLE
                        | MF_ALLOW_FORMATTING);

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

B:BD[37.5448] → [37.5448:5486]

    desc_menu.set_tag("description");

[37.5448]

[35.7234]

    desc_menu.set_tag("pickup");
    desc_menu.set_type(MT_PICKUP); // necessary for sorting of the item submenu

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

B:BD[37.5952] → [37.5952:6026]

            unsigned char colour = mons_class_colour(list_mons[i]->type);

[37.5952]

[37.6026]

            unsigned char colour = get_mons_colour(list_mons[i]);

Deletion in crawl-ref/source/directn.cc at line 584 [10.3697945]
B:BD[37.7415] → [37.7415:7450]
```
                    me->tag = "m";
```

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

[37.7855]

        std::vector<InvEntry*> all_items;
        for (unsigned int i = 0; i < list_items.size(); ++i)
            all_items.push_back( new InvEntry(list_items[i]) );
        const menu_sort_condition *cond = desc_menu.find_menu_sort_condition();
        desc_menu.sort_menu(all_items, cond);

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

B:BD[37.7926] → [37.7926:7987]

        for (unsigned int i = 0; i < list_items.size(); ++i)

[37.7926]

[37.7987]

        for (unsigned int i = 0; i < all_items.size(); ++i)

Replacement in crawl-ref/source/directn.cc at line 612 [10.3697945]
B:BD[37.8084] → [36.3798:3848]
∅:D[38.5348] → [37.8344:8345]
B:BD[37.8344] → [37.8344:8345]
B:BD[36.3855] → [36.3855:3902]
```
            const item_def &item = list_items[i];
            InvEntry *me = new InvEntry(item);
```
[37.8084]
[36.4103]
```
            InvEntry *me = all_items[i];
```
Replacement in crawl-ref/source/directn.cc at line 617 [10.3697945]
∅:D[39.4044] → [37.9129:9156]
∅:D[36.4208] → [37.9129:9156]
∅:D[38.5453] → [37.9129:9156]
B:BD[37.9129] → [37.9129:9156]
```
            me->tag = "i";
```
[36.4208]
[36.4209]
```
            me->tag = "pickup";
```
Insertion in crawl-ref/source/directn.cc at line 701 [10.3697945]
[40.4409]
[40.4409]
```
    // Clear cursor placement.
```
Deletion in crawl-ref/source/directn.cc at line 3188 [10.3697945]
∅:D[41.16163] → [10.3720033:3720034]
B:BD[10.3720033] → [10.3720033:3720034]
B:BD[10.3720034] → [42.5617:5649]
```
        _describe_monster(mon);
```

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

[43.415]

[10.3720569]

            if (mons_is_known_mimic(mon))
                _describe_monster(mon);
            else
            {
                item_def item;
                get_mimic_item( mon, item );
                std::string name = get_message_colour_tags(item, DESC_NOCAP_A,
                                                           MSGCH_FLOOR_ITEMS);
                mprf("You see %s here.", name.c_str());
            }

Insertion in crawl-ref/source/directn.cc at line 3206 [10.3697945]
[42.5699]
[35.9092]
```
            _describe_monster(mon);
```

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

[44.8907]

[45.883]

                std::string name = get_message_colour_tags(mitm[targ_item],
                                                           DESC_NOCAP_A,
                                                           MSGCH_FLOOR_ITEMS);

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

B:BD[45.944] → [28.28330:28397]

                      mitm[targ_item].name(DESC_NOCAP_A).c_str());

[45.944]

[44.8908]

                      name.c_str());

Replacement in crawl-ref/source/describe.cc at line 1969 [10.3736416]

B:BD[10.3842208] → [46.5621:5822]

            description <<
                "$It uses its own mana reservoir for casting spells, and "
                "recharges automatically by channeling mana from its "
                "wielder.";

[10.3842208]

[46.5822]

            if (verbose)
            {
                description <<
                    "$It uses its own mana reservoir for casting spells, and "
                    "recharges automatically by channeling mana from its "
                    "wielder.";

Replacement in crawl-ref/source/describe.cc at line 1976 [10.3736416]

B:BD[46.5823] → [5.2739:2845]

∅:D[5.2845] → [47.15741:15755]

∅:D[46.6019] → [47.15741:15755]

B:BD[47.15741] → [47.15741:15755]

B:BD[47.15755] → [5.2846:2963]

            const int max_charges = MAX_ROD_CHARGE;
            if (item_ident(item, ISFLAG_KNOW_PLUSES))
            {
                const int num_charges = item.plus2 / ROD_CHARGE_MULT;
                if (max_charges > num_charges)

[46.5823]

[5.2963]

                const int max_charges = MAX_ROD_CHARGE;
                if (item_ident(item, ISFLAG_KNOW_PLUSES))

Replacement in crawl-ref/source/describe.cc at line 1979 [10.3736416]

B:BD[5.2981] → [5.2981:3253]

                    description << "$It can currently hold " << num_charges
                                << " charges. It can be magically recharged "
                                << "to contain up to " << max_charges
                                << " charges.";

[5.2981]

[5.3253]

                    const int num_charges = item.plus2 / ROD_CHARGE_MULT;
                    if (max_charges > num_charges)
                    {
                        description << "$It can currently hold " << num_charges
                                    << " charges. It can be magically recharged "
                                    << "to contain up to " << max_charges
                                    << " charges.";
                    }
                    else
                        description << "$It is fully charged.";

Replacement in crawl-ref/source/describe.cc at line 1991 [10.3736416]

B:BD[5.3292] → [5.3292:3352]

                    description << "$It is fully charged.";

[5.3292]

[47.15973]

                {
                    description << "$It can have at most " << max_charges
                                << " charges.";
                }

Replacement in crawl-ref/source/describe.cc at line 1996 [10.3736416]
B:BD[47.15987] → [47.15987:16004]
```
            else
```
[47.15987]
[47.16004]
```
            else if (Options.dump_book_spells)
```

Replacement in crawl-ref/source/describe.cc at line 1998 [10.3736416]

B:BD[47.16018] → [46.6077:6191]

                description << "$It can have at most " << max_charges
                            << " charges.";

[47.16018]

[46.6191]

                append_spells( desc, item );
                if (desc.empty())
                    need_extra_line = false;
                else
                    description << desc;

Deletion in crawl-ref/source/describe.cc at line 2222 [10.3736416]
B:BD[48.3062] → [49.14146:14169]
```
    describe_info inf;
```
Insertion in crawl-ref/source/decks.cc at line 20 [10.3987460]
[50.329]
[51.310]
```
#include "database.h"
```

Insertion in crawl-ref/source/decks.cc at line 930 [10.3987460]

[52.2266]


static void _describe_cards(std::vector<card_type> cards)
{
    ASSERT(!cards.empty());
    std::ostringstream data;
    for (unsigned int i = 0; i < cards.size(); ++i)
    {
        std::string name = card_name(cards[i]);
        std::string desc = getLongDescription(name + " card");
        if (desc.empty())
            desc = "No description found.";
        data << name << "$$" << desc << "$$";
    }
    print_description(data.str());
    if (getch() == 0)
        getch();

Insertion in crawl-ref/source/decks.cc at line 949 [10.3987460]
[52.2267]
[50.690]
```
    redraw_screen();
}
```
Insertion in crawl-ref/source/decks.cc at line 1009 [10.3987460]
[52.3023]
[50.753]
```
        bool need_prompt_redraw = true;
```
Deletion in crawl-ref/source/decks.cc at line 1011 [10.3987460]
B:BD[50.799] → [50.799:817]
B:BD[50.817] → [53.8052:8074]
∅:D[53.8074] → [50.838:966]
B:BD[50.838] → [50.838:966]
B:BD[50.966] → [53.8075:8098]
∅:D[53.8098] → [50.988:1031]
B:BD[50.988] → [50.988:1031]
∅:D[50.1031] → [52.3227:3228]
B:BD[52.3227] → [52.3227:3228]
B:BD[52.3228] → [54.57366:57414]
B:BD[54.57414] → [55.9957:9958]
∅:D[55.9958] → [50.1088:1159]
B:BD[50.1088] → [50.1088:1159]
```
        clrscr();
        cgotoxy(1,1);
        textcolor(WHITE);
        cprintf("Press a digit to select a card, "
                "then another digit to swap it.");
        cgotoxy(1,10);
        cprintf("Press Enter to accept.");
        _redraw_stacked_cards(draws, selected);
        // Hand-hacked implementation, instead of using Menu. Oh well.
```

Insertion in crawl-ref/source/decks.cc at line 1013 [10.3987460]

[54.57446]

[50.1179]

            if (need_prompt_redraw)
            {
                clrscr();
                cgotoxy(1,1);
                textcolor(WHITE);
                cprintf("Press a digit to select a card, then another digit "
                        "to swap it.");
                cgotoxy(1,10);
                cprintf("Press ? for the card descriptions, or Enter to "
                        "accept.");
                _redraw_stacked_cards(draws, selected);
                need_prompt_redraw = false;
            }
            // Hand-hacked implementation, instead of using Menu. Oh well.

Replacement in crawl-ref/source/decks.cc at line 1043 [10.3987460]

B:BD[55.9960] → [56.15127:15198]

            if (c >= '1' && c <= '0' + static_cast<int>(draws.size()))

[55.9960]

[52.3520]

            if (c == '?')
            {
                _describe_cards(draws);
                need_prompt_redraw = true;
            }
            else if (c >= '1' && c <= '0' + static_cast<int>(draws.size()))

Deletion in crawl-ref/source/decks.cc at line 1123 [10.3987460]

B:BD[57.4858] → [57.4858:4900]

B:BD[57.4900] → [58.42185:42227]

∅:D[58.42227] → [54.57872:57878]

B:BD[57.4944] → [54.57872:57878]

∅:D[54.57878] → [57.4944:5092]

B:BD[57.4944] → [57.4944:5092]

B:BD[57.5092] → [54.57879:57885]

    mpr("You draw... (choose one card)");
    for (int i = 0; i < num_to_draw; ++i)
    {
        msg::streams(MSGCH_PROMPT) << (static_cast<char>(i + 'a')) << " - "
                                   << card_name(draws[i]) << std::endl;
    }

Insertion in crawl-ref/source/decks.cc at line 1124 [10.3987460]
[57.5115]
[58.42228]
```
    bool need_prompt_redraw = true;
```

Insertion in crawl-ref/source/decks.cc at line 1127 [10.3987460]

[57.5137]

[52.3886]

        if (need_prompt_redraw)
        {
            mpr("You draw... (choose one card, ? for their descriptions)");
            for (int i = 0; i < num_to_draw; ++i)
            {
                msg::streams(MSGCH_PROMPT) << (static_cast<char>(i + 'a')) << " - "
                                           << card_name(draws[i]) << std::endl;
            }
            need_prompt_redraw = false;
        }

Replacement in crawl-ref/source/decks.cc at line 1138 [10.3987460]
∅:D[52.3931] → [57.5233:5288]
B:BD[57.5233] → [57.5233:5288]
```
        if (keyin >= 'a' && keyin < 'a' + num_to_draw)
```
[52.3931]
[57.5288]
```
        if (keyin == '?')
```

Insertion in crawl-ref/source/decks.cc at line 1140 [10.3987460]

[57.5298]

            _describe_cards(draws);
            need_prompt_redraw = true;
        }
        else if (keyin >= 'a' && keyin < 'a' + num_to_draw)
        {

Deletion in crawl-ref/source/debug.cc at line 1281 [10.4016436]
B:BD[4.3253] → [4.3253:3263]
```
        {
```
Deletion in crawl-ref/source/debug.cc at line 1282 [10.4016436]
B:BD[4.3339] → [4.3339:3349]
```
        }
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 3 [59.2804]
∅:D[7.5183] → [59.2810:2821]
B:BD[59.2810] → [59.2810:2821]
```
the Portal
```
[7.5183]
[59.2821]
```
the Portal card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 8 [59.2804]
B:BD[59.2943] → [59.2943:2952]
```
the Warp
```
[59.2943]
[59.2952]
```
the Warp card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 13 [59.2804]
B:BD[59.3080] → [59.3080:3085]
```
Swap
```
[59.3080]
[59.3085]
```
Swap card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 18 [59.2804]
B:BD[59.3152] → [59.3152:3161]
```
Velocity
```
[59.3152]
[59.3161]
```
Velocity card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 24 [59.2804]
B:BD[7.5450] → [7.5450:5459]
```
the Tomb
```
[7.5450]
[7.5459]
```
the Tomb card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 29 [59.2804]
B:BD[7.5690] → [7.5690:5702]
```
the Banshee
```
[7.5690]
[7.5702]
```
the Banshee card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 34 [59.2804]
B:BD[59.3212] → [59.3212:3222]
```
Damnation
```
[59.3212]
[59.3222]
```
Damnation card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 39 [59.2804]
B:BD[59.3314] → [59.3314:3323]
```
Solitude
```
[59.3314]
[59.3323]
```
Solitude card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 44 [59.2804]
B:BD[7.5977] → [7.5977:5988]
```
Warpwright
```
[7.5977]
[7.5988]
```
Warpwright card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 49 [59.2804]
B:BD[59.3385] → [7.6082:6089]
```
Flight
```
[59.3385]
[7.6089]
```
Flight card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 55 [59.2804]
∅:D[7.6298] → [59.3385:3396]
B:BD[59.3385] → [59.3385:3396]
```
the Elixir
```
[7.6298]
[59.3396]
```
the Elixir card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 60 [59.2804]
B:BD[59.3488] → [59.3488:3499]
```
Battlelust
```
[59.3488]
[59.3499]
```
Battlelust card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 65 [59.2804]
B:BD[59.3560] → [59.3560:3574]
```
Metamorphosis
```
[59.3560]
[59.3574]
```
Metamorphosis card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 70 [59.2804]
B:BD[59.3618] → [59.3618:3627]
```
the Helm
```
[59.3618]
[59.3627]
```
the Helm card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 75 [59.2804]
B:BD[59.3668] → [59.3668:3678]
```
the Blade
```
[59.3668]
[59.3678]
```
the Blade card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 80 [59.2804]
B:BD[59.3745] → [59.3745:3756]
```
the Shadow
```
[59.3745]
[59.3756]
```
the Shadow card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 86 [59.2804]
∅:D[7.6687] → [59.3834:3845]
B:BD[59.3834] → [59.3834:3845]
```
the Potion
```
[7.6687]
[59.3845]
```
the Potion card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 91 [59.2804]
B:BD[59.3941] → [59.3941:3947]
```
Focus
```
[59.3941]
[59.3947]
```
Focus card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 96 [59.2804]
B:BD[59.4030] → [59.4030:4038]
```
Shuffle
```
[59.4030]
[59.4038]
```
Shuffle card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 101 [59.2804]
B:BD[59.4108] → [59.4108:4119]
```
Experience
```
[59.4108]
[59.4119]
```
Experience card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 106 [59.2804]
B:BD[59.4163] → [59.4163:4173]
```
the Helix
```
[59.4163]
[59.4173]
```
the Helix card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 111 [59.2804]
B:BD[59.4280] → [59.4280:4289]
```
the Sage
```
[59.4280]
[59.4289]
```
the Sage card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 117 [59.2804]
∅:D[7.7047] → [59.4989:4995]
B:BD[59.4989] → [59.4989:4995]
```
Water
```
[7.7047]
[59.4995]
```
Water card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 122 [59.2804]
B:BD[59.5052] → [59.5052:5066]
```
Vitrification
```
[59.5052]
[59.5066]
```
Vitrification card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 127 [59.2804]
B:BD[59.5107] → [59.5107:5115]
```
the Map
```
[59.5107]
[59.5115]
```
the Map card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 132 [59.2804]
B:BD[59.5160] → [7.7213:7221]
```
Dowsing
```
[59.5160]
[7.7221]
```
Dowsing card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 137 [59.2804]
B:BD[7.7367] → [7.7367:7377]
```
the Spade
```
[7.7367]
[7.7377]
```
the Spade card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 142 [59.2804]
B:BD[7.7484] → [7.7484:7495]
```
the Trowel
```
[7.7484]
[59.5172]
```
the Trowel card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 147 [59.2804]
B:BD[59.5236] → [7.7613:7627]
```
the Minefield
```
[59.5236]
[59.5247]
```
the Minefield card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 153 [59.2804]
∅:D[7.7799] → [59.5330:5342]
B:BD[59.5330] → [59.5330:5342]
```
the Crusade
```
[7.7799]
[59.5342]
```
the Crusade card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 158 [59.2804]
B:BD[59.5407] → [59.5407:5416]
```
the Herd
```
[59.5407]
[59.5416]
```
the Herd card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 163 [59.2804]
B:BD[59.5449] → [59.5449:5463]
```
the Pentagram
```
[59.5449]
[59.5463]
```
the Pentagram card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 168 [59.2804]
B:BD[59.5508] → [59.5508:5518]
```
the Dance
```
[59.5508]
[59.5518]
```
the Dance card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 173 [59.2804]
B:BD[59.5560] → [59.5560:5568]
```
Foxfire
```
[59.5560]
[59.5568]
```
Foxfire card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 178 [59.2804]
B:BD[59.5610] → [59.5610:5620]
```
the Bones
```
[59.5610]
[59.5620]
```
the Bones card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 183 [59.2804]
B:BD[59.5664] → [59.5664:5678]
```
Repulsiveness
```
[59.5664]
[59.5678]
```
Repulsiveness card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 188 [59.2804]
B:BD[59.6082] → [59.6082:6090]
```
Vitriol
```
[59.6082]
[59.6090]
```
Vitriol card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 193 [59.2804]
B:BD[59.6158] → [59.6158:6164]
```
Flame
```
[59.6158]
[59.6164]
```
Flame card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 198 [59.2804]
B:BD[59.6212] → [59.6212:6218]
```
Frost
```
[59.6212]
[59.6218]
```
Frost card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 203 [59.2804]
B:BD[59.6265] → [59.6265:6271]
```
Venom
```
[59.6265]
[59.6271]
```
Venom card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 208 [59.2804]
B:BD[59.6353] → [59.6353:6363]
```
the Spark
```
[59.6353]
[59.6363]
```
the Spark card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 213 [59.2804]
B:BD[59.6417] → [59.6417:6428]
```
the Hammer
```
[59.6417]
[59.6428]
```
the Hammer card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 218 [59.2804]
B:BD[59.6479] → [59.6479:6484]
```
Pain
```
[59.6479]
[59.6484]
```
Pain card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 223 [59.2804]
B:BD[59.6572] → [59.6572:6580]
```
Torment
```
[59.6572]
[59.6580]
```
Torment card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 229 [59.2804]
∅:D[7.8650] → [59.6809:6815]
B:BD[59.6809] → [59.6809:6815]
```
Wrath
```
[7.8650]
[59.6815]
```
Wrath card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 234 [59.2804]
B:BD[59.6864] → [59.6864:6875]
```
the Wraith
```
[59.6864]
[59.6875]
```
the Wraith card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 239 [59.2804]
B:BD[59.6907] → [59.6907:6917]
```
the Curse
```
[59.6907]
[59.6917]
```
the Curse card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 244 [59.2804]
B:BD[7.8829] → [7.8829:8833]
```
Xom
```
[7.8829]
[7.8833]
```
Xom card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 249 [59.2804]
B:BD[7.8946] → [7.8946:8953]
```
Famine
```
[7.8946]
[7.8953]
```
Famine card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 254 [59.2804]
B:BD[7.9039] → [7.9039:9050]
```
Wild Magic
```
[7.9039]
[7.9050]
```
Wild Magic card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 260 [59.2804]
B:BD[7.9248] → [7.9248:9260]
```
the Bargain
```
[7.9248]
[7.9260]
```
the Bargain card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 265 [59.2804]
B:BD[7.9355] → [7.9355:9365]
```
the Genie
```
[7.9355]
[7.9365]
```
the Genie card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 270 [59.2804]
B:BD[7.9473] → [7.9473:9483]
```
the Feast
```
[7.9473]
[7.9483]
```
the Feast card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 276 [59.2804]
B:BD[7.9576] → [7.9576:9587]
```
the Stairs
```
[7.9576]
[7.9587]
```
the Stairs card
```
Replacement in crawl-ref/source/dat/descript/cards.txt at line 281 [59.2804]
B:BD[7.9699] → [7.9699:9709]
```
Summoning
```
[7.9699]
[7.9709]
```
Summoning card
```

Insertion in crawl-ref/source/dat/database/randbook.txt at line 146 [60.3838]

[6.10695]

[60.5484]

%%%%
Xom_book_title
w:30
@random_book_title@
# increased chances (obviously!)
@chaos_name@
w:1
@game_name@
w:2
@player_death@
w:8
@wacky_armour_name@
w:1
@politics_name_armour@
w:5
@power_name@
w:3
@discomfort_and_inaction@
w:3
@discomfort_weapon@
w:3
@mental_illness_weapon@

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

[61.3426]


    // Every card description contains the keyword "card".
    if (key.find("card") != std::string::npos)
        return (false);

Replacement in crawl-ref/source/abl-show.cc at line 337 [10.4494389]
B:BD[62.4240] → [62.4240:4267]
```
    if ( talents.empty() )
```
[62.4240]
[62.4267]
```
    if (talents.empty())
```
Replacement in crawl-ref/settings/init.txt at line 231 [10.4830895]
∅:D[63.2851] → [31.15643:15704]
B:BD[64.4349] → [31.15643:15704]
B:BD[31.15704] → [63.2852:2853]
```
# sort_menus = pickup: true : basename, qualname, curse, qty
```
[63.2851]
[46.6949]
```
# sort_menus = pickup: true : art, ego, basename, qualname, curse, qty
```

* Allow viewing of card descriptions from Triple Draw and Stack Deck.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 75 [10.13254]

Replacement in crawl-ref/source/view.cc at line 2815 [10.16817]

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

Replacement in crawl-ref/source/view.cc at line 3988 [10.16817]

Replacement in crawl-ref/source/view.cc at line 4863 [10.16817]

Replacement in crawl-ref/source/travel.cc at line 316 [17.39949]

Replacement in crawl-ref/source/tilesdl.cc at line 1308 [18.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 1316 [18.19415]

Replacement in crawl-ref/source/spl-book.cc at line 1528 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2045 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2052 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2063 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2065 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2073 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2084 [10.397614]

Deletion in crawl-ref/source/spl-book.cc at line 2108 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2364 [10.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2645 [10.397614]

Insertion in crawl-ref/source/menu.cc at line 1421 [17.261322]

Insertion in crawl-ref/source/menu.cc at line 1423 [17.261322]

Replacement in crawl-ref/source/menu.cc at line 1752 [17.261322]

Replacement in crawl-ref/source/items.cc at line 304 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1303 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1618 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1629 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1686 [10.2584728]

Deletion in crawl-ref/source/itemname.cc at line 1936 [10.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1937 [10.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1941 [10.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1945 [10.2667494]

Insertion in crawl-ref/source/invent.h at line 159 [10.2919073]

Deletion in crawl-ref/source/invent.h at line 165 [10.2919073]

Replacement in crawl-ref/source/invent.cc at line 152 [10.2920632]

Replacement in crawl-ref/source/invent.cc at line 742 [10.2920632]

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

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

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

Deletion in crawl-ref/source/directn.cc at line 584 [10.3697945]

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

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

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

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

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

Deletion in crawl-ref/source/directn.cc at line 3188 [10.3697945]

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

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

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

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

Replacement in crawl-ref/source/describe.cc at line 1969 [10.3736416]

Replacement in crawl-ref/source/describe.cc at line 1976 [10.3736416]

Replacement in crawl-ref/source/describe.cc at line 1979 [10.3736416]

Replacement in crawl-ref/source/describe.cc at line 1991 [10.3736416]

Replacement in crawl-ref/source/describe.cc at line 1996 [10.3736416]

Replacement in crawl-ref/source/describe.cc at line 1998 [10.3736416]

Deletion in crawl-ref/source/describe.cc at line 2222 [10.3736416]

Insertion in crawl-ref/source/decks.cc at line 20 [10.3987460]

Insertion in crawl-ref/source/decks.cc at line 930 [10.3987460]

Insertion in crawl-ref/source/decks.cc at line 949 [10.3987460]

Insertion in crawl-ref/source/decks.cc at line 1009 [10.3987460]

Deletion in crawl-ref/source/decks.cc at line 1011 [10.3987460]

Insertion in crawl-ref/source/decks.cc at line 1013 [10.3987460]

Replacement in crawl-ref/source/decks.cc at line 1043 [10.3987460]

Deletion in crawl-ref/source/decks.cc at line 1123 [10.3987460]

Insertion in crawl-ref/source/decks.cc at line 1124 [10.3987460]

Insertion in crawl-ref/source/decks.cc at line 1127 [10.3987460]

Replacement in crawl-ref/source/decks.cc at line 1138 [10.3987460]

Insertion in crawl-ref/source/decks.cc at line 1140 [10.3987460]

Deletion in crawl-ref/source/debug.cc at line 1281 [10.4016436]

Deletion in crawl-ref/source/debug.cc at line 1282 [10.4016436]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 3 [59.2804]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 8 [59.2804]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 13 [59.2804]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 18 [59.2804]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 24 [59.2804]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 29 [59.2804]

Replacement in crawl-ref/source/dat/descript/cards.txt at line 34 [59.2804]