fiddlerwoaroof/crawl - Change HHTFZV7UCVSE332T2FMAS2UHWSP6OZ2PSLEJ7D47QTSBTFTUFTNAC

Fix the old issue of switching to the butchering tool before actually

deciding on which corpse to butcher. Now, if there's no eligible tool to automatically switch to (or the autoswitch option is false) you get prompted at the beginning of the butchering routine but you don't actually switch weapons or take off your gloves until right before you start butchering. Obviously, the same applies when autoswitching. This means you don't lose a turn anymore if you change your mind in-between.

I really hope I haven't introduced other bugs this way but a fix was badly in need since I'd changed the automatic weapon swap to take a turn just as the manual swap does.

Also fix swap_when_safe so that it also working when the real weapon is on slot 'a' (== 0) which will probably be the norm rather than an exception.

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

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

HHTFZV7UCVSE332T2FMAS2UHWSP6OZ2PSLEJ7D47QTSBTFTUFTNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 3963 [6.962854]
∅:D[4.6890] → [5.10090:10128]
B:BD[6.1035218] → [5.10090:10128]
```
    // prints a contamination message
```
[6.1035218]
[7.4044]
```
    // Prints a contamination message.
```
Replacement in crawl-ref/source/initfile.cc at line 245 [6.2957258]
B:BD[8.786554] → [8.786554:786597]
```
    if ( str == "fire" || str == "flame" )
```
[8.786554]
[9.13487]
```
    if (str == "fire" || str == "flame")
```
Replacement in crawl-ref/source/initfile.cc at line 247 [6.2957258]
∅:D[9.13512] → [8.786615:786656]
B:BD[8.786615] → [8.786615:786656]
```
    if ( str == "cold" || str == "ice" )
```
[9.13512]
[9.13513]
```
    if (str == "cold" || str == "ice")
```
Replacement in crawl-ref/source/initfile.cc at line 249 [6.2957258]
∅:D[9.13538] → [8.786674:786721]
B:BD[8.786674] → [8.786674:786721]
```
    if ( str == "summ" || str == "summoning" )
```
[9.13538]
[9.13539]
```
    if (str == "summ" || str == "summoning")
```
Replacement in crawl-ref/source/initfile.cc at line 251 [6.2957258]
∅:D[9.13564] → [8.786739:786766]
B:BD[8.786739] → [8.786739:786766]
```
    if ( str == "random" )
```
[9.13564]
[9.13565]
```
    if (str == "random")
```
Insertion in crawl-ref/source/initfile.cc at line 253 [6.2957258]
[9.13592]
[8.786786]
Deletion in crawl-ref/source/initfile.cc at line 290 [6.2957258]
B:BD[10.392588] → [10.392588:392613]
```
        return "random";
```

Replacement in crawl-ref/source/food.cc at line 181 [6.3043806]

B:BD[11.569] → [12.5034:5090]

static bool _find_butchering_implement( bool fallback )

[11.569]

[9.14346]

static int _find_butchering_implement(int &butcher_tool)

Insertion in crawl-ref/source/food.cc at line 183 [6.3043806]

[9.14348]

[13.2647]

    // When berserk, you can't change weapons. Sanity check!
    if (!can_wield(NULL, true))
        return (false);

Replacement in crawl-ref/source/food.cc at line 191 [6.3043806]

B:BD[13.2788] → [14.3773:3870]

        // No switching necessary.
        if (can_cut_meat( *wpn ))
            return (false);

[13.2788]

[14.3870]

        // Otherwise we wouldn't be here.
        ASSERT(!can_cut_meat( *wpn ));

Replacement in crawl-ref/source/food.cc at line 206 [6.3043806]
B:BD[15.3694] → [15.3694:3737]
```
    int old_weapon = you.equip[EQ_WEAPON];
```
[15.3694]
[16.9066]
```
    bool potential_candidate = false;
```
Deletion in crawl-ref/source/food.cc at line 212 [6.3043806]
B:BD[9.14435] → [9.14435:14477]
```
            && can_cut_meat( you.inv[i] )
```

Replacement in crawl-ref/source/food.cc at line 213 [6.3043806]

B:BD[9.14528] → [9.14528:14682]

B:BD[9.14682] → [13.3128:3222]

            && item_known_uncursed(you.inv[i])
            && item_type_known(you.inv[i])
            && get_weapon_brand(you.inv[i]) != SPWPN_DISTORTION
            // don't even ask
            && !has_warning_inscription(you.inv[i], OPER_WIELD)

[9.14528]

[9.14682]

            && can_cut_meat( you.inv[i] )

Replacement in crawl-ref/source/food.cc at line 216 [6.3043806]

B:BD[9.14733] → [9.14733:14834]

B:BD[9.14834] → [2.39226:39253]

            mpr("Switching to a butchering implement.");
            wield_weapon( true, i, false );
            return (true);

[9.14733]

[9.15281]

            if (Options.easy_butcher
                && item_known_uncursed(you.inv[i])
                && item_type_known(you.inv[i])
                && get_weapon_brand(you.inv[i]) != SPWPN_DISTORTION
                // Don't even ask!
                && !has_warning_inscription(you.inv[i], OPER_WIELD))
            {
                butcher_tool = i;
                return (true);
            }
            else
                potential_candidate = true;

Insertion in crawl-ref/source/food.cc at line 229 [6.3043806]

[9.15291]

[8.850019]

    }
    if (!potential_candidate)
    {
        mpr("You don't carry any weapon that could be used for butchering.");
        return (false);

Insertion in crawl-ref/source/food.cc at line 236 [6.3043806]

[8.850025]

[11.625]


    const int item_slot = prompt_invent_item(
                            "What would you like to use? (- for none)?",
                            MT_INVLIST, OSEL_WIELD,
                            true, true, true, '-', -1, NULL, OPER_WIELD);

Replacement in crawl-ref/source/food.cc at line 242 [6.3043806]
B:BD[11.626] → [15.3738:3757]
```
    if (!fallback)
```
[11.626]
[2.39254]
```
    if (prompt_failed(item_slot))
    {
        canned_msg(MSG_OK);
```
Insertion in crawl-ref/source/food.cc at line 246 [6.3043806]
[2.39278]
[11.669]
```
    }
    else if (item_slot == PROMPT_GOT_SPECIAL)
    {
```

Replacement in crawl-ref/source/food.cc at line 250 [6.3043806]

B:BD[11.670] → [17.9175:9244]

∅:D[17.9244] → [8.850099:850153]

B:BD[8.850099] → [8.850099:850153]

    // If we didn't swap above, then we still can't cut...let's call
    // wield_weapon() in the "prompt the user" way...

[11.670]

[16.9068]

        if (you.has_claws()
            || transform_can_butcher_barehanded(
                    static_cast<transformation_type>(
                        you.attribute[ATTR_TRANSFORMATION])))
        {
            butcher_tool = -1;
            return (true);
        }
        else
        {
            mpr("You can't butcher without a weapon!");
            return (false);
        }
    }
    else if (item_slot == you.equip[EQ_WEAPON])
    {
        mpr("You are already wielding that!");
        return (false);
    }

Replacement in crawl-ref/source/food.cc at line 270 [6.3043806]

B:BD[16.9069] → [17.9245:9275]

∅:D[17.9275] → [15.3758:3812]

B:BD[8.850187] → [15.3758:3812]

∅:D[15.3812] → [8.850286:850313]

B:BD[8.850286] → [8.850286:850313]

    // Prompt for new weapon.
    mpr("What would you like to use?", MSGCH_PROMPT);
    wield_weapon( false );

[16.9069]

[16.9070]

    if (is_valid_item( you.inv[item_slot] )
        && you.inv[item_slot].base_type == OBJ_WEAPONS
        && can_cut_meat( you.inv[item_slot] )
        && can_wield( &you.inv[item_slot] ))
    {
        butcher_tool = item_slot;
        return (true);
    }

Replacement in crawl-ref/source/food.cc at line 279 [6.3043806]
B:BD[16.9071] → [17.9276:9322]
∅:D[17.9322] → [8.850364:850413]
B:BD[8.850364] → [8.850364:850413]
```
    // Let's see if the user did something...
    return (you.equip[EQ_WEAPON] != old_weapon);
```
[16.9071]
[8.850413]
```
    mpr("That item isn't sharp enough!");
    return (false);
```

Replacement in crawl-ref/source/food.cc at line 283 [6.3043806]

B:BD[8.850416] → [15.3813:3999]

static bool _prepare_butchery(bool can_butcher, bool barehand_butcher,
                              bool wpn_switch, bool removed_gloves,
                              bool new_cursed)

[8.850416]

[15.3999]

static bool _prepare_butchery(bool can_butcher, bool removed_gloves,
                              bool wpn_switch, int butchering_tool)

Replacement in crawl-ref/source/food.cc at line 290 [6.3043806]

B:BD[15.4079] → [15.4079:4171]

    // We don't want auto-switching.
    if (!Options.easy_butcher)
        return (false);

[15.4079]

[15.4171]

    // At least one of these has to be true, else what are we doing here?
    ASSERT(removed_gloves || wpn_switch);

Replacement in crawl-ref/source/food.cc at line 299 [6.3043806]

B:BD[15.4414] → [15.4414:4493]

        takeoff_armour(you.equip[EQ_GLOVES]);
        barehand_butcher = true;

[15.4414]

[15.4493]

        if (!takeoff_armour(you.equip[EQ_GLOVES]))
            return (false);

Replacement in crawl-ref/source/food.cc at line 303 [6.3043806]

B:BD[15.4500] → [15.4500:4748]

    // note that if barehanded then the user selected '-' when
    // switching weapons
    if (!barehand_butcher && (!wpn_switch
                              || you.weapon() == NULL
                              || !can_cut_meat(*you.weapon())))

[15.4500]

[15.4748]

    if (wpn_switch)

Replacement in crawl-ref/source/food.cc at line 305 [6.3043806]

B:BD[15.4754] → [15.4754:5101]

        // still can't butcher. Early out
        if ( you.weapon() == NULL )
        {
            if (you.equip[EQ_GLOVES] == -1)
                mpr("What, with your bare hands?");
            else
                mpr("Your gloves aren't that sharp!");
        }
        else
            mpr("Maybe you should try using a sharper implement.");

[15.4754]

[15.5101]

        mprf("Switching to %s.",
             (butchering_tool == -1) ? "unarmed"
                                   : "a butchering implement");

Replacement in crawl-ref/source/food.cc at line 309 [6.3043806]

B:BD[15.5102] → [15.5102:5275]

        // Switch back to old weapon.
        if (!new_cursed && wpn_switch)
            start_delay( DELAY_WEAPON_SWAP, 1, you.equip[EQ_WEAPON] );
        return (false);

[15.5102]

[15.5275]

        if (!wield_weapon( true, butchering_tool, false ))
            return (false);

Deletion in crawl-ref/source/food.cc at line 312 [6.3043806]
B:BD[15.5281] → [15.5281:5311]
```
    you.turn_is_over = true;
```

Replacement in crawl-ref/source/food.cc at line 358 [6.3043806]

B:BD[15.6575] → [15.6575:6656]

                                bool new_cursed, int old_weapon, int old_gloves)

[15.6575]

[15.6656]

                                int old_weapon, int old_gloves)

Replacement in crawl-ref/source/food.cc at line 360 [6.3043806]

B:BD[15.6658] → [15.6658:6719]

    // switch weapon back
    if (!new_cursed && wpn_switch)

[15.6658]

[15.6719]

    // Switch weapon back.
    if (wpn_switch && you.equip[EQ_WEAPON] != old_weapon
        && (you.equip[EQ_WEAPON] == -1
            || !item_cursed(you.inv[you.equip[EQ_WEAPON]])))
    {

Insertion in crawl-ref/source/food.cc at line 366 [6.3043806]
[15.6776]
[18.2673]
```
    }
```

Replacement in crawl-ref/source/food.cc at line 368 [6.3043806]

B:BD[18.2674] → [15.6777:6834]

    // put on the removed gloves
    if (removed_gloves)

[18.2674]

[15.6834]

    // Put on the removed gloves.
    if (removed_gloves && you.equip[EQ_GLOVES] != old_gloves)

Deletion in crawl-ref/source/food.cc at line 371 [6.3043806]
∅:D[18.2822] → [11.971:972]
∅:D[15.6889] → [11.971:972]
B:BD[11.971] → [11.971:972]
B:BD[11.972] → [15.6890:6919]
```
    you.turn_is_over = true;
```

Replacement in crawl-ref/source/food.cc at line 435 [6.3043806]

B:BD[19.7026] → [19.7026:7085]

             verb.c_str(), noun.c_str(), pronoun.c_str());

[19.7026]

[20.35988]

             noun.c_str(), verb.c_str(), pronoun.c_str());

Replacement in crawl-ref/source/food.cc at line 461 [6.3043806]

B:BD[15.7251] → [15.7251:7322]

    // Other species with this mutation still might benefit from this.

[15.7251]

[15.7322]

    // (Not that they really need to.) Other species with this mutation
    // might still benefit from it.

Replacement in crawl-ref/source/food.cc at line 524 [6.3043806]
B:BD[15.8586] → [15.8586:8619]
```
    bool new_cursed     = false;
```
[15.8586]
[15.8619]
```
    int butcher_tool    = -1;
```

Replacement in crawl-ref/source/food.cc at line 529 [6.3043806]

B:BD[15.8690] → [15.8690:8818]

        wpn_switch      = _find_butchering_implement(!gloved_butcher);
        removed_gloves  = gloved_butcher && !wpn_switch;

[15.8690]

[15.8818]

        if (!_find_butchering_implement(butcher_tool))
            return (false);

Replacement in crawl-ref/source/food.cc at line 532 [6.3043806]

B:BD[15.8819] → [15.8819:8843]

∅:D[15.8843] → [21.1039:1049]

B:BD[21.1039] → [21.1039:1049]

B:BD[21.1049] → [15.8844:9031]

        if (wpn_switch)
        {
            new_cursed = ( you.weapon() != NULL
                           && you.weapon()->base_type == OBJ_WEAPONS
                           && item_cursed(*you.weapon()) );
        }

[15.8819]

[15.9031]

        if (butcher_tool == -1 && gloved_butcher)
            removed_gloves = true;
        if (you.equip[EQ_WEAPON] != butcher_tool)
            wpn_switch = true;

Replacement in crawl-ref/source/food.cc at line 544 [6.3043806]

B:BD[15.9257] → [15.9257:9391]

        if (!_prepare_butchery(can_butcher, barehand_butcher, wpn_switch,
                               removed_gloves, new_cursed))

[15.9257]

[15.9391]

        if (!_prepare_butchery(can_butcher, removed_gloves, wpn_switch,
                               butcher_tool))

Replacement in crawl-ref/source/food.cc at line 550 [6.3043806]

B:BD[15.9485] → [15.9485:9606]

        _terminate_butchery(wpn_switch, removed_gloves, new_cursed,
                            old_weapon, old_gloves);

[15.9485]

[16.9078]

        _terminate_butchery(wpn_switch, removed_gloves, old_weapon, old_gloves);

Replacement in crawl-ref/source/food.cc at line 555 [6.3043806]
∅:D[22.4121] → [15.9607:9631]
B:BD[16.9079] → [15.9607:9631]
```
        return success;
```
[22.4121]
[21.1710]
```
        return (success);
```

Replacement in crawl-ref/source/food.cc at line 614 [6.3043806]

B:BD[3.3740] → [3.3740:3941]

                    if (!_prepare_butchery(can_butcher, barehand_butcher,
                                           wpn_switch, removed_gloves,
                                           new_cursed))

[3.3740]

[3.3941]

                    if (!_prepare_butchery(can_butcher, removed_gloves,
                                           wpn_switch, butcher_tool))

Replacement in crawl-ref/source/food.cc at line 637 [6.3043806]

B:BD[3.4623] → [3.4623:4768]

                    _terminate_butchery(wpn_switch, removed_gloves, new_cursed,
                                        old_weapon, old_gloves);

[3.4623]

[3.4768]

                    _terminate_butchery(wpn_switch, removed_gloves, old_weapon,
                                        old_gloves);

Deletion in crawl-ref/source/food.cc at line 670 [6.3043806]

B:BD[15.11517] → [15.11517:11659]

    }
    else
    {
        _terminate_butchery(wpn_switch, removed_gloves, new_cursed,
                            old_weapon, old_gloves);

Insertion in crawl-ref/source/food.cc at line 671 [6.3043806]

[15.11665]

[22.4122]

    _terminate_butchery(wpn_switch, removed_gloves, old_weapon, old_gloves);

Deletion in crawl-ref/source/food.cc at line 673 [6.3043806]
B:BD[22.4123] → [22.4123:4124]

Replacement in crawl-ref/source/fight.cc at line 4079 [6.3140790]

B:BD[23.6749] → [23.6749:6938]

           && weapon && weapon->base_type != OBJ_STAVES
           && (weapon->base_type != OBJ_WEAPONS || is_range_weapon(*weapon))
        || you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])

[23.6749]

[24.82100]

        && (weapon && weapon->base_type != OBJ_STAVES
               && (weapon->base_type != OBJ_WEAPONS || is_range_weapon(*weapon))
            || you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]))

Deletion in crawl-ref/source/fight.cc at line 4100 [6.3140790]
B:BD[23.7438] → [23.7438:7448]
```
        {
```
Deletion in crawl-ref/source/fight.cc at line 4101 [6.3140790]
B:BD[23.7496] → [23.7496:7567]
```
            you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
        }
```

Replacement in crawl-ref/source/delay.cc at line 402 [6.3963459]

B:BD[25.4791] → [25.4791:4864]

                                                 : butcher_swap_weapon);

[25.4791]

[25.4864]

                                                 : butcher_swap_weapon) + 1;

Replacement in crawl-ref/source/acr.cc at line 1399 [6.4397395]
B:BD[26.274] → [27.9900:9944]
```
    bool player_feels_safe = i_feel_safe();
```
[26.274]
[27.9944]
```
    const bool player_feels_safe = i_feel_safe();
```

Replacement in crawl-ref/source/acr.cc at line 1461 [6.4397395]

B:BD[25.5112] → [27.10007:10054]

    if (!you.turn_is_over && player_feels_safe

[25.5112]

[27.10054]

    if (Options.swap_when_safe && !you.turn_is_over && player_feels_safe

Replacement in crawl-ref/source/acr.cc at line 1464 [6.4397395]

B:BD[28.4100] → [25.5113:5177]

        int weap = you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED];

[28.4100]

[25.5177]

        int weap = you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] - 1;

Fix the old issue of switching to the butchering tool before actually

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 3963 [6.962854]

Replacement in crawl-ref/source/initfile.cc at line 245 [6.2957258]

Replacement in crawl-ref/source/initfile.cc at line 247 [6.2957258]

Replacement in crawl-ref/source/initfile.cc at line 249 [6.2957258]

Replacement in crawl-ref/source/initfile.cc at line 251 [6.2957258]

Insertion in crawl-ref/source/initfile.cc at line 253 [6.2957258]

Deletion in crawl-ref/source/initfile.cc at line 290 [6.2957258]

Replacement in crawl-ref/source/food.cc at line 181 [6.3043806]

Insertion in crawl-ref/source/food.cc at line 183 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 191 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 206 [6.3043806]

Deletion in crawl-ref/source/food.cc at line 212 [6.3043806]