fiddlerwoaroof/crawl - Change KBTDCQ7GYBRPB346ZEOJ4OM2XHOHN6FJMVMTOJ42EDK5KJX7VLIAC

Applying patches 1792155 (quaffing from fountains)

and 1792110 (undead food handling).

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

Created by j-p-e-g on September 12, 2007

KBTDCQ7GYBRPB346ZEOJ4OM2XHOHN6FJMVMTOJ42EDK5KJX7VLIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 3080 [4.2781507]
B:BD[3.282] → [3.282:336]
```
    if (you.duration[DUR_LEVITATION] && !you.flies())
```
[3.282]
[3.336]
```
    if (you.flies() == FL_LEVITATE)
```
Deletion in crawl-ref/source/it_use2.cc at line 339 [4.2904329]
B:BD[5.15234] → [5.15234:15296]
```
            did_god_conduct(DID_DRINK_BLOOD, 1 + random2(3));
```
Insertion in crawl-ref/source/it_use2.cc at line 340 [4.2904329]
[5.15306]
[5.15306]
```
        did_god_conduct(DID_DRINK_BLOOD, 1 + random2(3));
```
Insertion in crawl-ref/source/food.cc at line 52 [4.3043806]
[4.3044878]
[4.3044937]
```
static void  ghoul_consume_flesh(int chunk_type);
```
Deletion in crawl-ref/source/food.cc at line 54 [4.3043806]
B:BD[4.3044999] → [4.3044999:3045049]
```
static void  ghoul_eat_flesh( int chunk_effect );
```

Replacement in crawl-ref/source/food.cc at line 56 [4.3043806]

B:BD[4.3045155] → [5.15336:15447]

bool vampire_consume_corpse(int mons_type, int mass,
                            int chunk_type, bool rotten);

[4.3045155]

static bool  vampire_consume_corpse(int mons_type, int mass,
                                    int chunk_type, bool rotten);
static void  heal_from_food(int hp_amt, int mp_amt, bool unrot,
                            bool restore_str);

Replacement in crawl-ref/source/food.cc at line 872 [4.3043806]
B:BD[4.3064476] → [4.3064476:3064517]
```
        ghoul_eat_flesh( chunk_effect );
```
[4.3064476]
[4.3064517]
```
        ghoul_consume_flesh(chunk_effect);
```
Replacement in crawl-ref/source/food.cc at line 926 [4.3043806]
B:BD[4.3065857] → [4.3065857:3065905]
```
static void ghoul_eat_flesh( int chunk_effect )
```
[4.3065857]
[4.3065905]
```
static void ghoul_consume_flesh(int chunk_type)
```
Replacement in crawl-ref/source/food.cc at line 928 [4.3043806]
B:BD[4.3065907] → [4.3065907:3065932]
```
    bool healed = false;
```
[4.3065907]
[4.3065932]
```
    int hp_amt = 1 + random2(5) + random2(1 + you.experience_level);
```

Replacement in crawl-ref/source/food.cc at line 930 [4.3043806]

B:BD[4.3065933] → [4.3065933:3066003]

    if (chunk_effect != CE_ROTTEN && chunk_effect != CE_CONTAMINATED)

[4.3065933]

[4.3066003]

    if (chunk_type != CE_ROTTEN && chunk_type != CE_CONTAMINATED)

Replacement in crawl-ref/source/food.cc at line 934 [4.3043806]

B:BD[4.3066054] → [4.3066054:3066253]

        if (!one_chance_in(5))
            healed = true;
        if (player_rotted() && !one_chance_in(3))
        {
            mpr("You feel more resilient.");
            unrot_hp(1);
        }

[4.3066054]

[4.3066253]

        heal_from_food((!one_chance_in(5)) ? hp_amt : 0, 0,
            !one_chance_in(3), false);

Replacement in crawl-ref/source/food.cc at line 939 [4.3043806]

B:BD[4.3066274] → [4.3066274:3066626]

        if (chunk_effect == CE_ROTTEN)
            mpr( "This rotting flesh tastes delicious!" );
        else // CE_CONTAMINATED
            mpr( "This flesh tastes delicious!" );
        healed = true;
        if (player_rotted() && !one_chance_in(4))
        {
            mpr("You feel more resilient.");
            unrot_hp(1);
        }
    }

[4.3066274]

[4.3066626]

        if (chunk_type == CE_ROTTEN)
            mpr("This rotting flesh tastes delicious!");
        else // CE_CONTAMINATED or CE_HCL
            mpr("This flesh tastes delicious!");

Replacement in crawl-ref/source/food.cc at line 944 [4.3043806]

B:BD[4.3066627] → [4.3066627:3066801]

    if (you.strength < you.max_strength && one_chance_in(5))
    {
        mpr("You feel your strength returning.");
        you.strength++;
        you.redraw_strength = 1;

[4.3066627]

[4.3066801]

        heal_from_food(hp_amt, 0,
            !one_chance_in(4), one_chance_in(5));

Replacement in crawl-ref/source/food.cc at line 947 [4.3043806]

B:BD[4.3066807] → [4.3066807:3066938]


    if (healed && you.hp < you.hp_max)
        inc_hp(1 + random2(5) + random2(1 + you.experience_level), false);
    calc_hp();

[4.3066807]

[4.3066938]

} // end ghoul_consume_flesh()

Deletion in crawl-ref/source/food.cc at line 949 [4.3043806]
B:BD[4.3066939] → [4.3066939:3067009]
```
    return;
}                               // end ghoul_eat_flesh()
```

Replacement in crawl-ref/source/food.cc at line 1514 [4.3043806]

B:BD[5.18783] → [5.18783:18836]

B:BD[5.18836] → [6.815:872]

bool vampire_consume_corpse(int mons_type, int mass,
                            int chunk_type, bool rotten)

[5.18783]

[6.872]

static bool vampire_consume_corpse(int mons_type, int mass,
                                   int chunk_type, bool rotten)

Deletion in crawl-ref/source/food.cc at line 1517 [4.3043806]
∅:D[6.874] → [5.18895:18920]
B:BD[5.18895] → [5.18895:18920]
```
    int food_value = 0;
```
Replacement in crawl-ref/source/food.cc at line 1522 [4.3043806]
B:BD[5.19030] → [6.912:934]
```
    else if (!rotten)
```
[5.19030]
[6.934]
```
    int food_value = 0, hp_amt = 0, mp_amt = 0;
    if (!rotten)
```
Replacement in crawl-ref/source/food.cc at line 1527 [4.3043806]
∅:D[6.940] → [5.19054:19080]
B:BD[5.19054] → [5.19054:19080]
```
        inc_hp(1, false);
```
[6.940]
[5.19080]
```
        hp_amt++;
```

Replacement in crawl-ref/source/food.cc at line 1534 [4.3043806]

B:BD[2.947] → [2.947:1016]

               inc_hp(1 + random2(1 + you.experience_level), false);

[2.947]

[2.1016]

               hp_amt += 1 + random2(1 + you.experience_level);

Replacement in crawl-ref/source/food.cc at line 1540 [4.3043806]

B:BD[2.1211] → [2.1211:1257]

               inc_mp(1 + random2(3), false);

[2.1211]

[2.1257]

               mp_amt += 1 + random2(3);

Insertion in crawl-ref/source/food.cc at line 1579 [4.3043806]

[5.20034]


    heal_from_food(hp_amt, mp_amt,
        !rotten && one_chance_in(4), one_chance_in(3));

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

B:BD[5.20113] → [5.20113:20169]

    if (player_rotted() && !rotten && one_chance_in(4))

[5.20113]

[5.20169]

//    start_delay( DELAY_EAT, 3 );
    start_delay( DELAY_EAT, 1 + mass/300 );
    return true;
} // end vampire_consume_corpse()
static void heal_from_food(int hp_amt, int mp_amt, bool unrot,
                           bool restore_str)
{
    if (hp_amt > 0)
        inc_hp(hp_amt, false);
    if (mp_amt > 0)
        inc_mp(mp_amt, false);
    if (unrot && player_rotted())

Replacement in crawl-ref/source/food.cc at line 1606 [4.3043806]

B:BD[5.20244] → [5.20244:20305]

    if (you.strength < you.max_strength && one_chance_in(3))

[5.20244]

[5.20305]

    if (restore_str && you.strength < you.max_strength)

Replacement in crawl-ref/source/food.cc at line 1610 [4.3043806]
B:BD[5.20385] → [5.20385:20418]
```
        you.redraw_strength = 1;
```
[5.20385]
[5.20418]
```
        you.redraw_strength = true;
```

Replacement in crawl-ref/source/food.cc at line 1613 [4.3043806]

B:BD[5.20425] → [5.20425:20555]

//    start_delay( DELAY_EAT, 3 );
    start_delay( DELAY_EAT, 1 + mass/300 );
    return true;
} // end vampire_consume_corpse()

[5.20425]

    calc_hp();
    calc_mp();
} // end heal_from_food()

Applying patches 1792155 (quaffing from fountains)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/item_use.cc at line 3080 [4.2781507]

Deletion in crawl-ref/source/it_use2.cc at line 339 [4.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 340 [4.2904329]

Insertion in crawl-ref/source/food.cc at line 52 [4.3043806]

Deletion in crawl-ref/source/food.cc at line 54 [4.3043806]

Replacement in crawl-ref/source/food.cc at line 56 [4.3043806]

Replacement in crawl-ref/source/food.cc at line 872 [4.3043806]

Replacement in crawl-ref/source/food.cc at line 926 [4.3043806]

Replacement in crawl-ref/source/food.cc at line 928 [4.3043806]