fiddlerwoaroof/crawl - Change PZNRGNZPN4YLXL2UDMEUPE33AAZZ6Z2YPK6EQGYZL2PNTRWLCUNQC

Fix the remaining (known) issues with butchering all corpses in a stash:

You should now get the "not swapping back" warning also for sac sessions and chained butchery.
Vampires choosing (a)ll from a "Bottle this corpse?" prompt will only attempt to bottle corpses that actually contain blood (so they no longer will be autobutchering bloodless corpses in the stash).

Also changed Vampire spell hunger reduction to Thirsty, Very Thirsty: 50% Near Starving, Starving: None

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

Created by j-p-e-g on May 16, 2008

PZNRGNZPN4YLXL2UDMEUPE33AAZZ6Z2YPK6EQGYZL2PNTRWLCUNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 860 [5.5936]

B:BD[4.1192] → [3.133:198]

             && you.num_turns < Options.tut_seen_invisible + 20)

[4.1192]

[4.1257]

             && you.num_turns - Options.tut_seen_invisible <= 20)

Replacement in crawl-ref/source/tutorial.cc at line 2437 [5.5936]

B:BD[6.2102] → [6.2102:2145]

                        "for <w>y</w>es.";

[6.2102]

[7.32801]

                        "for <w>y</w>es, or directly chopping <w>a</w>ll "
                        "corpses.";

Replacement in crawl-ref/source/religion.cc at line 4589 [9.804403]

B:BD[8.1084] → [8.1084:1130]

        return item.base_type == OBJ_CORPSES;

[8.1084]

[10.4148]

        return (item.base_type == OBJ_CORPSES || is_blood_potion(item));

Replacement in crawl-ref/source/religion.cc at line 5023 [9.804403]

B:BD[11.654] → [12.2594:2747]

    return
        god == GOD_OKAWARU ||
        god == GOD_MAKHLEB ||
        god == GOD_TROG ||
        god == GOD_BEOGH ||
        god == GOD_LUGONU;

[11.654]

[11.797]

    return (god == GOD_OKAWARU
            || god == GOD_MAKHLEB
            || god == GOD_TROG
            || god == GOD_BEOGH
            || god == GOD_LUGONU);

Replacement in crawl-ref/source/religion.cc at line 5032 [9.804403]
B:BD[11.840] → [12.2748:2788]
```
    return
        god == GOD_ELYVILON;
```
[11.840]
[13.216]
```
    return (god == GOD_ELYVILON);
```

Replacement in crawl-ref/source/player.cc at line 6020 [9.962854]

B:BD[2.3356] → [2.3356:3436]

// to 75% (hungry), 50% (very hungry), 25% (near starving), or zero (starving).

[2.3356]

[2.3436]

// to 50% (hungry, very hungry) or zero (near starving, starving).

Replacement in crawl-ref/source/player.cc at line 6025 [9.962854]

B:BD[2.3550] → [2.3550:3613]

        food_cost *= you.hunger_state;
        food_cost /= 4;

[2.3550]

[2.3613]

        if (you.hunger_state <= HS_NEAR_STARVING)
            return 0;
        return (food_cost/2);

Replacement in crawl-ref/source/mutation.cc at line 1437 [9.1263003]

B:BD[2.3976] → [2.3976:4086]

       {"Spell hunger         ", "full       ", "full    ", "full      ",  "reduced  ", "lowered  ", "none "}

[2.3976]

[14.5050]

       {"Spell hunger         ", "full       ", "full    ", "full      ",  "halved   ", "none     ", "none "}

Insertion in crawl-ref/source/initfile.cc at line 480 [9.2957258]

[15.788284]

[16.4094]

        "interrupt_bottle_blood = interrupt_butcher",
        "interrupt_offer_corpse = interrupt_butcher, hungry",

Deletion in crawl-ref/source/initfile.cc at line 498 [9.2957258]
B:BD[15.788953] → [3.2997:3059]
```
        "interrupt_offer_corpse = interrupt_butcher, hungry",
```

Replacement in crawl-ref/source/food.cc at line 274 [9.3043806]

B:BD[3.5375] → [3.5375:5418]

static bool _butcher_corpse(int corpse_id)

[3.5375]

[9.3047936]

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

Deletion in crawl-ref/source/food.cc at line 295 [9.3043806]

B:BD[3.6031] → [3.6031:6243]


        // 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 && !removed_gloves)
//          ++mitm[corpse_id].plus2;

Replacement in crawl-ref/source/food.cc at line 300 [9.3043806]

B:BD[17.2640] → [3.6347:6449]

        start_delay(DELAY_BUTCHER, work_req, corpse_id,
                    mitm[corpse_id].special);

[17.2640]

[3.6449]


        delay_type dtype = DELAY_BUTCHER;
        if (!force_butcher
            && can_bottle_blood_from_corpse(mitm[corpse_id].plus))
        {
            dtype = DELAY_BOTTLE_BLOOD;
        }
        start_delay(dtype, work_req, corpse_id, mitm[corpse_id].special);

Insertion in crawl-ref/source/food.cc at line 443 [9.3043806]
[3.9778]
[3.9778]
```
    bool bottle_all  = false; // for Vampires
```

Replacement in crawl-ref/source/food.cc at line 452 [9.3043806]

B:BD[18.9083] → [3.9993:10018]

        if (butcher_all)

[18.9083]

[3.10018]

        if (bottle_all && !can_bottle_blood_from_corpse(mitm[o].plus))
            continue;
        if (butcher_all || bottle_all)

Replacement in crawl-ref/source/food.cc at line 491 [9.3043806]

B:BD[3.11161] → [3.11161:11201]

                    butcher_all = true;

[3.11161]

[19.1976]

                {
                    if (can_bottle_blood_from_corpse(mitm[o].plus))
                        bottle_all = true;
                    else
                        butcher_all = true;
                }

Replacement in crawl-ref/source/food.cc at line 502 [9.3043806]

B:BD[19.2122] → [3.11232:11276]

            if (_butcher_corpse(corpse_id))

[19.2122]

[3.11276]

            if (_butcher_corpse(corpse_id, butcher_all))

Replacement in crawl-ref/source/food.cc at line 505 [9.3043806]
B:BD[18.9129] → [3.11309:11339]
```
            if (!butcher_all)
```
[18.9129]
[3.11339]
```
            if (!butcher_all && !bottle_all)
```
Replacement in crawl-ref/source/food.cc at line 510 [9.3043806]
B:BD[20.488] → [3.11363:11404]
```
    if (!butcher_all && corpse_id == -1)
```
[20.488]
[3.11404]
```
    if (!butcher_all && !bottle_all && corpse_id == -1)
```
Insertion in crawl-ref/source/enum.h at line 711 [9.3287960]
[9.3306077]
[3.12003]
```
    DELAY_BOTTLE_BLOOD,
```

Deletion in crawl-ref/source/delay.cc at line 316 [9.3963459]

B:BD[21.22136] → [21.22136:22137]

∅:D[21.22137] → [22.665:700]

B:BD[9.3964458] → [22.665:700]

B:BD[22.700] → [3.12187:12445]


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

Deletion in crawl-ref/source/delay.cc at line 317 [9.3963459]
B:BD[23.305] → [23.305:400]
B:BD[23.400] → [24.2965:2966]
```
    const int butcher_swap_weapon =
        butcher_swap_warn? you.delay_queue[1].parm1 : -10;
```

Insertion in crawl-ref/source/delay.cc at line 328 [9.3963459]

[9.3965034]

    case DELAY_BOTTLE_BLOOD:
    case DELAY_OFFER_CORPSE:
    {
        bool multiple_corpses  = false;
        bool butcher_swap_warn = false;
        int wpn_delay = -1;
        for (unsigned int i = 1; i < you.delay_queue.size(); i++)
        {
            if (you.delay_queue[i].type == DELAY_BUTCHER
                || you.delay_queue[i].type == DELAY_BOTTLE_BLOOD
                || you.delay_queue[i].type == DELAY_OFFER_CORPSE)
            {
                multiple_corpses = true;
            }
            else if (you.delay_queue[i].type == DELAY_WEAPON_SWAP)
            {
                wpn_delay = i;
                butcher_swap_warn = true;
                break;
            }
            else
                break;
        }
        const std::string butcher_verb =
                (delay.type == DELAY_BUTCHER      ? "butchering" :
                 delay.type == DELAY_BOTTLE_BLOOD ? "bottling blood from"
                                                  : "sacrificing");

Deletion in crawl-ref/source/delay.cc at line 358 [9.3963459]

B:BD[9.3965114] → [3.12446:12563]

        // FIXME: Also print this message for interruptions in chained
        //        butchery/sacrifice session.

Insertion in crawl-ref/source/delay.cc at line 360 [9.3963459]

[25.2119]

[23.401]

            const int butcher_swap_weapon = you.delay_queue[wpn_delay].parm1;

Replacement in crawl-ref/source/delay.cc at line 370 [9.3963459]

∅:D[23.641] → [25.2171:2249]

∅:D[3.12593] → [25.2171:2249]

B:BD[25.2171] → [25.2171:2249]

B:BD[25.2249] → [23.642:708]

            mprf(MSGCH_WARN, "You stop butchering the corpse; not switching "
                 "back to %s.",
                 weapon.c_str());

[3.12593]

[25.2350]

            mprf(MSGCH_WARN, "You stop %s the corpse%s; not switching "
                             "back to %s.", butcher_verb.c_str(),
                             (multiple_corpses ? "s" : ""), weapon.c_str());

Replacement in crawl-ref/source/delay.cc at line 375 [9.3963459]

B:BD[22.1025] → [22.1025:1079]

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

[22.1025]

[3.12594]

            mprf("You stop %s the corpse.", butcher_verb.c_str());

Replacement in crawl-ref/source/delay.cc at line 379 [9.3963459]
B:BD[9.3965210] → [9.3965210:3965211]
[9.3965210]
[15.995712]
```
    }
```

Deletion in crawl-ref/source/delay.cc at line 491 [9.3963459]

B:BD[3.12597] → [3.12597:12745]

∅:D[3.12745] → [24.3693:3694]

B:BD[26.3378] → [24.3693:3694]

    case DELAY_OFFER_CORPSE:      // one turn
#ifdef DEBUG_DIAGNOSTICS
        mpr("Stop sacrificing.");
#endif
        pop_delay();
        break;

Insertion in crawl-ref/source/delay.cc at line 506 [9.3963459]
[3.12841]
[3.12841]
```
        || current_delay_action() == DELAY_BOTTLE_BLOOD
```

Replacement in crawl-ref/source/delay.cc at line 538 [9.3963459]

B:BD[27.525] → [27.525:562]

    if (delay.type == DELAY_BUTCHER)

[27.525]

[27.562]

    if (delay.type == DELAY_BUTCHER || delay.type == DELAY_BOTTLE_BLOOD)

Insertion in crawl-ref/source/delay.cc at line 632 [9.3963459]
[28.742]
[3.12966]
```
        case DELAY_BOTTLE_BLOOD:
```

Replacement in crawl-ref/source/delay.cc at line 634 [9.3963459]

B:BD[3.13031] → [3.13031:13158]

                 can_bottle_blood_from_corpse(mitm[delay.parm1].plus) ?
                 "bottling blood from" : "butchering",

[3.13031]

[3.13158]

                 (delay.type == DELAY_BOTTLE_BLOOD ? "bottling blood from"
                                                   : "butchering"),

Insertion in crawl-ref/source/delay.cc at line 638 [9.3963459]
[3.13221]
[3.13221]
```
            // also for bottling blood
```

Replacement in crawl-ref/source/delay.cc at line 691 [9.3963459]

B:BD[15.997476] → [3.13405:13478]

    if (delay.type == DELAY_BUTCHER || delay.type == DELAY_OFFER_CORPSE)

[15.997476]

[15.997513]

    if (delay.type == DELAY_BUTCHER || delay.type == DELAY_BOTTLE_BLOOD
        || delay.type == DELAY_OFFER_CORPSE)

Insertion in crawl-ref/source/delay.cc at line 694 [9.3963459]

[15.997519]

        if (delay.type == DELAY_BOTTLE_BLOOD && you.experience_level < 6)
        {
            mpr("You cannot bottle blood anymore!");
            stop_delay();
            return;
        }

Replacement in crawl-ref/source/delay.cc at line 714 [9.3963459]

B:BD[29.19426] → [3.13527:13576]

                if (delay.type == DELAY_BUTCHER)

[29.19426]

[3.13576]

                if (delay.type == DELAY_BUTCHER
                    || delay.type == DELAY_BOTTLE_BLOOD)

Replacement in crawl-ref/source/delay.cc at line 725 [9.3963459]

B:BD[3.13862] → [3.13862:13919]

                    // don't attempt to offer a skeleton

[3.13862]

[3.13919]

                    // Don't attempt to offer a skeleton.

Replacement in crawl-ref/source/delay.cc at line 758 [9.3963459]

B:BD[30.3175] → [30.3175:3253]

                    if (can_bottle_blood_from_corpse(mitm[delay.parm1].plus))

[30.3175]

[30.3253]

                    if (delay.type == DELAY_BOTTLE_BLOOD)

Replacement in crawl-ref/source/delay.cc at line 850 [9.3963459]

B:BD[15.1000146] → [31.15920:16120]

            mprf(MSGCH_MULTITURN_ACTION, "You continue %s the corpse.",
                 can_bottle_blood_from_corpse(mitm[delay.parm1].plus)?
                  "bottling blood from" : "butchering");

[15.1000146]

[15.1000242]

            mprf(MSGCH_MULTITURN_ACTION, "You continue butchering the corpse.");
            break;
        case DELAY_BOTTLE_BLOOD:
            mprf(MSGCH_MULTITURN_ACTION, "You continue bottling blood from "
                                         "the corpse.");

Insertion in crawl-ref/source/delay.cc at line 1056 [9.3963459]
[19.7233]
[22.1366]
```
    case DELAY_BOTTLE_BLOOD:
```

Replacement in crawl-ref/source/delay.cc at line 1064 [9.3963459]

B:BD[31.16198] → [31.16198:16383]

                     "finish %s!", can_bottle_blood_from_corpse(item.plus)
                                   ? "bottling its blood"
                                   : "butchering");

[31.16198]

[29.20545]

                     "finish %s!",
                     (delay.type == DELAY_BOTTLE_BLOOD ? "bottling its blood"
                                                       : "butchering"));

Replacement in crawl-ref/source/delay.cc at line 1076 [9.3963459]

B:BD[29.20740] → [31.16384:16441]

            if (can_bottle_blood_from_corpse(item.plus))

[29.20740]

[31.16441]

            if (delay.type == DELAY_BOTTLE_BLOOD)

Replacement in crawl-ref/source/delay.cc at line 1084 [9.3963459]

B:BD[32.33939] → [3.15288:15442]

                      || player_mutation_level(MUT_FANGS) == 3) ? "ripping"
                                                                : "chopping",

[32.33939]

[3.15442]

                      || player_mutation_level(MUT_FANGS) == 3
                         && you.species != SP_VAMPIRE) ? "ripping"
                                                       : "chopping",

Replacement in crawl-ref/source/delay.cc at line 1100 [9.3963459]

B:BD[33.11924] → [31.17199:17435]

                if (you.species == SP_VAMPIRE && you.experience_level < 6
                    && mons_has_blood(item.plus)
                    && (!god_likes_butchery(you.religion)
                        || !you.duration[DUR_PRAYER]))

[33.11924]

[31.17435]

                if (you.species == SP_VAMPIRE && delay.type == DELAY_BUTCHER
                    && mons_has_blood(item.plus))

Replacement in crawl-ref/source/delay.cc at line 1746 [9.3963459]

B:BD[16.16999] → [3.15801:15937]

    "jewellery_on", "memorise", "butcher", "offer_corpse", "weapon_swap",
    "passwall", "drop_item", "multidrop", "ascending_stairs",

[16.16999]

[3.15937]

    "jewellery_on", "memorise", "butcher", "bottle_blood", "offer_corpse",
    "weapon_swap", "passwall", "drop_item", "multidrop", "ascending_stairs",

Insertion in crawl-ref/docs/options_guide.txt at line 1463 [35.63392]
[34.25234]
[34.25234]
```
        - Picking up a rune or the orb of zot for the first time
```
Replacement in crawl-ref/docs/options_guide.txt at line 1481 [35.63392]
B:BD[36.37004] → [36.37004:37056]
```
             note_items = rod,book,rune,acquirement
```
[36.37004]
[37.38776]
```
             note_items = rod,book,acquirement
```
Replacement in crawl-ref/docs/options_guide.txt at line 1488 [35.63392]
B:BD[36.37300] → [36.37300:37309]
```
        
```
[36.37300]
[37.38777]