fiddlerwoaroof/crawl - Change HDJOQA7QPMTZU4W2JJR3DPMTIRIKBKMTNXX3QNBILSUND3ZLWTIAC

* After some thought, remove the description toggle from the spell menu as

the double toggle makes everything much more complicated, and you can easily access the spell descriptions from the very similar 'I' menu.

Don't offer weapons of unknown brand types for ?recharging. I tested a few combination cases, but I might have overlooked something.

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

Created by j-p-e-g on April 6, 2009

HDJOQA7QPMTZU4W2JJR3DPMTIRIKBKMTNXX3QNBILSUND3ZLWTIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 539 [4.143977]

B:BD[3.1800] → [3.1800:1931]

    // equipment). In any case, untransforming costs us a turn but nothing
    // else (as does the "End Transformation" ability).

[3.1800]

[5.4118]

    // equipment). Ideally, untransforming should cost a turn but nothing
    // else (as does the "End Transformation" ability). As it is, you
    // pay with mana and hunger if you already untransformed.

Replacement in crawl-ref/source/spl-cast.cc at line 219 [4.293070]
B:BD[6.905] → [7.800:840]
∅:D[7.840] → [8.856:874]
B:BD[8.856] → [8.856:874]
∅:D[8.874] → [6.914:920]
B:BD[6.914] → [6.914:920]
B:BD[6.920] → [8.875:968]
B:BD[8.968] → [7.841:898]
∅:D[7.898] → [6.1015:1021]
∅:D[8.1077] → [6.1015:1021]
B:BD[6.1015] → [6.1015:1021]
B:BD[6.1021] → [7.899:920]
```
    more_str += "to toggle spell view";
    if (!viewing)
    {
        spell_menu.allow_toggle = true;
        spell_menu.menu_action  = Menu::ACT_EXECUTE;
        more_str += ", or '?' to read the descriptions";
    }
    more_str += ".";
```
[6.905]
[8.1078]
```
    more_str += "to toggle spell view.";
```

Replacement in crawl-ref/source/itemprop.h at line 678 [9.641567]

B:BD[9.643810] → [2.2699:2821]

bool item_is_rechargeable(const item_def &it, bool unknown = false,
                          bool hide_charged = false);

[9.643810]

[10.3161]

bool item_is_rechargeable(const item_def &it, bool hide_charged = false,
                          bool weapons = false);

Deletion in crawl-ref/source/itemprop.cc at line 1316 [9.646661]

B:BD[2.2915] → [2.2915:3022]

// If unknown is true, wands with unknown charges and weapons with unknown
// brand will also return true.

Replacement in crawl-ref/source/itemprop.cc at line 1318 [9.646661]

B:BD[2.3172] → [2.3172:3251]

bool item_is_rechargeable(const item_def &it, bool unknown, bool hide_charged)

[2.3172]

[11.3145]

bool item_is_rechargeable(const item_def &it, bool hide_charged, bool weapons)

Replacement in crawl-ref/source/itemprop.cc at line 1323 [9.646661]
B:BD[12.3239] → [2.3252:3290]
```
        if (unknown && !hide_charged)
```
[12.3239]
[2.3290]
```
        if (!hide_charged)
```
Replacement in crawl-ref/source/itemprop.cc at line 1337 [9.646661]
B:BD[12.3541] → [2.3480:3518]
```
        if (unknown && !hide_charged)
```
[12.3541]
[2.3518]
```
        if (!hide_charged)
```

Replacement in crawl-ref/source/itemprop.cc at line 1349 [9.646661]

B:BD[2.3643] → [2.3643:3715]

        if (unknown && !item_type_known(it)) // Could be electrocution.

[2.3643]

[2.3715]

        // Might be electrocution.
        if (weapons && !item_type_known(it))

Replacement in crawl-ref/source/itemprop.cc at line 1357 [9.646661]

B:BD[2.3872] → [2.3872:4042]

            && (unknown && !item_ident(it, ISFLAG_KNOW_PLUSES )
                || item_ident(it, ISFLAG_KNOW_PLUSES )
                   && it.plus2 < MAX_WPN_ENCHANT))

[2.3872]

[2.4042]

            && (!item_ident(it, ISFLAG_KNOW_PLUSES)
                || it.plus2 < MAX_WPN_ENCHANT))

Replacement in crawl-ref/source/item_use.cc at line 4677 [4.2781507]
B:BD[13.4247] → [2.4994:5040]
```
        if (item_is_rechargeable(item, true))
```
[13.4247]
[11.7218]
```
        if (item_is_rechargeable(item, false, true))
```

Replacement in crawl-ref/source/invent.cc at line 1018 [4.2920632]

B:BD[11.8893] → [2.5047:5101]

        return (item_is_rechargeable(i, true, true));

[11.8893]

[14.7291]

        return (item_is_rechargeable(i, true));

Replacement in crawl-ref/source/effects.cc at line 1906 [4.3382105]

B:BD[2.5800] → [2.5800:5904]

        if (wand.base_type == OBJ_WEAPONS
            && get_weapon_brand(wand) == SPWPN_ELECTROCUTION)

[2.5800]

[11.9741]

        if (wand.base_type == OBJ_WEAPONS)

Replacement in crawl-ref/source/effects.cc at line 1908 [4.3382105]

B:BD[11.9751] → [2.5905:6031]

            // Might fail because of already high enchantment.
            if (enchant_weapon( ENCHANT_TO_DAM, false, wand ))

[11.9751]

[2.6031]

            if (get_weapon_brand(wand) == SPWPN_ELECTROCUTION)

Replacement in crawl-ref/source/effects.cc at line 1910 [4.3382105]

B:BD[2.6045] → [2.6045:6086]

                you.wield_change = true;

[2.6045]

[11.9788]

                // Might fail because of already high enchantment.
                if (enchant_weapon( ENCHANT_TO_DAM, false, wand ))
                {
                    you.wield_change = true;

Replacement in crawl-ref/source/effects.cc at line 1915 [4.3382105]

B:BD[11.9789] → [2.6087:6205]

                if (!item_ident(wand, ISFLAG_KNOW_TYPE))
                    set_ident_flags(wand, ISFLAG_KNOW_TYPE);

[11.9789]

[15.7818]

                    if (!item_ident(wand, ISFLAG_KNOW_TYPE))
                        set_ident_flags(wand, ISFLAG_KNOW_TYPE);

Replacement in crawl-ref/source/effects.cc at line 1918 [4.3382105]

B:BD[15.7819] → [2.6206:6237]

                return (true);

[15.7819]

[2.6237]

                    return (true);
                }
                return (false);

Replacement in crawl-ref/source/effects.cc at line 1922 [4.3382105]

B:BD[2.6251] → [2.6251:6279]

            return (false);

[2.6251]

[11.9939]

            else
                canned_msg( MSG_NOTHING_HAPPENS );