fiddlerwoaroof/crawl - Change 5FZYO6GQ5DWJFMRHCFSLAI4NVGK2HJ6RE7BLHBVTNQJHN75K5LUQC

Fix 2018458: Portal projectile not handling branded ammo or nets.

Fix 2019803: cold/fire destroying all susceptible items on the floor Change "You don't eat raw eat!" to "Blech - you need greens!"

Also: Experimentally change sacrifices to take only 1 turn again, no matter how many corpses are actually sacrificed during this turn. Allow chained 'yes' and 'no' answers during the butchering prompt, so that 'cccccc' is now really functionally identical to 'ca'. In another return to previous handling, always get in that first turn of butchering for a single corpse (or the first corpse in butcher chains), so it takes a maximum of 3 turns rather than 4. Same for draining corpses as a Vampire: when draining corpses you get at least a little bit of nutrition out of it before you are interrupted.

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

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

5FZYO6GQ5DWJFMRHCFSLAI4NVGK2HJ6RE7BLHBVTNQJHN75K5LUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/ouch.h at line 110 [4.1101726]

B:BD[4.1104317] → [5.2551:2614]

void expose_items_to_element(beam_type flavour, int x, int y);

[4.1104317]

[5.2614]

void expose_items_to_element(beam_type flavour, int x, int y, int strength = 0);

Replacement in crawl-ref/source/ouch.cc at line 541 [4.1104358]

B:BD[6.365651] → [5.3234:3296]

void expose_items_to_element(beam_type flavour, int x, int y)

[6.365651]

[5.3296]

void expose_items_to_element(beam_type flavour, int x, int y, int strength)

Replacement in crawl-ref/source/ouch.cc at line 554 [4.1104358]

B:BD[5.3563] → [7.2971:3090]

        if ( si->base_type == target_class
             || (target_class == OBJ_FOOD && si->base_type == OBJ_CORPSES))

[5.3563]

[5.3752]

        if (si->base_type == target_class
            || target_class == OBJ_FOOD && si->base_type == OBJ_CORPSES)

Replacement in crawl-ref/source/ouch.cc at line 557 [4.1104358]

B:BD[5.3762] → [7.3091:3205]

            num_dest += si->quantity;
            item_was_destroyed(*si);
            destroy_item(si->index());

[5.3762]

[5.3858]

            if (x_chance_in_y(strength, 100))
            {
                num_dest++;
                dec_mitm_item_quantity(si->index(), 1);
            }

Replacement in crawl-ref/source/ouch.cc at line 565 [4.1104358]
B:BD[5.3875] → [5.3875:3897]
```
    if (num_dest > 0)
```
[5.3875]
[5.3897]
```
    if (num_dest)
```

Replacement in crawl-ref/source/ouch.cc at line 607 [4.1104358]

B:BD[6.366079] → [6.366079:366145]

// XXX: this function is far from perfect and a work in progress.

[6.366079]

[5.4853]

// XXX: This function is far from perfect and a work in progress.

Replacement in crawl-ref/source/item_use.cc at line 2583 [4.2781507]

B:BD[8.1919] → [2.3707:3775]

        hit = (affect(pbolt, pbolt.target_x, pbolt.target_y) != 0);

[8.1919]

[9.685]

        hit = (affect(pbolt, pbolt.target_x, pbolt.target_y, &item) != 0);

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

B:BD[10.5375] → [11.3509:3580]

static bool _butcher_corpse(int corpse_id, bool force_butcher = false)

[10.5375]

[4.3047936]

static bool _butcher_corpse(int corpse_id, bool first_corpse = true,
                            bool force_butcher = false)

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

B:BD[10.5654] → [10.5654:5709]

        start_delay(DELAY_OFFER_CORPSE, 1, corpse_id);

[10.5654]

[10.5709]

        start_delay(DELAY_OFFER_CORPSE, 0, corpse_id);

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

B:BD[4.3048229] → [10.6244:6294]

        int work_req = 4 - mitm[corpse_id].plus2;

[4.3048229]

[10.6294]

        int work_req = 4 - mitm[corpse_id].plus2 - (first_corpse ? 1 : 0);

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

B:BD[10.9439] → [10.9439:9485]

        success = _butcher_corpse(corpse_id);

[10.9439]

[3.6561]

        success = _butcher_corpse(corpse_id, true);

Insertion in crawl-ref/source/food.cc at line 565 [4.3043806]
[12.3176]
[12.3176]
```
    bool did_weap_swap = false;
    bool first_corpse  = true;
```

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

B:BD[12.3740] → [3.6670:6812]

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

[12.3740]

[12.3941]

                    if (!did_weap_swap)

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

B:BD[12.3963] → [12.3963:4003]

                        return (false);

[12.3963]

[12.4003]

                        if (_prepare_butchery(can_butcher, removed_gloves,
                                              wpn_switch, butcher_tool))
                        {
                            did_weap_swap = true;
                        }
                        else
                            return (false);

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

B:BD[13.2122] → [12.5101:5175]

            if (_butcher_corpse(corpse_id, force_butcher || butcher_all))

[13.2122]

[10.11276]

            if (_butcher_corpse(corpse_id, first_corpse,
                force_butcher || butcher_all))
            {

Insertion in crawl-ref/source/food.cc at line 669 [4.3043806]

[10.11308]

[14.9128]

                first_corpse = false;
            }

Replacement in crawl-ref/source/food.cc at line 672 [4.3043806]
B:BD[14.9129] → [11.4310:4355]
∅:D[11.4355] → [10.11339:11362]
B:BD[10.11339] → [10.11339:11362]
```
            if (!butcher_all && !bottle_all)
                break;
```
[14.9129]
[4.3055339]
```
//            if (!butcher_all && !bottle_all)
//                break;
```

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

B:BD[4.3077712] → [4.3077712:3077764]

                    mpr("You can't eat raw meat!");

[4.3077712]

[15.9162]

                    mpr("Blech - you need greens!");

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

B:BD[16.13218] → [16.13218:13314]

    start_delay( DELAY_FEED_VAMPIRE, 1 + chunk_amount/2,
                 (int) invent, slot );

[16.13218]

[16.13314]

    // Get some nutrition right away, in case we're interrupted.
    // (-1 for the starting message.)
    vampire_nutrition_per_turn(corpse, -1);
    if (chunk_amount/2 > 0)
    {
        // The draining delay doesn't have a start action, and we only need
        // the continue/finish messages if it takes longer than 1 turn.
        start_delay( DELAY_FEED_VAMPIRE, chunk_amount/2,
                     (int) invent, slot );
    }

Deletion in crawl-ref/source/delay.cc at line 701 [4.3963459]

B:BD[17.7941] → [16.15066:15323]

        case DELAY_FEED_VAMPIRE:
        {
            item_def &corpse = (delay.parm1 ? you.inv[delay.parm2]
                                            : mitm[delay.parm2]);
            vampire_nutrition_per_turn(corpse, -1);
            break;
        }

Replacement in crawl-ref/source/cloud.cc at line 160 [4.4095717]

B:BD[18.4648] → [18.4648:4715]

                                env.cloud[cc].x, env.cloud[cc].y);

[18.4648]

[18.4715]

                                env.cloud[cc].x, env.cloud[cc].y, 2);

Replacement in crawl-ref/source/beam.cc at line 3147 [4.4128068]

B:BD[19.2822] → [5.5238:5291]

        expose_items_to_element(beam.flavour, x, y);

[19.2822]

[20.15106]

        const int burn_power = (beam.is_explosion) ? 5 :
                                    (beam.is_beam) ? 3 : 2;
        expose_items_to_element(beam.flavour, x, y, burn_power);