fiddlerwoaroof/crawl - Change TUKBRR44ONNRAUYHTQTQIYIQPFK752EGWEZ5A5PULTTQDEDD7DRAC

1903543: % screen improvements

Show inscriptions.
Weapon enchantments (eg +1,+1) compressed like they are on the main screen.
Remove the slot name ("Ring: ") so there's more room for the item text.

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

Created by pauldubois on March 4, 2008

TUKBRR44ONNRAUYHTQTQIYIQPFK752EGWEZ5A5PULTTQDEDD7DRAC

Dependencies

In channels

main

Change contents

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

[5.51973]


// helper for print_verview_screen
static void _print_overview_screen_equip(
    column_composer& cols,
    std::vector<char> equip_chars)
{
    const int e_order[] =
    {
        EQ_WEAPON, EQ_BODY_ARMOUR, EQ_SHIELD, EQ_HELMET, EQ_CLOAK,
        EQ_GLOVES, EQ_BOOTS, EQ_AMULET, EQ_RIGHT_RING, EQ_LEFT_RING
    };
    char buf[100];
    for(int i = 0; i < NUM_EQUIP; i++)
    {
        int eqslot = e_order[i];
        char slot_name_lwr[15];
        snprintf(slot_name_lwr, sizeof slot_name_lwr, "%s", equip_slot_to_name(eqslot));
        strlwr(slot_name_lwr);
        char slot[15] = "";
        // uncomment (and change 42 to 33) to bring back slot names
        // snprintf(slot, sizeof slot, "%-7s: ", equip_slot_to_name(eqslot);
        if ( you.equip[ e_order[i] ] != -1)
        {
            const int item_idx = you.equip[e_order[i]];
            const item_def& item = you.inv[item_idx];
            const char* colname = colour_to_str(item.colour);
            const char equip_char = index_to_letter(item_idx);
            char buf2[50];
            if (item.inscription.empty())
                buf2[0] = 0;
            else
                snprintf(buf2, sizeof buf2, " {%s}", item.inscription.c_str());
            snprintf(buf, sizeof buf,
                     "%s<w>%c</w> - <%s>%s</%s>%s",
                     slot,
                     equip_char,
                     colname,
                     item.name(DESC_PLAIN, true).substr(0,42).c_str(),
                     colname,
                     buf2);
            equip_chars.push_back(equip_char);
        }
        else if (e_order[i] == EQ_WEAPON
                 && you.attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS)
        {
            snprintf(buf, sizeof buf, "%s  - Blade Hands", slot);
        }
        else if (e_order[i] == EQ_WEAPON
                 && you.skills[SK_UNARMED_COMBAT])
        {
            snprintf(buf, sizeof buf, "%s  - Unarmed", slot);
        }
        else if (!you_can_wear(e_order[i], true))
        {
            snprintf(buf, sizeof buf,
                     "%s<darkgray>(%s unavailable)</darkgray>",
                     slot, slot_name_lwr);
        }
        else if (!you_tran_can_wear(e_order[i], true))
        {
            snprintf(buf, sizeof buf,
                     "%s<darkgray>(%s currently unavailable)</darkgray>",
                     slot, slot_name_lwr);
        }
        else if (!you_can_wear(e_order[i]))
        {
            snprintf(buf, sizeof buf,
                     "%s<lightgray>(%s restricted)</lightgray>",
                     slot, slot_name_lwr);
        }
        else
        {
            snprintf(buf, sizeof buf,
                     "<darkgray>(no %s)</darkgray>", slot_name_lwr);
        }
        cols.add_formatted(2, buf, false);
    }
}

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

∅:D[4.2602] → [5.60402:60408]

B:BD[5.60402] → [5.60402:60408]

B:BD[5.60446] → [5.60446:60788]

    {
        const int e_order[] =
        {
            EQ_WEAPON, EQ_BODY_ARMOUR, EQ_SHIELD, EQ_HELMET, EQ_CLOAK,
            EQ_GLOVES, EQ_BOOTS, EQ_AMULET, EQ_RIGHT_RING, EQ_LEFT_RING
        };
        for(i = 0; i < NUM_EQUIP; i++)
        {
            int eqslot = e_order[i];
            const char *slot = equip_slot_to_name( eqslot );

[4.2602]

[5.61039]

    _print_overview_screen_equip(cols, equip_chars);

Deletion in crawl-ref/source/output.cc at line 1454 [6.1088282]

B:BD[5.61040] → [5.61040:61102]

B:BD[5.61102] → [4.2603:2721]

∅:D[4.2721] → [7.3618:3684]

B:BD[7.3618] → [7.3618:3684]

B:BD[7.3684] → [4.2722:3046]

∅:D[4.3046] → [5.61463:61863]

∅:D[7.3804] → [5.61463:61863]

B:BD[5.61463] → [5.61463:61863]

B:BD[5.61863] → [8.2228:2512]

∅:D[8.2512] → [5.61863:61972]

B:BD[5.61863] → [5.61863:61972]

B:BD[5.61972] → [9.1380:1438]

∅:D[9.1438] → [10.1649:1667]

B:BD[10.1649] → [10.1649:1667]

B:BD[10.1667] → [9.1439:1565]

∅:D[9.1565] → [10.2132:2150]

B:BD[10.2132] → [10.2132:2150]

B:BD[10.2150] → [3.1654:1717]

∅:D[3.1717] → [8.2655:2805]

B:BD[8.2655] → [8.2655:2805]

B:BD[8.2805] → [9.1566:1736]

B:BD[9.1736] → [2.404:478]

∅:D[2.478] → [8.2805:2859]

∅:D[9.1811] → [8.2805:2859]

B:BD[8.2805] → [8.2805:2859]

∅:D[10.2150] → [5.61972:62162]

∅:D[8.2859] → [5.61972:62162]

B:BD[5.61972] → [5.61972:62162]

∅:D[5.62162] → [11.2877:2883]

B:BD[11.2877] → [11.2877:2883]

B:BD[11.2883] → [5.62163:62164]

            if ( you.equip[ e_order[i] ] != -1)
            {
                const int item_idx = you.equip[e_order[i]];
                const item_def& item = you.inv[item_idx];
                const char* colname = colour_to_str(item.colour);
                const char equip_char = index_to_letter(item_idx);
                snprintf(buf, sizeof buf, "%-7s: <w>%c</w> - <%s>%s</%s>",
                         slot, equip_char, colname,
                         item.name(DESC_PLAIN).substr(0,33).c_str(), colname);
                equip_chars.push_back(equip_char);
            }
            else
            {
                if (e_order[i] == EQ_WEAPON)
                {
                    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS)
                        snprintf(buf, sizeof buf, "%-7s: Blade Hands", slot);
                    else if (you.skills[SK_UNARMED_COMBAT])
                        snprintf(buf, sizeof buf, "%-7s: Unarmed", slot);
                    else if (!you_tran_can_wear(EQ_WEAPON))
                    {
                        snprintf(buf, sizeof buf, "%-7s: "
                                 "<darkgray>(currently unavailable)</darkgray>",
                                 slot);
                    }
                    else
                        snprintf(buf, sizeof buf, "%-7s:", slot);
                }
                else if (!you_can_wear(e_order[i], true))
                {
                    snprintf(buf, sizeof buf,
                             "%-7s: <darkgray>(unavailable)</darkgray>", slot);
                }
                else if (!you_tran_can_wear(e_order[i], true))
                {
                    snprintf(buf, sizeof buf, "%-7s: "
                             "<darkgray>(currently unavailable)</darkgray>",
                             slot);
                }
                else if (!you_can_wear(e_order[i]))
                {
                    snprintf(buf, sizeof buf,
                             "%-7s: <lightgray>(restricted)</lightgray>",
                             slot);
                }
                else
                {
                    snprintf(buf, sizeof buf, "%-7s:", slot);
                }
            }
            cols.add_formatted(2, buf, false);
        }
    }