fiddlerwoaroof/crawl - Change HQSI2RK5QGNSOR5Y67GZDK4ZWFZ5DSRPASXAV4VHYVB5TUXFZWJQC

* Remove "Really eat rotten meat?" prompt, and print a generic refusal

message instead. Also, don't offer rotten meat on floor if you won't be able to eat it (FR 1939905).

Give full xp when an enslaved monster is killed, as it's to be assumed it wouldn't have died without your interference (FR 1937178).
Re-allow enforcing saprovorous mutation in wizard mode.

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

Created by j-p-e-g on April 22, 2008

HQSI2RK5QGNSOR5Y67GZDK4ZWFZ5DSRPASXAV4VHYVB5TUXFZWJQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/randart.cc at line 1790 [8.893152]
∅:D[6.2560] → [7.2554:2594]
B:BD[7.2554] → [7.2554:2594]
B:BD[7.2594] → [6.2561:2598]
```
    item.flags |= ISFLAG_ARTEFACT_MASK;
    item.flags &= ~ISFLAG_UNRANDART;
```
[6.2560]
[7.2594]
```
    item.flags |= ISFLAG_RANDART;
```
Deletion in crawl-ref/source/randart.cc at line 1820 [8.893152]
∅:D[4.5361] → [9.6522:6556]
B:BD[9.6522] → [9.6522:6556]
```
    item.flags |= ISFLAG_RANDART;
```

Insertion in crawl-ref/source/mutation.cc at line 1045 [8.1263003]

[5.2660]

// Is there any sense in trying to mutate?
// XXX: Should this also check for mutation resistance or the amulet?

Replacement in crawl-ref/source/mutation.cc at line 1049 [8.1263003]

B:BD[5.2687] → [5.2687:2796]

    return (!you.is_undead ||
        (you.is_undead == US_SEMI_UNDEAD && you.hunger_state == HS_ENGORGED));

[5.2687]

[10.19875]

    return (!you.is_undead
            || (you.is_undead == US_SEMI_UNDEAD
                && you.hunger_state == HS_ENGORGED));

Replacement in crawl-ref/source/mutation.cc at line 1813 [8.1263003]
B:BD[2.242] → [2.242:276]
```
    if (mutat == MUT_SAPROVOROUS)
```
[2.242]
[2.276]
```
    if (mutat == MUT_SAPROVOROUS && !force_mutation)
```
Replacement in crawl-ref/source/monstuff.cc at line 470 [8.1396662]
B:BD[11.976] → [11.976:1002]
```
    if (mons_friendly(m))
```
[11.976]
[11.1002]
```
    if (mons_friendly(m)) // this includes enslaved monsters
```
Insertion in crawl-ref/source/monstuff.cc at line 688 [8.1396662]
[12.3608]
[12.3608]
```
            {
```
Insertion in crawl-ref/source/monstuff.cc at line 694 [8.1396662]
[12.3823]
[12.3823]
```
            }
```

Insertion in crawl-ref/source/monstuff.cc at line 733 [8.1396662]

[11.1704]

    else if (MON_KILL(killer) && monster->has_ench(ENCH_CHARM))
        killer = KILL_YOU_CONF; // Well, it was confused in a sense... (jpeg)

Replacement in crawl-ref/source/monstuff.cc at line 739 [8.1396662]
B:BD[13.158] → [13.158:201]
```
        if ( MONST_INTERESTING(monster) ||
```
[13.158]
[13.201]
```
        if ( MONST_INTERESTING(monster)
```

Replacement in crawl-ref/source/monstuff.cc at line 741 [8.1396662]

B:BD[13.232] → [13.232:338]

             monster->type == MONS_PLAYER_GHOST ||
             monster->type == MONS_PANDEMONIUM_DEMON )

[13.232]

[13.338]

             || monster->type == MONS_PLAYER_GHOST
             || monster->type == MONS_PANDEMONIUM_DEMON )

Replacement in crawl-ref/source/food.cc at line 745 [8.3043806]

B:BD[14.277] → [14.277:341]

static bool prompt_eat_chunk(const item_def &item, bool rotten)

[14.277]

[14.341]

static bool _player_can_eat_rotten_meat(bool need_msg = false)

Replacement in crawl-ref/source/food.cc at line 747 [8.3043806]

B:BD[14.343] → [10.30681:30739]

∅:D[15.3291] → [14.512:611]

∅:D[10.30739] → [14.512:611]

B:BD[14.512] → [14.512:611]

    if (rotten && !player_mutation_level(MUT_SAPROVOROUS)
        && !yesno("Are you sure you want to eat this rotten meat?",
                  false, 'n'))

[14.343]

[14.611]

    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH
        || player_mutation_level(MUT_SAPROVOROUS))

Replacement in crawl-ref/source/food.cc at line 750 [8.3043806]
B:BD[14.617] → [14.617:669]
```
        canned_msg(MSG_OK);
        return (false);
```
[14.617]
[14.669]
```
        return (true);
```

Replacement in crawl-ref/source/food.cc at line 752 [8.3043806]

B:BD[14.675] → [14.675:694]

    return (true);

[14.675]

[14.694]


    if (need_msg)
        mpr("You refuse to eat that rotten meat.");
    return (false);

Replacement in crawl-ref/source/food.cc at line 797 [8.3043806]

B:BD[16.425] → [17.6457:6502]

        if (!prompt_eat_chunk(food, rotten))

[16.425]

[16.747]

        if (rotten && !_player_can_eat_rotten_meat(true))

Replacement in crawl-ref/source/food.cc at line 844 [8.3043806]
∅:D[18.8885] → [17.7280:7325]
∅:D[3.10445] → [17.7280:7325]
B:BD[17.7280] → [17.7280:7325]
```
        if (!prompt_eat_chunk(food, rotten))
```
[3.10445]
[16.1102]
```
        if (!_player_can_eat_rotten_meat(true))
```
Replacement in crawl-ref/source/food.cc at line 864 [8.3043806]
B:BD[19.176] → [20.3640:3677]
```
    int vamp_undrainable_corpse = 0;
```
[19.176]
[20.3677]
```
    int unusable_corpse = 0;
```
Replacement in crawl-ref/source/food.cc at line 880 [8.3043806]
B:BD[20.3921] → [20.3921:3964]
```
                vamp_undrainable_corpse++;
```
[20.3921]
[20.3964]
```
                unusable_corpse++;
```

Insertion in crawl-ref/source/food.cc at line 884 [8.3043806]

[20.4014]

[8.3063397]

        else if (food_is_rotten(item) && !_player_can_eat_rotten_meat())
        {
            unusable_corpse++;
            continue;
        }

Replacement in crawl-ref/source/food.cc at line 911 [8.3043806]
B:BD[8.3064063] → [20.4120:4169]
```
    if (!found_valid && vamp_undrainable_corpse)
```
[8.3064063]
[20.4169]
```
    if (!found_valid && unusable_corpse)
```

Replacement in crawl-ref/source/food.cc at line 913 [8.3043806]

B:BD[20.4175] → [20.4175:4342]

        mprf("%s devoid of blood.",
             (vamp_undrainable_corpse == 1) ? "This corpse is"
                                            : "These corpses are");

[20.4175]

[20.4342]

        if (you.species == SP_VAMPIRE)
        {
            mprf("%s devoid of blood.",
                 (unusable_corpse == 1) ? "This corpse is"
                                        : "These corpses are");
        }
        else
            _player_can_eat_rotten_meat(true);

Replacement in crawl-ref/source/food.cc at line 1570 [8.3043806]

B:BD[8.3079220] → [8.3079220:3079288]

                || you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH)

[8.3079220]

[8.3079288]

            || you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH)

Replacement in crawl-ref/source/food.cc at line 1578 [8.3043806]
B:BD[21.502] → [22.5449:5493]
```
                || player_res_poison() > 0)
```
[21.502]
[8.3079540]
```
            || player_res_poison() > 0)
```

Replacement in crawl-ref/source/food.cc at line 1586 [8.3043806]

B:BD[15.5547] → [10.31343:31406]

                && player_mutation_level(MUT_SAPROVOROUS) < 3)

[15.5547]

[15.5601]

            && player_mutation_level(MUT_SAPROVOROUS) < 3)

Deletion in crawl-ref/source/debug.cc at line 2274 [8.4016436]
B:BD[23.5391] → [23.5391:5403]
```
    "paws",
```
Replacement in crawl-ref/source/debug.cc at line 2283 [8.4016436]
B:BD[24.5564] → [24.5564:5582]
```
    "sleepiness",
```
[24.5564]
[23.5439]
```
    "",
```
Insertion in crawl-ref/source/debug.cc at line 2286 [8.4016436]
[25.501]
[25.501]
```
    "",
```

* Remove "Really eat rotten meat?" prompt, and print a generic refusal

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/randart.cc at line 1790 [8.893152]

Deletion in crawl-ref/source/randart.cc at line 1820 [8.893152]

Insertion in crawl-ref/source/mutation.cc at line 1045 [8.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1049 [8.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1813 [8.1263003]

Replacement in crawl-ref/source/monstuff.cc at line 470 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 688 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 694 [8.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 733 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 739 [8.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 741 [8.1396662]

Replacement in crawl-ref/source/food.cc at line 745 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 747 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 750 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 752 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 797 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 844 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 864 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 880 [8.3043806]

Insertion in crawl-ref/source/food.cc at line 884 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 911 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 913 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 1570 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 1578 [8.3043806]

Replacement in crawl-ref/source/food.cc at line 1586 [8.3043806]

Deletion in crawl-ref/source/debug.cc at line 2274 [8.4016436]

Replacement in crawl-ref/source/debug.cc at line 2283 [8.4016436]

Insertion in crawl-ref/source/debug.cc at line 2286 [8.4016436]