fiddlerwoaroof/crawl - Change SZBWGPMRMTTJLRF27R76TQZACRFNB4O5AI52P7YEJ7NWZNZWX6EQC

Clean up nutrition-related functions a bit, and handle non-vampires'

nutrition from blood potions more consistently.

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

Created by dolorous on February 8, 2009

SZBWGPMRMTTJLRF27R76TQZACRFNB4O5AI52P7YEJ7NWZNZWX6EQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.h at line 177 [5.945993]
[3.426]
[4.24251]
```
bool player_likes_chunks();
```
Replacement in crawl-ref/source/player.cc at line 415 [5.962854]
B:BD[5.965763] → [5.965763:965793]
```
bool player_is_swimming(void)
```
[5.965763]
[5.965793]
```
bool player_is_swimming()
```
Replacement in crawl-ref/source/player.cc at line 417 [5.962854]
B:BD[5.965795] → [6.2132:2159]
```
    return you.swimming();
```
[5.965795]
[6.2159]
```
    return (you.swimming());
```

Insertion in crawl-ref/source/player.cc at line 1292 [5.962854]

[7.344963]

[8.3597]

bool player_likes_chunks()
{
    return (you.omnivorous() || player_mutation_level(MUT_CARNIVOROUS) > 0);
}

Replacement in crawl-ref/source/player.cc at line 4423 [5.962854]
B:BD[9.3453] → [9.3453:3496]
```
    if ( extrinsic_amulet_effect(amulet) )
```
[9.3453]
[10.4982]
```
    if (extrinsic_amulet_effect(amulet))
```
Replacement in crawl-ref/source/it_use2.cc at line 83 [5.2904329]
B:BD[11.5039] → [11.5039:5057]
B:BD[11.5057] → [12.10360:10389]
```
  case POT_BLOOD:
  case POT_BLOOD_COAGULATED:
```
[11.5039]
[11.5057]
```
      case POT_BLOOD:
      case POT_BLOOD_COAGULATED:
```
Deletion in crawl-ref/source/it_use2.cc at line 88 [5.2904329]
B:BD[13.2838] → [13.2838:2839]
Replacement in crawl-ref/source/it_use2.cc at line 94 [5.2904329]
∅:D[13.2929] → [12.10473:10504]
B:BD[12.10473] → [12.10473:10504]
```
            else // coagulated
```
[13.2929]
[12.10504]
```
            else // Coagulated.
```

Replacement in crawl-ref/source/it_use2.cc at line 101 [5.2904329]

B:BD[11.5947] → [14.30056:30132]

            if (you.omnivorous() || player_mutation_level(MUT_CARNIVOROUS))

[11.5947]

[11.6014]

            const bool ur_herbivorous =
                player_mutation_level(MUT_HERBIVOROUS) == 3;
            int nutrition = apply_herbivore_nutrition_effects(200);
            if (!ur_herbivorous && player_likes_chunks())

Replacement in crawl-ref/source/it_use2.cc at line 110 [5.2904329]

B:BD[11.6104] → [11.6104:6146]

                lessen_hunger(200, true);

[11.6104]

[11.6146]

                lessen_hunger(nutrition, true);

Replacement in crawl-ref/source/it_use2.cc at line 115 [5.2904329]

B:BD[11.6247] → [14.30133:30214]

∅:D[14.30214] → [11.6319:6365]

B:BD[11.6319] → [11.6319:6365]

                if (!player_mutation_level(MUT_HERBIVOROUS) && one_chance_in(3))
                    lessen_hunger(100, true);

[11.6247]

[11.6365]

                if (!ur_herbivorous && one_chance_in(3))
                    lessen_hunger(nutrition, true);

Replacement in crawl-ref/source/it_use2.cc at line 119 [5.2904329]
∅:D[12.10587] → [11.6386:6443]
B:BD[11.6386] → [11.6386:6443]
```
                    disease_player( 50 + random2(100) );
```
[12.10587]
[12.10588]
```
                    disease_player(50 + random2(100));
```

Replacement in crawl-ref/source/it_use2.cc at line 133 [5.2904329]

B:BD[15.3307] → [15.3307:3371]

        const bool were_mighty = (you.duration[DUR_MIGHT] > 0);

[15.3307]

[14.30215]

        const bool were_mighty = you.duration[DUR_MIGHT] > 0;

Insertion in crawl-ref/source/food.h at line 105 [5.3041914]
[7.848845]
[16.427379]
```
int apply_herbivore_nutrition_effects(int nutrition);
```
Replacement in crawl-ref/source/food.cc at line 1681 [5.3043806]
B:BD[17.230] → [18.6277:6334]
```
static int _apply_herbivore_chunk_effects(int nutrition)
```
[17.230]
[17.286]
```
int apply_herbivore_nutrition_effects(int nutrition)
```

Insertion in crawl-ref/source/food.cc at line 1689 [5.3043806]

[17.443]

[7.854989]

}
static int _apply_gourmand_nutrition_effects(int nutrition, int gourmand)
{
    return (nutrition * (gourmand + GOURMAND_NUTRITION_BASE)
                      / (GOURMAND_MAX + GOURMAND_NUTRITION_BASE));

Replacement in crawl-ref/source/food.cc at line 1704 [5.3043806]

B:BD[18.6424] → [18.6424:6499]

                             : _apply_herbivore_chunk_effects(nutrition));

[18.6424]

[11.8907]

                             : apply_herbivore_nutrition_effects(nutrition));

Replacement in crawl-ref/source/food.cc at line 1708 [5.3043806]

∅:D[19.10497] → [11.8914:8988]

B:BD[7.855193] → [11.8914:8988]

        wearing_amulet(AMU_THE_GOURMAND)? you.duration[DUR_GOURMAND] : 0;

[19.10497]

[7.855290]

        wearing_amulet(AMU_THE_GOURMAND) ? you.duration[DUR_GOURMAND] : 0;

Replacement in crawl-ref/source/food.cc at line 1710 [5.3043806]

B:BD[7.855291] → [19.10498:10528]

∅:D[19.10528] → [11.8989:9114]

B:BD[7.855322] → [11.8989:9114]

    int effective_nutrition =
           nutrition * (gourmand + GOURMAND_NUTRITION_BASE)
                     / (GOURMAND_MAX + GOURMAND_NUTRITION_BASE);

[7.855291]

[19.10529]

    const int effective_nutrition =
        _apply_gourmand_nutrition_effects(nutrition, gourmand);

Replacement in crawl-ref/source/food.cc at line 1720 [5.3043806]

B:BD[7.855775] → [18.6500:6566]

    return (_apply_herbivore_chunk_effects(effective_nutrition));

[7.855775]

[7.855809]

    return (apply_herbivore_nutrition_effects(effective_nutrition));

Replacement in crawl-ref/source/food.cc at line 1733 [5.3043806]

B:BD[5.3064243] → [2.17973:18084]

    bool likes_chunks = (you.omnivorous()
                         || player_mutation_level(MUT_CARNIVOROUS));

[5.3064243]

[18.6817]

    bool likes_chunks = player_likes_chunks();

Insertion in crawl-ref/source/food.cc at line 2407 [5.3043806]
[20.16493]
[20.16493]
Insertion in crawl-ref/source/food.cc at line 2414 [5.3043806]
[20.16684]
[20.16684]

Replacement in crawl-ref/source/food.cc at line 2480 [5.3043806]

∅:D[21.8913] → [16.431200:431315]

∅:D[18.12500] → [16.431200:431315]

B:BD[5.3075935] → [16.431200:431315]

bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg, bool reqid,
                bool check_hunger)

[21.8913]

[5.3076010]

bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg,
                bool reqid, bool check_hunger)

Replacement in crawl-ref/source/food.cc at line 2517 [5.3043806]

B:BD[16.431695] → [14.31123:31196]

    bool ur_carnivorous = (player_mutation_level(MUT_CARNIVOROUS) == 3);

[16.431695]

[5.3076216]

    bool ur_carnivorous = player_mutation_level(MUT_CARNIVOROUS) == 3;

Replacement in crawl-ref/source/food.cc at line 2519 [5.3043806]

B:BD[5.3076217] → [14.31197:31270]

    bool ur_herbivorous = (player_mutation_level(MUT_HERBIVOROUS) == 3);

[5.3076217]

[5.3076280]

    bool ur_herbivorous = player_mutation_level(MUT_HERBIVOROUS) == 3;

Replacement in crawl-ref/source/food.cc at line 2523 [5.3043806]

B:BD[5.3076420] → [19.10568:10596]

B:BD[19.10596] → [22.3825:3896]

∅:D[22.3896] → [23.5439:5486]

B:BD[16.431865] → [23.5439:5486]

B:BD[23.5486] → [14.31271:31342]

    bool ur_chunkslover = (
                (check_hunger ? you.hunger_state < HS_SATIATED : true)
                           || you.omnivorous()
                           || player_mutation_level(MUT_CARNIVOROUS));

[5.3076420]

[5.3076818]

    bool ur_chunkslover = ((check_hunger ? you.hunger_state < HS_SATIATED
                                         : true)
                              || player_likes_chunks());

Replacement in crawl-ref/source/food.cc at line 2538 [5.3043806]

B:BD[19.10598] → [21.8921:8981]

        int vorous = _player_likes_food_type(kindof_thing);

[19.10598]

[21.8981]

        const int vorous = _player_likes_food_type(kindof_thing);

Replacement in crawl-ref/source/food.cc at line 2574 [5.3043806]

∅:D[24.9935] → [25.3253:3461]

B:BD[25.3253] → [25.3253:3461]

                        set_ident_flags( you.inv[ amulet], ISFLAG_KNOW_TYPE);
                        set_ident_type( OBJ_JEWELLERY, AMU_THE_GOURMAND,
                                        ID_KNOWN_TYPE );

[24.9935]

[25.3461]

                        set_ident_flags(you.inv[amulet], ISFLAG_KNOW_TYPE);
                        set_ident_type(OBJ_JEWELLERY, AMU_THE_GOURMAND,
                                       ID_KNOWN_TYPE);

Insertion in crawl-ref/source/food.cc at line 2581 [5.3043806]
[25.3616]
[5.3077867]

Clean up nutrition-related functions a bit, and handle non-vampires'

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/player.h at line 177 [5.945993]

Replacement in crawl-ref/source/player.cc at line 415 [5.962854]

Replacement in crawl-ref/source/player.cc at line 417 [5.962854]

Insertion in crawl-ref/source/player.cc at line 1292 [5.962854]

Replacement in crawl-ref/source/player.cc at line 4423 [5.962854]

Replacement in crawl-ref/source/it_use2.cc at line 83 [5.2904329]

Deletion in crawl-ref/source/it_use2.cc at line 88 [5.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 94 [5.2904329]