fiddlerwoaroof/crawl - Change WFIA2XFIWZF3XVLH52GC57XK7A6ECI3K6P7GRZSHPIUBX66OF3OQC

Fix bad potions not counting as useless and thus being auto-picked up.

Fix bad message when using 'W' with no armour and crash when attempting to enchant armour with no enchantable armour in inventory. Tweak '{' to only prompt if at least one of autoinscription or clearing an existing inscription apply. (FR 2017541)

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

Created by j-p-e-g on July 15, 2008

WFIA2XFIWZF3XVLH52GC57XK7A6ECI3K6P7GRZSHPIUBX66OF3OQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/itemname.cc at line 2181 [7.2667494]

B:BD[6.2949] → [6.2949:2982]

        + item.name(DESC_PLAIN);

[6.2949]

[8.727132]

                              + item.name(DESC_PLAIN);

Insertion in crawl-ref/source/itemname.cc at line 2439 [7.2667494]

[2.2700]


        // A bad item is always useless.
        if (is_bad_item(item, temp))
            return (true);

Replacement in crawl-ref/source/item_use.cc at line 4104 [7.2781507]
B:BD[9.4899] → [10.7179:7204]
```
    if (item_slot == -1)
```
[9.4899]
[9.4934]
```
    if (item_slot == PROMPT_ABORT || item_slot == PROMPT_NOTHING)
```

Replacement in crawl-ref/source/item_use.cc at line 4106 [7.2781507]

B:BD[9.4940] → [9.4940:4970]

        canned_msg( MSG_OK );

[9.4940]

[9.4970]

        if (item_slot == PROMPT_ABORT)
            canned_msg( MSG_OK );

Insertion in crawl-ref/source/invent.cc at line 338 [7.2920632]

[3.3493]

    case OBJ_ARMOUR:
        return("You aren't carrying any armour.");

Deletion in crawl-ref/source/invent.cc at line 347 [7.2920632]
B:BD[3.3763] → [3.3763:3784]
```
    case OBJ_ARMOUR:
```

Replacement in crawl-ref/source/describe.cc at line 2082 [7.3736416]

B:BD[11.12420] → [4.3794:3919]

    std::string prompt = (is_inscribed ? "Add to inscription? "
                                       : "Inscribe item? ");

[11.12420]

[4.3919]

    std::string prompt;
    int keyin;
    bool did_prompt = false;

Replacement in crawl-ref/source/describe.cc at line 2086 [7.3736416]

∅:D[4.3920] → [12.4199:4242]

B:BD[12.4199] → [12.4199:4242]

    if (need_autoinscribe || is_inscribed)

[4.3920]

[12.4242]

    // Don't prompt for whether to inscribe in the first place if the
    // player is using '{' - unless autoinscribing or clearing an
    // existing inscription become an option.
    if (!proper_prompt || need_autoinscribe || is_inscribed)

Replacement in crawl-ref/source/describe.cc at line 2091 [7.3736416]

B:BD[12.4248] → [12.4248:4315]

        prompt += "(You may also ";
        if (need_autoinscribe)

[12.4248]

[12.4315]

        prompt = (is_inscribed ? "Add to inscription? "
                               : "Inscribe item? ");
        if (need_autoinscribe || is_inscribed)

Replacement in crawl-ref/source/describe.cc at line 2096 [7.3736416]

B:BD[12.4325] → [12.4325:4365]

            prompt += "(a)utoinscribe";

[12.4325]

[12.4365]

            prompt += "(You may also ";
            if (need_autoinscribe)
            {
                prompt += "(a)utoinscribe";
                if (is_inscribed)
                    prompt += ", or ";
            }

Replacement in crawl-ref/source/describe.cc at line 2104 [7.3736416]

B:BD[12.4395] → [4.3921:3956]

                prompt += ", or ";

[12.4395]

[12.4429]

                prompt += "(c)lear it";
            prompt += ".) ";

Deletion in crawl-ref/source/describe.cc at line 2107 [7.3736416]

B:BD[12.4439] → [12.4439:4532]

        if (is_inscribed)
            prompt += "(c)lear it";
        prompt += ".) ";
    }

Replacement in crawl-ref/source/describe.cc at line 2108 [7.3736416]

B:BD[12.4533] → [12.4533:4720]

    if (proper_prompt)
        mpr(prompt.c_str(), MSGCH_PROMPT);
    else
    {
        prompt = "<cyan>" + prompt + "</cyan>";
        formatted_string::parse_string(prompt).display();

[12.4533]

[7.3844736]

        if (proper_prompt)
            mpr(prompt.c_str(), MSGCH_PROMPT);
        else
        {
            prompt = "<cyan>" + prompt + "</cyan>";
            formatted_string::parse_string(prompt).display();

Replacement in crawl-ref/source/describe.cc at line 2115 [7.3736416]

B:BD[7.3844737] → [4.3957:4033]

∅:D[4.4033] → [12.4798:4864]

B:BD[12.4798] → [12.4798:4864]

        if (Options.tutorial_left && wherey() <= get_number_of_lines() - 5)
            tutorial_inscription_info(need_autoinscribe, prompt);

[7.3844737]

[12.4864]

            if (Options.tutorial_left && wherey() <= get_number_of_lines() - 5)
                tutorial_inscription_info(need_autoinscribe, prompt);
        }
        did_prompt = true;

Replacement in crawl-ref/source/describe.cc at line 2121 [7.3736416]
B:BD[7.3844738] → [4.4034:4070]
```
    int keyin = tolower(c_getch());
```
[7.3844738]
[4.4070]
```
    keyin = (did_prompt ? tolower(c_getch()) : 'y');
```

Replacement in crawl-ref/settings/menu_colours.txt at line 6 [13.6002]

B:BD[5.4092] → [5.4092:4137]

# Useless items, overrides all other colours

[5.4092]

[5.4137]

# Bad items
menu = lightred:.*bad_item.*
# Useless items, comes here to override artefacts etc.

Deletion in crawl-ref/settings/menu_colours.txt at line 52 [13.6002]
B:BD[13.8813] → [13.8813:8814]
B:BD[13.8814] → [14.18441:18482]
```
# Bad items
menu = lightred:.*bad_item.*
```