fiddlerwoaroof/crawl - Change 3PBG6FJ6WGSR4UM3I7UQUYYCSYU3UBCKCIKYKUEEANIK72TUL4XAC

Changed interrupted butchering behaviour as per Johanna's

suggestions/observations:

Get rid of option swap_when_safe and its behaviour.
If auto-swap butchery is interrupted by teleportation or chagning levels (banishment) then auto-swap back if there's no monsters nearby.

2b) Do the same if butchery is interrupted and then later a large position change happens.

If auto-swap butchery is interrupted by something like poison damage, if the butchery is resumed and finished then swap back.
If auto-swap butchery is interrupted by a monster, then if the new option prompt_for_swap is set the game will ask if you wish to swap back from your butchering tool.

4b) Do the same if butchery is interrupted and then later a large position change lands you near some hostile monsters.

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

Created by zelgadis on December 2, 2008

3PBG6FJ6WGSR4UM3I7UQUYYCSYU3UBCKCIKYKUEEANIK72TUL4XAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.cc at line 1262 [10.531613]
[9.416]
[10.549603]
```
    bool      large_change = false;
```

Insertion in crawl-ref/source/spells3.cc at line 1331 [10.531613]

[11.573]


            if (!see_grid(pos))
                large_change = true;

Insertion in crawl-ref/source/spells3.cc at line 1343 [10.531613]
[10.550977]
[10.550977]
```
                large_change  = false;
```
Insertion in crawl-ref/source/spells3.cc at line 1404 [10.531613]
[12.707]
[12.707]
```
        {
```
Insertion in crawl-ref/source/spells3.cc at line 1406 [10.531613]
[12.770]
[13.7159]
```
            large_change = true;
        }
```
Insertion in crawl-ref/source/spells3.cc at line 1413 [10.531613]
[13.7239]
[10.551688]
Insertion in crawl-ref/source/spells3.cc at line 1416 [10.531613]
[13.7288]
[14.28307]
```
    if (large_change)
        handle_interrupted_swap(true);
```
Replacement in crawl-ref/source/initfile.cc at line 685 [10.2957258]
B:BD[15.4042] → [15.4042:4077]
```
    swap_when_safe         = true;
```
[15.4042]
[16.3745]
```
    prompt_for_swap        = true;
```
Replacement in crawl-ref/source/initfile.cc at line 2057 [10.2957258]
B:BD[17.2814] → [18.2792:2830]
```
    else BOOL_OPTION(swap_when_safe);
```
[17.2814]
[19.5692]
```
    else BOOL_OPTION(prompt_for_swap);
```
Insertion in crawl-ref/source/files.cc at line 10 [10.3084589]
[10.3085468]
[10.3085468]
```
#include "delay.h"
```

Insertion in crawl-ref/source/files.cc at line 1347 [10.3084589]

[20.16426]

[14.52681]

    if (load_mode == LOAD_ENTER_LEVEL)
    {
        // If butchering was interrupted by switching levels (banishment)
        // then switch back from butchering tool if there's no hostiles
        // nearby.
        handle_interrupted_swap(true);
        // Forget about interrupted butchering, since we probably aren't going
        // to get back to the corpse in time to finish things.
        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
    }

Replacement in crawl-ref/source/fight.cc at line 4202 [10.3140790]

B:BD[21.77415] → [6.2945:3020]

∅:D[6.3020] → [21.77630:77673]

∅:D[22.3454] → [21.77630:77673]

∅:D[23.46115] → [21.77630:77673]

B:BD[10.3246619] → [21.77630:77673]

    const int nrounds   = atk->has_hydra_multi_attack() ? atk->number : 4;
    const coord_def pos = defender->pos();

[21.77415]

[24.21427]

    const int nrounds      = atk->has_hydra_multi_attack() ? atk->number : 4;
    const coord_def pos    = defender->pos();
    const bool was_delayed = you_are_delayed();

Insertion in crawl-ref/source/fight.cc at line 4383 [10.3140790]

[8.33482]

[21.80767]


    // Inivislbe monster might have interrupted butchering.
    if (was_delayed && defender->atype() == ACT_PLAYER && perceived_attack
        && !attacker_visible)
    {
        handle_interrupted_swap(false, true);
    }

Replacement in crawl-ref/source/externs.h at line 1860 [10.3270163]

B:BD[17.3003] → [18.2848:2989]

    bool        swap_when_safe;  // If autoswapped butchery was interrupted,
                                 // swap weapon back when safe.

[17.3003]

[25.3613]

    bool        prompt_for_swap; // Prompt to switch back from butchering
                                 // tool if hostile monsters are around.

Insertion in crawl-ref/source/delay.h at line 80 [10.3962990]

[26.1469]

[5.2802]

void handle_interrupted_swap(bool swap_if_safe = false,
                             bool force_unsafe = false);

Insertion in crawl-ref/source/delay.cc at line 311 [10.3963459]

[10.3964312]

[27.3075]

    // Paranoia
    if (type == DELAY_WEAPON_SWAP)
        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;

Replacement in crawl-ref/source/delay.cc at line 400 [10.3963459]

B:BD[7.11027] → [7.11027:11218]

∅:D[7.11218] → [18.3788:3829]

B:BD[28.5750] → [18.3788:3829]

B:BD[18.3829] → [15.4605:4619]

B:BD[15.4619] → [29.2688:2875]

∅:D[29.2875] → [18.3829:3889]

∅:D[15.4729] → [18.3829:3889]

B:BD[18.3829] → [18.3829:3889]

B:BD[18.3889] → [15.4730:4791]

B:BD[15.4791] → [30.7240:7317]

∅:D[30.7317] → [15.4864:4878]

B:BD[15.4864] → [15.4864:4878]

            // Maybe we should do precisely that, but that would entirely
            // defeat the purpose of the weapon swap.
//            you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
            if (Options.swap_when_safe)
            {
                // Use weapon slot + 1, so weapon slot 'a' (== 0) doesn't
                // return false when checking if
                // you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED].
                you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]
                    = (butcher_swap_weapon == -1 ? ENDOFPACK
                                                 : butcher_swap_weapon) + 1;
            }

[7.11027]

[31.2350]

            // Use weapon slot + 1, so weapon slot 'a' (== 0) doesn't
            // return false when checking if
            // you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED].
            you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]
                = (butcher_swap_weapon == -1 ? ENDOFPACK
                                             : butcher_swap_weapon) + 1;

Insertion in crawl-ref/source/delay.cc at line 536 [10.3963459]

[26.1690]

[32.12905]

    }
}
void handle_interrupted_swap(bool swap_if_safe, bool force_unsafe)
{
    if (!you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]
        || !you_tran_can_wear(EQ_WEAPON))
    {
        return;
    }
    // Decrease value by 1. (0 means attribute is false, 1 = a, 2 = b, ...)
    int weap = you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] - 1;
    if (weap == ENDOFPACK)
        weap = -1;
    const bool       safe   = i_feel_safe() && !force_unsafe;
    const bool       prompt = Options.prompt_for_swap && !safe;
    const delay_type delay  = current_delay_action();
    // If we're going to prompt then update the window so the player can
    // see what the monsters are.
    if (prompt)
        viewwindow(true, false);
    if (delay == DELAY_WEAPON_SWAP)
    {
        ASSERT(!"handle_interrupted_swap() called while already swapping "
                "weapons");
        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
        return;
    }
    else if (!you.turn_is_over
             && (delay == DELAY_ASCENDING_STAIRS
                 || delay == DELAY_DESCENDING_STAIRS))
    {
        // We just arrived on the level, let rest of function do its stuff.
        ;
    }
    else if (you.turn_is_over && delay == DELAY_NOT_DELAYED)
    {
        // Turn is over, set up a delay to do swapping next turn.
        if (prompt && yesno("Switch back from butchering tool?", false)
            || safe && swap_if_safe)
        {
            start_delay(DELAY_WEAPON_SWAP, 1, weap);
            you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
        }
        return;
    }
    else if (delay != DELAY_NOT_DELAYED)
    {
        // If ATTR_WEAPON_SWAP_INTERRUPTED is set while a corpse is being
        // butchered/bottled/offered, then fake a weapon swap delay.
        if (delay == DELAY_BUTCHER || delay == DELAY_BOTTLE_BLOOD
           || delay == DELAY_OFFER_CORPSE)
        {
            start_delay(DELAY_WEAPON_SWAP, 1, weap);
            you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
        }
        return;
    }
    if (safe)
    {
        if (!swap_if_safe)
            return;

Insertion in crawl-ref/source/delay.cc at line 604 [10.3963459]

[32.12911]

[10.3967460]

    else if (!prompt || !yesno("Switch back from butchering tool?", false))
    {
        return;
    }
    weapon_switch(weap);
    print_stats();
    you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;

Insertion in crawl-ref/source/delay.cc at line 1227 [10.3963459]

[33.1917]


            // If we were interrupted while butchering (by poisonig, for
            // example) then resumed butchering and finished, swap back from
            // butchering tool if appropriate.
            if (you.delay_queue.size() == 1)
                handle_interrupted_swap(true);

Insertion in crawl-ref/source/delay.cc at line 1269 [10.3963459]

[34.6321]

[32.15779]

        // If we were interrupted while butchering (by poisonig, for
        // example) then resumed butchering and finished, swap back from
        // butchering tool if appropriate.
        if (you.delay_queue.size() == 1)
            handle_interrupted_swap(true);

Replacement in crawl-ref/source/delay.cc at line 1740 [10.3963459]

B:BD[10.3980051] → [35.25705:25769]

inline static void _monster_warning(activity_interrupt_type ai,

[10.3980051]

[35.25769]

inline static bool _monster_warning(activity_interrupt_type ai,

Replacement in crawl-ref/source/delay.cc at line 1748 [10.3963459]
B:BD[36.317] → [36.317:337]
```
            return;
```
[36.317]
[3.2570]
```
            return (false);
```
Insertion in crawl-ref/source/delay.cc at line 1813 [10.3963459]
[37.23564]
[38.241]
```
        return (true);
```
Insertion in crawl-ref/source/delay.cc at line 1816 [10.3963459]
[38.247]
[38.247]
```
    return (false);
```

Replacement in crawl-ref/source/delay.cc at line 1820 [10.3963459]

B:BD[38.250] → [35.25888:25954]

static void _paranoid_option_disable( activity_interrupt_type ai,

[38.250]

[35.25954]

static bool _paranoid_option_disable( activity_interrupt_type ai,

Deletion in crawl-ref/source/delay.cc at line 1849 [10.3963459]

B:BD[39.6410] → [40.5087:5226]

            // Don't switch back after we encountered an invisible creature.
            you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;

Insertion in crawl-ref/source/delay.cc at line 1855 [10.3963459]
[38.1238]
[41.2533]
```
        return (true);
```
Insertion in crawl-ref/source/delay.cc at line 1857 [10.3963459]
[41.2539]
[41.2539]
```
    return (false);
```
Replacement in crawl-ref/source/delay.cc at line 1867 [10.3963459]
B:BD[17.4307] → [35.26029:26067]
```
    _paranoid_option_disable(ai, at);
```
[17.4307]
[42.22255]
```
    bool was_monst = _paranoid_option_disable(ai, at);
```

Replacement in crawl-ref/source/delay.cc at line 1892 [10.3963459]

B:BD[43.18005] → [35.26114:26159]

        _monster_warning(ai, at, item.type);

[43.18005]

[44.1015688]

        was_monst = _monster_warning(ai, at, item.type) || was_monst;

Insertion in crawl-ref/source/delay.cc at line 1894 [10.3963459]

[44.1015710]

[45.6249]

        if (was_monst)
            handle_interrupted_swap(false, true);

Replacement in crawl-ref/source/delay.cc at line 1915 [10.3963459]

B:BD[10.3980587] → [35.26208:26279]

                    _monster_warning(ai, at, you.delay_queue[j].type);

[10.3980587]

[44.1016484]

                    was_monst =
                        _monster_warning(ai, at, you.delay_queue[j].type)
                        || was_monst;

Insertion in crawl-ref/source/delay.cc at line 1920 [10.3963459]

[44.1016518]

[45.6273]

                    if (was_monst)
                        handle_interrupted_swap(false, true);

Insertion in crawl-ref/source/delay.cc at line 1929 [10.3963459]

[44.1016764]

[45.6309]

            if (was_monst)
                handle_interrupted_swap(false, true);

Deletion in crawl-ref/source/beam.cc at line 2361 [10.4128068]

B:BD[2.4876] → [2.4876:5027]

                    // Don't swap weapons just because you can't see it anymore!
                    you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;

Deletion in crawl-ref/source/acr.cc at line 1489 [10.4397395]

∅:D[46.2891] → [47.900:901]

B:BD[47.900] → [47.900:901]

B:BD[47.901] → [15.4992:5112]

B:BD[15.5112] → [29.2969:3016]

B:BD[29.3016] → [4.5794:5890]

∅:D[4.5890] → [18.4094:4100]

∅:D[48.10110] → [18.4094:4100]

B:BD[18.4094] → [18.4094:4100]

B:BD[18.4100] → [29.3017:3097]

∅:D[29.3097] → [30.7536:7604]

B:BD[18.4100] → [30.7536:7604]

∅:D[30.7604] → [15.5177:5231]

B:BD[15.5177] → [15.5177:5231]


    // XXX: Is there some smart way to avoid autoswitching back if we're
    //      just about to continue butchering?
    if (!you.turn_is_over && player_feels_safe
        && you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]
        && you_tran_can_wear(EQ_WEAPON))
    {
        // Decrease value by 1. (0 means attribute is false, 1 = a, 2 = b, ...)
        int weap = you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] - 1;
        if (weap == ENDOFPACK)
            weap = -1;

Deletion in crawl-ref/source/acr.cc at line 1490 [10.4397395]
B:BD[15.5232] → [15.5232:5261]
∅:D[15.5261] → [18.4168:4328]
B:BD[18.4168] → [18.4168:4328]
∅:D[48.10177] → [18.4328:4329]
B:BD[18.4328] → [18.4328:4329]
```
        weapon_switch(weap);
        print_stats();
        // To prevent spam in case the weapon can't be switched back to.
        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
    }
```
Replacement in crawl-ref/settings/init.txt at line 210 [10.4830895]
B:BD[15.5317] → [15.5317:5350]
```
# swap_when_safe         = false
```
[49.3334]
[50.1040]
```
# prompt_for_swap        = false
```
Replacement in crawl-ref/docs/options_guide.txt at line 61 [53.63392]
∅:D[51.3020] → [52.3200:3273]
∅:D[54.4337] → [52.3200:3273]
B:BD[52.3200] → [52.3200:3273]
```
                swap_when_safe, easy_quit_item_prompts, easy_exit_menu, 
```
[54.4337]
[55.2842]
```
                prompt_for_swap, easy_quit_item_prompts, easy_exit_menu, 
```
Replacement in crawl-ref/docs/options_guide.txt at line 979 [53.63392]
B:BD[17.5134] → [15.5973:5995]
```
swap_when_safe = true
```
[17.5134]
[18.4422]
```
prompt_for_swap = true
```

Replacement in crawl-ref/docs/options_guide.txt at line 981 [53.63392]

B:BD[18.4493] → [56.10513:10582]

∅:D[56.10582] → [15.6064:6100]

B:BD[15.6064] → [15.6064:6100]

        butchery is interrupted, the auto-switch will be reversed as
        soon as you are safe again.

[18.4493]

[18.4599]

        butchery is interrupted by a hostile monster, the game will
        ask if you wish to switch back to your weapon.  It will also
        prompt you if after butchery is interupted you teleport or
        change levels and find yourself near hostile monsters.

Changed interrupted butchering behaviour as per Johanna's

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells3.cc at line 1262 [10.531613]

Insertion in crawl-ref/source/spells3.cc at line 1331 [10.531613]

Insertion in crawl-ref/source/spells3.cc at line 1343 [10.531613]

Insertion in crawl-ref/source/spells3.cc at line 1404 [10.531613]

Insertion in crawl-ref/source/spells3.cc at line 1406 [10.531613]

Insertion in crawl-ref/source/spells3.cc at line 1413 [10.531613]

Insertion in crawl-ref/source/spells3.cc at line 1416 [10.531613]

Replacement in crawl-ref/source/initfile.cc at line 685 [10.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2057 [10.2957258]

Insertion in crawl-ref/source/files.cc at line 10 [10.3084589]

Insertion in crawl-ref/source/files.cc at line 1347 [10.3084589]

Replacement in crawl-ref/source/fight.cc at line 4202 [10.3140790]

Insertion in crawl-ref/source/fight.cc at line 4383 [10.3140790]

Replacement in crawl-ref/source/externs.h at line 1860 [10.3270163]

Insertion in crawl-ref/source/delay.h at line 80 [10.3962990]

Insertion in crawl-ref/source/delay.cc at line 311 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 400 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 536 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 604 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1227 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1269 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1740 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1748 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1813 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1816 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1820 [10.3963459]

Deletion in crawl-ref/source/delay.cc at line 1849 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1855 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1857 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1867 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1892 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1894 [10.3963459]

Replacement in crawl-ref/source/delay.cc at line 1915 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1920 [10.3963459]

Insertion in crawl-ref/source/delay.cc at line 1929 [10.3963459]

Deletion in crawl-ref/source/beam.cc at line 2361 [10.4128068]

Deletion in crawl-ref/source/acr.cc at line 1489 [10.4397395]

Deletion in crawl-ref/source/acr.cc at line 1490 [10.4397395]

Replacement in crawl-ref/settings/init.txt at line 210 [10.4830895]

Replacement in crawl-ref/docs/options_guide.txt at line 61 [53.63392]

Replacement in crawl-ref/docs/options_guide.txt at line 979 [53.63392]

Replacement in crawl-ref/docs/options_guide.txt at line 981 [53.63392]