fiddlerwoaroof/crawl - Change 2BKZYWSXQV43NJVTUHGC3ZPFU5KT3C6YKTXEDW3DR7MKQ4F4UOXQC

* Fix Sif Muna occasionally gifting manuals.

Change innate gourmand eating behaviour to MUT_GOURMAND (innate only).
Only bother prompting to eat chunks if the player has the gourmand mutation or the carnivorous mutation at level 3, or is wearing an amulet of the gourmand or an unidentified amulet.
Remove gourmand behaviour from Ogres, i.e. only Trolls get the mutation.

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

Created by j-p-e-g on February 22, 2009

2BKZYWSXQV43NJVTUHGC3ZPFU5KT3C6YKTXEDW3DR7MKQ4F4UOXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 1297 [7.962854]

B:BD[5.2728] → [5.2728:2805]

    return (you.omnivorous() || player_mutation_level(MUT_CARNIVOROUS) > 0);

[5.2728]

[5.2805]

    return (player_mutation_level(MUT_GOURMAND)
            || player_mutation_level(MUT_CARNIVOROUS) > 0);

Replacement in crawl-ref/source/player.cc at line 4405 [7.962854]
B:BD[7.1043084] → [8.2849:2871]
```
    switch ( amulet )
```
[7.1043084]
[7.1043284]
```
    switch (amulet)
```
Replacement in crawl-ref/source/player.cc at line 4428 [7.962854]
∅:D[2.2471] → [7.1043608:1043644]
∅:D[8.3502] → [7.1043608:1043644]
B:BD[7.1043608] → [7.1043608:1043644]
```
    if (you.equip[EQ_AMULET] == -1)
```
[2.2471]
[9.5073]
```
    if (!player_wearing_slot(EQ_AMULET))
```
Deletion in crawl-ref/source/player.cc at line 6888 [7.962854]
B:BD[10.4476] → [10.4476:4479]
B:BD[10.4479] → [11.181:271]
```
}
bool player::omnivorous() const
{
    return (species == SP_TROLL || species == SP_OGRE);
```
Insertion in crawl-ref/source/newgame.cc at line 2898 [7.1132300]
[12.13049]
[12.13049]
```
        you.mutation[MUT_GOURMAND]        = 1;
```
Replacement in crawl-ref/source/mutation.cc at line 279 [7.1263003]
∅:D[13.1806] → [7.1271494:1271569]
B:BD[7.1271494] → [7.1271494:1271569]
```
    {"Your wings are large and strong.", "", ""},       //jmf: dracos only
```
[7.1271494]
[7.1271569]
```
    {"Your wings are large and strong.", "", ""},   //jmf: dracos only
```
Insertion in crawl-ref/source/mutation.cc at line 295 [7.1263003]
[14.627]
[15.2239]
```
    {"You like to eat raw meat.", "", ""},
// 70
```
Deletion in crawl-ref/source/mutation.cc at line 302 [7.1263003]
B:BD[12.13349] → [3.2583:2589]
```
// 70
```

Replacement in crawl-ref/source/mutation.cc at line 559 [7.1263003]

B:BD[7.1281459] → [12.13350:13417]

    // saprovorous: can never be gained or lost, only started with

[7.1281459]

[7.1281477]

    // saprovorous/gourmand: can never be gained or lost, only started with
    {"", "", ""},

Insertion in crawl-ref/source/mutation.cc at line 563 [7.1263003]
[12.13419]
[15.2950]
```
// 70
```
Deletion in crawl-ref/source/mutation.cc at line 568 [7.1263003]
B:BD[15.3080] → [3.2625:2631]
```
// 70
```

Replacement in crawl-ref/source/mutation.cc at line 791 [7.1263003]

∅:D[12.13423] → [16.326:393]

B:BD[16.326] → [16.326:393]

    // saprovorous: can never be gained or lost, only started with

[12.13423]

[7.1289066]

    // saprovorous/gourmand: can never be gained or lost, only started with

Insertion in crawl-ref/source/mutation.cc at line 793 [7.1263003]
[7.1289084]
[14.742]
```
    {"", "", ""},
```
Insertion in crawl-ref/source/mutation.cc at line 795 [7.1263003]
[14.743]
[15.3404]
```
// 70
```
Deletion in crawl-ref/source/mutation.cc at line 800 [7.1263003]
B:BD[15.3520] → [3.2806:2812]
```
// 70
```
Insertion in crawl-ref/source/mutation.cc at line 953 [7.1263003]
[17.4339]
[12.17600]
```
// 65
```
Deletion in crawl-ref/source/mutation.cc at line 957 [7.1263003]
∅:D[18.2996] → [19.1687:1693]
∅:D[20.3117] → [19.1687:1693]
∅:D[13.3228] → [19.1687:1693]
∅:D[17.4401] → [19.1687:1693]
∅:D[12.17683] → [19.1687:1693]
B:BD[19.1687] → [19.1687:1693]
```
// 65
```
Replacement in crawl-ref/source/mutation.cc at line 961 [7.1263003]
B:BD[13.3356] → [12.17870:17911]
```
    // species-dependent innate mutation
```
[13.3356]
[12.17911]
```
    // species-dependent innate mutations
```
Insertion in crawl-ref/source/mutation.cc at line 963 [7.1263003]
[12.17972]
[21.2897]
```
    { MUT_GOURMAND,                   0,  1, false, false },
```
Insertion in crawl-ref/source/mutation.cc at line 965 [7.1263003]
[21.2898]
[17.4525]
```
// 70
```
Deletion in crawl-ref/source/mutation.cc at line 967 [7.1263003]
∅:D[17.4586] → [12.18034:18035]
B:BD[12.18034] → [12.18034:18035]
∅:D[12.18096] → [18.3003:3009]
B:BD[20.3483] → [18.3003:3009]
```
// 70
```
Replacement in crawl-ref/source/mutation.cc at line 969 [7.1263003]
B:BD[12.18219] → [12.18219:18280]
```
    { RANDOM_MUTATION,                0,  3, false, false },
```
[17.4648]
[12.18280]

Deletion in crawl-ref/source/mutation.cc at line 1357 [7.1263003]

B:BD[22.1302] → [23.2541:2760]


            // Gourmand is *not* identical to being saprovorous, therefore...
            if (i == MUT_SAPROVOROUS && you.omnivorous())
                result += "<lightblue>You like to eat raw meat.</lightblue>" EOL;

Replacement in crawl-ref/source/mutation.cc at line 1948 [7.1263003]

B:BD[7.1302809] → [24.2612:2712]

    // Saprovorous can't be randomly acquired.
    if (mutat == MUT_SAPROVOROUS && !force_mutation)

[7.1302809]

[25.18345]

    // Saprovorous/gourmand can't be randomly acquired.
    if (!force_mutation && (mutat == MUT_SAPROVOROUS || mutat == MUT_GOURMAND))

Insertion in crawl-ref/source/food.cc at line 1510 [7.3043806]

[4.3524]

[26.13713]


    // If we *know* player doesn't have the gourmand effect, don't prompt.
    if (!player_mutation_level(MUT_GOURMAND)
        && player_mutation_level(MUT_CARNIVOROUS) < 3)
    {
        if (!player_wearing_slot(EQ_AMULET))
            return (0);
        const item_def& amu(you.inv[you.equip[EQ_AMULET]]);
        if (item_type_known(amu) && amu.sub_type != AMU_THE_GOURMAND)
            return (0);
    }

Deletion in crawl-ref/source/externs.h at line 1104 [7.3270163]
B:BD[10.22319] → [11.6614:6644]
```
    bool omnivorous() const;
```

Replacement in crawl-ref/source/enum.h at line 2318 [7.3287960]

B:BD[11.6667] → [27.394:428]

B:BD[27.428] → [28.4799:4846]

    MUT_SHAGGY_FUR, // new in 0.4
    MUT_HIGH_MAGIC, // new in 0.4      --   70

[11.6667]

[28.4846]

    MUT_GOURMAND,
    MUT_SHAGGY_FUR, // new in 0.4      --   70
    MUT_HIGH_MAGIC, // new in 0.4

Replacement in crawl-ref/source/effects.cc at line 1434 [7.3382105]

B:BD[6.3270] → [6.3270:3329]

           agent == GOD_SIF_MUNA ? 10 : 40, book.sub_type,

[6.3270]

[6.3329]

           agent == GOD_SIF_MUNA ? 10 : 40, NUM_BOOKS, // normal books

Insertion in crawl-ref/source/effects.cc at line 1449 [7.3382105]
[29.4772]
[30.13860]
```
    case NUM_BOOKS:
```

* Fix Sif Muna occasionally gifting manuals.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 1297 [7.962854]

Replacement in crawl-ref/source/player.cc at line 4405 [7.962854]

Replacement in crawl-ref/source/player.cc at line 4428 [7.962854]

Deletion in crawl-ref/source/player.cc at line 6888 [7.962854]

Insertion in crawl-ref/source/newgame.cc at line 2898 [7.1132300]

Replacement in crawl-ref/source/mutation.cc at line 279 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 295 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 302 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 559 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 563 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 568 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 791 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 793 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 795 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 800 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 953 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 957 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 961 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 963 [7.1263003]

Insertion in crawl-ref/source/mutation.cc at line 965 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 967 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 969 [7.1263003]

Deletion in crawl-ref/source/mutation.cc at line 1357 [7.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1948 [7.1263003]

Insertion in crawl-ref/source/food.cc at line 1510 [7.3043806]

Deletion in crawl-ref/source/externs.h at line 1104 [7.3270163]

Replacement in crawl-ref/source/enum.h at line 2318 [7.3287960]

Replacement in crawl-ref/source/effects.cc at line 1434 [7.3382105]

Insertion in crawl-ref/source/effects.cc at line 1449 [7.3382105]