fiddlerwoaroof/crawl - Change 6VP5POU3VBKW3FUO3Q6QBPE6ZAFMDM5R6ULJRFKE3GCBGWFMEO4QC

Clean up gourmand-related routines: only check for gourmand duration

instead of checking for wearing the amulet and gourmand duration, account for gourmand (both the amulet and the mutation) in the output screen, and treat gourmand (both the amulet and the mutation) consistently with regard to potions of blood.

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

Created by dolorous on February 22, 2009

6VP5POU3VBKW3FUO3Q6QBPE6ZAFMDM5R6ULJRFKE3GCBGWFMEO4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.h at line 177 [6.945993]
B:BD[4.426] → [5.2612:2640]
```
bool player_likes_chunks();
```
[4.426]
[7.24251]
```
bool player_likes_chunks(bool permanently = false);
```
Replacement in crawl-ref/source/player.cc at line 1295 [6.962854]
B:BD[8.344963] → [5.2699:2726]
```
bool player_likes_chunks()
```
[8.344963]
[5.2726]
```
bool player_likes_chunks(bool permanently)
```

Replacement in crawl-ref/source/player.cc at line 1298 [6.962854]

B:BD[3.2661] → [3.2661:2721]

            || player_mutation_level(MUT_CARNIVOROUS) > 0);

[3.2661]

[5.2805]

            || player_mutation_level(MUT_CARNIVOROUS) > 0
            || (!permanently && you.duration[DUR_GOURMAND] > 0));

Replacement in crawl-ref/source/output.cc at line 2033 [6.1088282]

B:BD[9.58016] → [9.58016:58071]

    if ( wearing_amulet(AMU_THE_GOURMAND, calc_unid) )

[9.58016]

[9.58071]


    if (player_mutation_level(MUT_GOURMAND) || you.duration[DUR_GOURMAND] > 0)

Replacement in crawl-ref/source/food.cc at line 1512 [6.3043806]

B:BD[3.3606] → [3.3606:3942]

    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);
    }

[3.3606]

[10.13713]

    if (!player_likes_chunks(true))
        return (0);

Replacement in crawl-ref/source/food.cc at line 1569 [6.3043806]

B:BD[2.2990] → [2.2990:3064]

        && (Options.easy_eat_gourmand && wearing_amulet(AMU_THE_GOURMAND)

[2.2990]

[2.3064]

        && (Options.easy_eat_gourmand && you.duration[DUR_GOURMAND] > 0

Deletion in crawl-ref/source/food.cc at line 1713 [6.3043806]
∅:D[11.551] → [8.855166:855167]
∅:D[12.8913] → [8.855166:855167]
B:BD[8.855166] → [8.855166:855167]
B:BD[8.855167] → [13.10472:10497]
B:BD[13.10497] → [5.3954:4029]
```
    const int gourmand =
        wearing_amulet(AMU_THE_GOURMAND) ? you.duration[DUR_GOURMAND] : 0;
```
Insertion in crawl-ref/source/food.cc at line 1714 [6.3043806]
[8.855291]
[5.4030]
```
    const int gourmand = you.duration[DUR_GOURMAND];
```

Insertion in crawl-ref/source/food.cc at line 2482 [6.3043806]

[10.18953]

[14.8890]

    return (false);
}
static bool _check_amu_the_gourmand(bool reqid)
{
    if (wearing_amulet(AMU_THE_GOURMAND, !reqid))
    {
        const int amulet = you.equip[EQ_AMULET];
        ASSERT(amulet != -1);
        if (!item_type_known(you.inv[amulet]))
        {
            // For artefact amulets, this will tell you its name and
            // subtype.  Other properties may still be hidden.
            set_ident_flags(you.inv[amulet], ISFLAG_KNOW_TYPE);
            set_ident_type(OBJ_JEWELLERY, AMU_THE_GOURMAND, ID_KNOWN_TYPE);
            mpr(you.inv[amulet].name(DESC_INVENTORY, false).c_str());
        }
        return (true);
    }

Deletion in crawl-ref/source/food.cc at line 2590 [6.3043806]

B:BD[14.9316] → [14.9316:9367]

∅:D[14.9367] → [15.2987:3171]

B:BD[6.3077830] → [15.2987:3171]


                // Else, we're not hungry enough.
                if (wearing_amulet(AMU_THE_GOURMAND, !reqid))
                {
                    const int amulet = you.equip[EQ_AMULET];
                    ASSERT(amulet != -1);

Replacement in crawl-ref/source/food.cc at line 2591 [6.3043806]

B:BD[15.3172] → [15.3172:3253]

B:BD[15.3253] → [16.9780:9935]

B:BD[16.9935] → [5.4761:4964]

∅:D[5.4964] → [15.3461:3565]

B:BD[15.3461] → [15.3461:3565]

                    if (!item_type_known(you.inv[amulet]))
                    {
                        // For artefact amulets, this will tell you its name
                        // and subtype. Other properties may still be hidden.
                        set_ident_flags(you.inv[amulet], ISFLAG_KNOW_TYPE);
                        set_ident_type(OBJ_JEWELLERY, AMU_THE_GOURMAND,
                                       ID_KNOWN_TYPE);
                        mpr(you.inv[amulet].name(DESC_INVENTORY, false).c_str());
                    }

[15.3172]

[14.9368]

                if (_check_amu_the_gourmand(reqid))

Deletion in crawl-ref/source/food.cc at line 2593 [6.3043806]
∅:D[14.9403] → [15.3598:3616]
B:BD[15.3598] → [15.3598:3616]
```
                }
```
Insertion in crawl-ref/source/food.cc at line 2603 [6.3043806]
[14.9588]
[17.702]
Insertion in crawl-ref/source/food.cc at line 2655 [6.3043806]
[17.2222]
[18.39582]
```
                _check_amu_the_gourmand(reqid);
```

Replacement in crawl-ref/source/food.cc at line 2754 [6.3043806]

∅:D[19.6485] → [20.360:401]

B:BD[20.360] → [20.360:401]

B:BD[20.401] → [21.11313:11381]

    if (wearing_amulet(AMU_THE_GOURMAND)
        && x_chance_in_y(you.duration[DUR_GOURMAND], GOURMAND_MAX))

[19.6485]

[6.3081877]

    if (x_chance_in_y(you.duration[DUR_GOURMAND], GOURMAND_MAX))

Clean up gourmand-related routines: only check for gourmand duration

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.h at line 177 [6.945993]

Replacement in crawl-ref/source/player.cc at line 1295 [6.962854]

Replacement in crawl-ref/source/player.cc at line 1298 [6.962854]

Replacement in crawl-ref/source/output.cc at line 2033 [6.1088282]

Replacement in crawl-ref/source/food.cc at line 1512 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 1569 [6.3043806]

Deletion in crawl-ref/source/food.cc at line 1713 [6.3043806]

Insertion in crawl-ref/source/food.cc at line 1714 [6.3043806]

Insertion in crawl-ref/source/food.cc at line 2482 [6.3043806]

Deletion in crawl-ref/source/food.cc at line 2590 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 2591 [6.3043806]

Deletion in crawl-ref/source/food.cc at line 2593 [6.3043806]

Insertion in crawl-ref/source/food.cc at line 2603 [6.3043806]

Insertion in crawl-ref/source/food.cc at line 2655 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 2754 [6.3043806]