fiddlerwoaroof/crawl - Change 5R4WV4H5SNIM5WU2X33JJ63HIEGKCXN2HELZ6FRRKKANPLMRLF3QC

[1730416] Warn player if not switching back to original weapon when butchery is

interrupted.

Also tweaked delay handling, since delays (particularly stacked delays) were taking more turns than intended.

Changes to delays:

A delay of 1 is assumed to mean one turn spent performing the delay action.
Finishing a delay takes no additional turns (because all the work was done in the prior turns).
No turn is lost after finishing a delay and before starting the next delay. finish_delay() immediately calls handle_delay() to start on the next delay.

Some delay turn counts: Activity 0.2 0.3 Eat a pear 3 2 Butcher a corpse (no weapon swap) 5 4 Butcher a corpse (swapping weapons) 9 6 Take off robe (when wearing cloak) 8 5 Wear a cloak 3 2

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

Created by dshaligram on June 4, 2007

5R4WV4H5SNIM5WU2X33JJ63HIEGKCXN2HELZ6FRRKKANPLMRLF3QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/food.cc at line 165 [4.3043806]

∅:D[3.14834] → [4.3047915:3047916]

∅:D[5.849625] → [4.3047915:3047916]

B:BD[4.3047915] → [4.3047915:3047916]

B:BD[4.3047916] → [3.14835:15256]


            // Account for the weapon switch...we're doing this here
            // since the above switch may reveal information about the
            // weapon (curse status, ego type).  So even if the
            // character fails to or decides not to butcher past this
            // point, they have achieved something and there should be
            // a cost.
            start_delay( DELAY_UNINTERRUPTIBLE, 1 );

Replacement in crawl-ref/source/food.cc at line 221 [4.3043806]
B:BD[5.851247] → [5.851247:851290]
```
    if ( !can_butcher && you.berserker ) {
```
[5.851247]
[6.148]
```
    if ( !can_butcher && you.berserker )
    {
```

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

B:BD[6.2621] → [6.2621:2678]

                int work_req = 4 - (++mitm[objl].plus2);

[6.2621]

[6.2678]

                // If we didn't switch weapons, we get in one turn of butchery;
                // otherwise the work has to happen in the delay.
                if (!wpn_switch)
                    ++mitm[objl].plus2;
                
                int work_req = 4 - mitm[objl].plus2;

Replacement in crawl-ref/source/food.cc at line 328 [4.3043806]
B:BD[4.3057825] → [5.853455:853488]
B:BD[5.853488] → [6.2842:2847]
```
        you.turn_is_over = true;
    
```
[4.3057825]
[5.853489]
```
        you.turn_is_over = true;    
```

Insertion in crawl-ref/source/delay.cc at line 148 [4.3963459]

[4.3964458]

    const bool butcher_swap_warn =
        delay.type == DELAY_BUTCHER
        && (you.delay_queue.size() >= 2
            && you.delay_queue[1].type == DELAY_WEAPON_SWAP);

Replacement in crawl-ref/source/delay.cc at line 165 [4.3963459]

B:BD[4.3965114] → [4.3965114:3965164]

        mpr( "You stop butchering the corpse." );

[4.3965114]

[5.995690]

        if (butcher_swap_warn)
            mpr("You stop butchering the corpse; not switching back to "
                "primary weapon.",
                MSGCH_WARN);
        else
            mpr( "You stop butchering the corpse." );

Replacement in crawl-ref/source/delay.cc at line 332 [4.3963459]

B:BD[5.998292] → [5.998292:998334]

                 (delay.parm2 >= 100) ) {

[5.998292]

[5.998334]

                 (delay.parm2 >= 100) )
            {

Replacement in crawl-ref/source/delay.cc at line 343 [4.3963459]

B:BD[5.998603] → [5.998603:998691]

            // corpse is no longer valid!
            stop_delay();
            return;

[5.998603]

[4.3969128]

            // corpse is no longer valid! End the butchering normally
            // instead of using stop_delay() so that the player switches
            // back to their main weapon if necessary.
            delay.duration = 0;

Replacement in crawl-ref/source/delay.cc at line 551 [4.3963459]

B:BD[6.7233] → [2.21083:21292]

        mprf("You finish %s the corpse into pieces.",
             (you.species==SP_TROLL || you.species == SP_GHOUL) ? "ripping"
                                                                : "chopping");

[6.7233]

[5.1005789]

    {
        const item_def &item = mitm[delay.parm1];
        if (is_valid_item(item) && item.base_type == OBJ_CORPSES)
        {
            mprf("You finish %s the corpse into pieces.",
                 (you.species==SP_TROLL || you.species == SP_GHOUL) ? "ripping"
                 : "chopping");

Replacement in crawl-ref/source/delay.cc at line 559 [4.3963459]

B:BD[5.1005790] → [6.7444:7500]

        turn_corpse_into_chunks( mitm[ delay.parm1 ] );

[5.1005790]

[5.1006146]

            turn_corpse_into_chunks( mitm[ delay.parm1 ] );

Replacement in crawl-ref/source/delay.cc at line 561 [4.3963459]

B:BD[5.1006147] → [6.7501:7573]

        if (you.berserker && you.berserk_penalty != NO_BERSERK_PENALTY)

[5.1006147]

[6.7573]

            if (you.berserker && you.berserk_penalty != NO_BERSERK_PENALTY)
            {
                mpr("You enjoyed that.");
                you.berserk_penalty = 0;
            }
        }
        else

Replacement in crawl-ref/source/delay.cc at line 569 [4.3963459]

B:BD[6.7583] → [6.7583:7658]

            mpr("You enjoyed that.");
            you.berserk_penalty = 0;

[6.7583]

[6.7658]

            mpr("You stop butchering the corpse.");

Insertion in crawl-ref/source/delay.cc at line 572 [4.3963459]
[6.7683]
[5.1006579]
```
    }
```
Deletion in crawl-ref/source/delay.cc at line 628 [4.3963459]
B:BD[6.9384] → [6.9384:9413]
```
    you.turn_is_over = true;
```
Insertion in crawl-ref/source/delay.cc at line 629 [4.3963459]
[6.9430]
[5.1007436]
```
    // Chain onto the next delay.
    handle_delay();
```