fiddlerwoaroof/crawl - Change GDISJTTXFDQYMOFLUHIDCYWMU7O2SGXN2YQ3VRUIHU5YE3SUVJ7AC

Add new command for evoking non-wielded items, placed on 'V'.

Also applies to wand, and will soon replace 'Z'.
Decks, rods, and weapons of reaching still need to be wielded ('v').
The tiles tooltips will need to be adjusted.

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

Created by j-p-e-g on May 2, 2009

GDISJTTXFDQYMOFLUHIDCYWMU7O2SGXN2YQ3VRUIHU5YE3SUVJ7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 5071 [7.1699344]

B:BD[6.2973] → [2.2914:3018]

    // If you already have a charged wand, don't bother.  Otherwise,
    // replace with a charged one.

[6.2973]

[6.3076]

    // If a monster already has a charged wand, don't bother.
    // Otherwise, replace with a charged one.

Insertion in crawl-ref/source/item_use.cc at line 26 [7.2781507]
[7.2782838]
[7.2782838]
```
#ifdef USE_TILE
#include "decks.h"
#endif
```

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

∅:D[8.4422] → [9.6126:6153]

B:BD[9.6126] → [9.6126:6153]

            if (!equipped)

[8.4422]

[10.5850466]

            if (!equipped
                && (item.base_type != OBJ_MISCELLANY || is_deck(item)
                    || item.sub_type == MISC_LANTERN_OF_SHADOWS))

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

B:BD[8.4466] → [11.4579:4650]

            if (item.base_type == OBJ_MISCELLANY || item_is_rod(item))

[8.4466]

[10.5850647]

            if (item_is_evokable(item))

Replacement in crawl-ref/source/item_use.cc at line 5453 [7.2781507]
∅:D[12.10400] → [9.6538:6575]
B:BD[9.6538] → [9.6538:6575]
```
                    evoke_wielded();
```
[12.10400]
[9.6575]
```
                    evoke_item(idx);
```
Replacement in crawl-ref/source/it_use3.h at line 32 [7.2869150]
B:BD[7.2870150] → [13.1080:1102]
```
bool evoke_wielded();
```
[7.2870150]
[7.2870176]
```
bool evoke_item(int slot = -1);
```
Insertion in crawl-ref/source/it_use3.cc at line 30 [7.2870456]
[7.2871138]
[7.2871138]
```
#include "item_use.h"
```
Replacement in crawl-ref/source/it_use3.cc at line 436 [7.2870456]
B:BD[7.2880189] → [14.8350:8395]
∅:D[14.8395] → [15.2955:2976]
B:BD[7.2880234] → [15.2955:2976]
```
// Returns true if item successfully evoked.
bool evoke_wielded()
```
[7.2880189]
[7.2880261]
```
static bool _efreet_flask()
```
Replacement in crawl-ref/source/it_use3.cc at line 438 [7.2870456]
B:BD[7.2880429] → [7.2880429:2880448]
```
    int power = 0;
```
[7.2880263]
[7.2880448]
```
    bool friendly = x_chance_in_y(10 + you.skills[SK_EVOCATIONS] / 3, 20);
```

Replacement in crawl-ref/source/it_use3.cc at line 440 [7.2870456]

B:BD[7.2880449] → [14.8396:8530]

    int pract = 0; // By how much Evocations is practised.
    bool did_work = false;  // Used for default "nothing happens" message.

[7.2880449]

[7.2880579]

    mpr("You open the flask...");
    const int monster =
        create_monster(
            mgen_data(MONS_EFREET,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      0, 0, you.pos(),
                      MHITYOU, MG_FORCE_BEH));

Replacement in crawl-ref/source/it_use3.cc at line 449 [7.2870456]

B:BD[7.2880580] → [16.1942:1986]

    const int wield = you.equip[EQ_WEAPON];

[7.2880580]

[7.2880618]

    if (monster != -1)
    {
        mpr("...and a huge efreet comes out.");
        if (player_angers_monster(&menv[monster]))
            friendly = false;
        if (silenced(you.pos()))
        {
            mpr(friendly ? "It nods graciously at you."
                         : "It snaps in your direction!", MSGCH_TALK_VISUAL);
        }
        else
        {
            mpr(friendly ? "\"Thank you for releasing me!\""
                         : "It howls insanely!", MSGCH_TALK);
        }
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    dec_inv_item_quantity(you.equip[EQ_WEAPON], 1);

Insertion in crawl-ref/source/it_use3.cc at line 472 [7.2870456]
[7.2880619]
[17.12005]
```
    return (true);
}
bool evoke_item(int slot)
{
```
Replacement in crawl-ref/source/it_use3.cc at line 482 [7.2870456]
B:BD[7.2880717] → [3.2709:2737]
```
    else if (!you.weapon())
```
[7.2880717]
[7.2880743]
```
    if (slot == -1)
```

Replacement in crawl-ref/source/it_use3.cc at line 485 [7.2870456]

B:BD[7.2880749] → [7.2880749:2880795]

B:BD[7.2880795] → [18.16715:16755]

∅:D[18.16755] → [7.2880795:2880819]

B:BD[7.2880795] → [7.2880795:2880819]

        mpr("You aren't wielding anything!");
        crawl_state.zero_turns_taken();
        return (false);

[7.2880749]

[7.2880819]

        slot = prompt_invent_item( "Evoke which item? (* to show all)",
                                   MT_INVLIST,
                                   OSEL_EVOKABLE, true, true, true, 0, -1,
                                   NULL, OPER_EVOKE );
        if (prompt_failed(slot))
            return (false);

Insertion in crawl-ref/source/it_use3.cc at line 493 [7.2870456]
[7.2880825]
[7.2880825]
```
    ASSERT (slot >= 0);
```

Replacement in crawl-ref/source/it_use3.cc at line 495 [7.2870456]

B:BD[7.2880826] → [3.2738:2773]

∅:D[3.2773] → [19.258:287]

B:BD[20.25470] → [19.258:287]

    item_def& wpn = *you.weapon();
    bool unevokable = false;

[7.2880826]

[20.25470]

    const bool wielded = (you.equip[EQ_WEAPON] == slot);
    item_def& item = you.inv[slot];
    // Also handles messages.
    if (!item_is_evokable(item, false, true))
        return (false);

Replacement in crawl-ref/source/it_use3.cc at line 503 [7.2870456]

B:BD[21.2497] → [22.5982:6036]

    if (!check_warning_inscriptions(wpn, OPER_EVOKE))

[21.2497]

[22.6036]

    if (!check_warning_inscriptions(item, OPER_EVOKE))

Replacement in crawl-ref/source/it_use3.cc at line 506 [7.2870456]

∅:D[21.2576] → [20.25471:25498]

B:BD[20.25471] → [20.25471:25498]

    switch (wpn.base_type)

[21.2576]

[7.2880864]

    int power = 0;
    int pract = 0; // By how much Evocations is practised.
    bool did_work = false;  // Used for default "nothing happens" message.
    bool unevokable = false;
    switch (item.base_type)

Insertion in crawl-ref/source/it_use3.cc at line 513 [7.2870456]

[7.2880870]

    case OBJ_WANDS:
        zap_wand(slot);
        return (true);

Replacement in crawl-ref/source/it_use3.cc at line 518 [7.2870456]

B:BD[7.2880892] → [23.357:410]

        if (get_weapon_brand(wpn) == SPWPN_REACHING)

[7.2880892]

[7.2880993]

        ASSERT(wielded);
        if (get_weapon_brand(item) == SPWPN_REACHING)

Replacement in crawl-ref/source/it_use3.cc at line 522 [7.2870456]
B:BD[7.2881003] → [24.3032:3078]
```
            if (_reaching_weapon_attack(wpn))
```
[7.2881003]
[16.2111]
```
            if (_reaching_weapon_attack(item))
```
Replacement in crawl-ref/source/it_use3.cc at line 530 [7.2870456]
B:BD[7.2881263] → [3.2774:2815]
```
        else if (is_fixed_artefact(wpn))
```
[7.2881263]
[7.2881317]
```
        else if (is_fixed_artefact(item))
```
Replacement in crawl-ref/source/it_use3.cc at line 532 [7.2870456]
B:BD[7.2881327] → [20.25598:25631]
```
            switch (wpn.special)
```
[7.2881327]
[7.2881371]
```
            switch (item.special)
```
Replacement in crawl-ref/source/it_use3.cc at line 615 [7.2870456]
B:BD[7.2885472] → [20.25632:25664]
```
        if (item_is_rod( wpn ))
```
[7.2885472]
[7.2885515]
```
        ASSERT(wielded);
        if (item_is_rod( item ))
```
Replacement in crawl-ref/source/it_use3.cc at line 619 [7.2870456]
B:BD[7.2885525] → [7.2885525:2885567]
```
            pract = staff_spell( wield );
```
[7.2885525]
[25.764101]
```
            pract = staff_spell( slot );
```
Replacement in crawl-ref/source/it_use3.cc at line 626 [7.2870456]
B:BD[25.764225] → [20.25665:25716]
```
        else if (wpn.sub_type == STAFF_CHANNELING)
```
[25.764225]
[7.2885708]
```
        else if (item.sub_type == STAFF_CHANNELING)
```
Replacement in crawl-ref/source/it_use3.cc at line 637 [7.2870456]
B:BD[7.2886085] → [20.25717:25760]
```
                if (!item_type_known(wpn))
```
[7.2886085]
[7.2886209]
```
                if (!item_type_known(item))
```

Replacement in crawl-ref/source/it_use3.cc at line 639 [7.2870456]

B:BD[7.2886227] → [26.6135:6214]

∅:D[26.6214] → [20.25761:25823]

B:BD[7.2886227] → [20.25761:25823]

                    set_ident_type( OBJ_STAVES, wpn.sub_type, ID_KNOWN_TYPE );
                    set_ident_flags( wpn, ISFLAG_KNOW_TYPE );

[7.2886227]

[7.2886353]

                    set_ident_type( OBJ_STAVES, item.sub_type, ID_KNOWN_TYPE );
                    set_ident_flags( item, ISFLAG_KNOW_TYPE );

Replacement in crawl-ref/source/it_use3.cc at line 643 [7.2870456]

B:BD[20.25873] → [20.25873:25931]

                         wpn.name(DESC_NOCAP_A).c_str());

[20.25873]

[27.29465]

                         item.name(DESC_NOCAP_A).c_str());

Replacement in crawl-ref/source/it_use3.cc at line 660 [7.2870456]
B:BD[27.29468] → [14.8581:8607]
```
        if (is_deck(wpn))
```
[27.29468]
[28.4355]
```
        if (is_deck(item))
```

Replacement in crawl-ref/source/it_use3.cc at line 662 [7.2870456]

B:BD[28.4365] → [28.4365:4394]

            evoke_deck(wpn);

[28.4365]

[28.4394]

            ASSERT(wielded);
            evoke_deck(item);

Replacement in crawl-ref/source/it_use3.cc at line 668 [7.2870456]
∅:D[28.4447] → [20.25958:25988]
B:BD[7.2886834] → [20.25958:25988]
```
        switch (wpn.sub_type)
```
[28.4447]
[7.2886875]
```
        switch (item.sub_type)
```
Deletion in crawl-ref/source/it_use3.cc at line 758 [7.2870456]
B:BD[7.2891988] → [7.2891988:2892044]
B:BD[7.2892044] → [5.3119:3147]
∅:D[5.3147] → [7.2892075:2892077]
B:BD[7.2892075] → [7.2892075:2892077]
B:BD[7.2892077] → [29.10689:10764]
∅:D[30.2675] → [31.3029:3030]
∅:D[32.2871] → [31.3029:3030]
∅:D[33.2889] → [31.3029:3030]
∅:D[34.3225] → [31.3029:3030]
∅:D[35.3758] → [31.3029:3030]
∅:D[29.10764] → [31.3029:3030]
B:BD[31.3029] → [31.3029:3030]
B:BD[7.2892211] → [7.2892211:2892246]
B:BD[7.2892246] → [32.2872:2896]
∅:D[32.2896] → [36.44904:44928]
B:BD[36.44904] → [36.44904:44928]
B:BD[36.44928] → [32.2897:2932]
∅:D[32.2932] → [37.2639:2700]
B:BD[30.2837] → [37.2639:2700]
B:BD[37.2700] → [38.10543:10582]
B:BD[38.10582] → [4.4530:4577]
∅:D[37.2797] → [39.4471:4472]
∅:D[30.2977] → [39.4471:4472]
∅:D[32.3030] → [39.4471:4472]
∅:D[4.4577] → [39.4471:4472]
B:BD[36.44997] → [39.4471:4472]
B:BD[39.4472] → [32.3031:3054]
∅:D[40.1378] → [7.2892430:2892436]
∅:D[32.3054] → [7.2892430:2892436]
B:BD[7.2892430] → [7.2892430:2892436]
B:BD[7.2892436] → [30.2978:3026]
B:BD[30.3026] → [32.3055:3137]
∅:D[30.3026] → [27.29597:29598]
∅:D[32.3137] → [27.29597:29598]
B:BD[40.1418] → [27.29597:29598]
B:BD[27.29598] → [41.2540:2883]
∅:D[40.1596] → [7.2892631:2892687]
∅:D[41.2883] → [7.2892631:2892687]
∅:D[30.3130] → [7.2892631:2892687]
B:BD[7.2892631] → [7.2892631:2892687]
B:BD[7.2892687] → [40.1597:1598]
B:BD[40.1598] → [30.3131:3183]
∅:D[40.1656] → [7.2892687:2892707]
∅:D[30.3183] → [7.2892687:2892707]
∅:D[27.29653] → [7.2892687:2892707]
B:BD[7.2892687] → [7.2892687:2892707]
```
}                               // end evoke_wielded()
static bool _efreet_flask()
{
    bool friendly = x_chance_in_y(10 + you.skills[SK_EVOCATIONS] / 3, 20);
    mpr("You open the flask...");
    const int monster =
        create_monster(
            mgen_data(MONS_EFREET,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      0, 0, you.pos(),
                      MHITYOU, MG_FORCE_BEH));
    if (monster != -1)
    {
        mpr("...and a huge efreet comes out.");
        if (player_angers_monster(&menv[monster]))
            friendly = false;
        if (silenced(you.pos()))
        {
            mpr(friendly ? "It nods graciously at you."
                         : "It snaps in your direction!", MSGCH_TALK_VISUAL);
        }
        else
        {
            mpr(friendly ? "\"Thank you for releasing me!\""
                         : "It howls insanely!", MSGCH_TALK);
        }
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    dec_inv_item_quantity(you.equip[EQ_WEAPON], 1);
    return (true);
```
Replacement in crawl-ref/source/invent.h at line 31 [7.2919073]
B:BD[42.2548] → [42.2548:2573]
```
    OSEL_BUTCHERY  = -11
```
[42.2548]
[43.91427]
```
    OSEL_BUTCHERY  = -11,
    OSEL_EVOKABLE  = -12
```

Insertion in crawl-ref/source/invent.h at line 237 [7.2919073]

[44.3208]

[7.2920590]

bool item_is_evokable(const item_def &item, bool known = false,
                      bool msg = false);

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

[42.2660]

[44.4337]

    case OSEL_EVOKABLE:
        return("You aren't carrying any items that can be evoked.");

Insertion in crawl-ref/source/invent.cc at line 1022 [7.2920632]
[45.7292]
[46.8940]
```
    case OSEL_EVOKABLE:
        return (item_is_evokable(i, true));
```

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

[44.5523]


bool item_is_evokable(const item_def &item, bool known, bool msg)
{
    const bool wielded = (you.equip[EQ_WEAPON] == item.link);
    switch (item.base_type)
    {
    case OBJ_WANDS:
        if (item.plus2 == ZAPCOUNT_EMPTY)
        {
            if (msg)
                mpr("This wand has no charges.");
            return (false);
        }
        return (true);
    case OBJ_WEAPONS:
        if (!wielded && !msg)
            return (false);
        if (get_weapon_brand(item) == SPWPN_REACHING
            && item_type_known(item))
        {
            if (!wielded)
            {
                if (msg)
                    mpr("That item can only be evoked when wielded.");
                return (false);
            }
            return (true);
        }
        if (is_fixed_artefact(item))
        {
            switch (item.special)
            {
            case SPWPN_SCEPTRE_OF_ASMODEUS:
            case SPWPN_STAFF_OF_WUCAD_MU:
            case SPWPN_STAFF_OF_DISPATER:
            case SPWPN_STAFF_OF_OLGREB:
                if (!wielded)
                {
                    if (msg)
                        mpr("That item can only be evoked when wielded.");
                    return (false);
                }
                return (true);
            default:
                return (false);
            }
        }
        if (msg)
            mpr("That item cannot be evoked!");
        return (false);
    case OBJ_STAVES:
        if (item_is_rod(item)
            || !known && !item_type_known(item)
            || item.sub_type == STAFF_CHANNELING
               && item_type_known(item))
        {
            if (!wielded)
            {
                if (msg)
                    mpr("That item can only be evoked when wielded.");
                return (false);
            }
            return (true);
        }
        if (msg)
            mpr("That item cannot be evoked!");
        return (false);
    case OBJ_MISCELLANY:
        if (is_deck(item))
        {
            if (!wielded)
            {
                if (msg)
                    mpr("That item can only be evoked when wielded.");
                return (false);
            }
            return (true);
        }
        if (item.sub_type != MISC_LANTERN_OF_SHADOWS
            && item.sub_type != MISC_EMPTY_EBONY_CASKET)
        {
            return (true);
        }
        // else fall through
    default:
        if (msg)
            mpr("That item cannot be evoked!");
        return (false);
    }
}

Insertion in crawl-ref/source/enum.h at line 468 [7.3287960]
[7.3303736]
[7.3303736]
```
    CMD_EVOKE_WIELDED,
```
Insertion in crawl-ref/source/command.cc at line 2230 [7.4082507]
[47.3151]
[48.6908]
```
            "<w>V</w> : eVoke power of an item in inventory\n"
```
Insertion in crawl-ref/source/cmd-name.h at line 42 [49.12200]
[49.13769]
[49.13769]
```
{CMD_EVOKE_WIELDED, "CMD_EVOKE_WIELDED"},
```
Replacement in crawl-ref/source/cmd-keys.h at line 40 [49.20639]
B:BD[49.21164] → [49.21164:21182]
```
{'v', CMD_EVOKE},
```
[49.21164]
[49.21182]
```
{'V', CMD_EVOKE},
{'v', CMD_EVOKE_WIELDED},
```

Replacement in crawl-ref/source/acr.cc at line 1525 [7.4397395]

B:BD[7.4430020] → [7.4430020:4430050]

        if (!evoke_wielded())

[7.4430020]

[7.4430050]

        if (!evoke_item())
            flush_input_buffer( FLUSH_ON_FAILURE );
        break;
    case CMD_EVOKE_WIELDED:
        if (!evoke_item(you.equip[EQ_WEAPON]))

Add new command for evoking non-wielded items, placed on 'V'.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 5071 [7.1699344]

Insertion in crawl-ref/source/item_use.cc at line 26 [7.2781507]

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

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

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

Replacement in crawl-ref/source/it_use3.h at line 32 [7.2869150]

Insertion in crawl-ref/source/it_use3.cc at line 30 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 436 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 438 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 440 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 449 [7.2870456]

Insertion in crawl-ref/source/it_use3.cc at line 472 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 482 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 485 [7.2870456]

Insertion in crawl-ref/source/it_use3.cc at line 493 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 495 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 503 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 506 [7.2870456]

Insertion in crawl-ref/source/it_use3.cc at line 513 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 518 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 522 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 530 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 532 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 615 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 619 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 626 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 637 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 639 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 643 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 660 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 662 [7.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 668 [7.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 758 [7.2870456]

Replacement in crawl-ref/source/invent.h at line 31 [7.2919073]

Insertion in crawl-ref/source/invent.h at line 237 [7.2919073]

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

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

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

Insertion in crawl-ref/source/enum.h at line 468 [7.3287960]

Insertion in crawl-ref/source/command.cc at line 2230 [7.4082507]

Insertion in crawl-ref/source/cmd-name.h at line 42 [49.12200]

Replacement in crawl-ref/source/cmd-keys.h at line 40 [49.20639]

Replacement in crawl-ref/source/acr.cc at line 1525 [7.4397395]