fiddlerwoaroof/crawl - Change 6ECDSRJ6V3FSIAQC6FZK5SV4NGXXR6PW5S4KADSPISPP36CXLTYQC

Make vampires' spell (and ability) hunger dependent on their hunger state.

Thirsty: 75% Very thirsty: 50% Near Bloodless: 25% Bloodless: None

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

Created by j-p-e-g on May 8, 2008

6ECDSRJ6V3FSIAQC6FZK5SV4NGXXR6PW5S4KADSPISPP36CXLTYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 694 [6.293070]

B:BD[6.308081] → [7.2162:2212]

        const int spellh = spell_hunger( spell );

[6.308081]

[7.2212]

        const int spellh = calc_hunger( spell_hunger(spell) );

Replacement in crawl-ref/source/spl-cast.cc at line 2498 [6.293070]

B:BD[5.2303] → [5.2303:2366]

                    mgen_data(summon_any_demon(DEMON_LESSER),

[5.2303]

[5.2366]

                    mgen_data(summon_any_demon(DEMON_LESSER),

Replacement in crawl-ref/source/spl-cast.cc at line 2517 [6.293070]

B:BD[5.2477] → [5.2477:2533]

                        mgen_data(MONS_SPATIAL_VORTEX,

[5.2477]

[5.2533]

                        mgen_data(MONS_SPATIAL_VORTEX,

Replacement in crawl-ref/source/spl-cast.cc at line 2527 [6.293070]

B:BD[5.2672] → [5.2672:2735]

                    mgen_data(summon_any_demon(DEMON_COMMON),

[5.2672]

[5.2735]

                    mgen_data(summon_any_demon(DEMON_COMMON),

Replacement in crawl-ref/source/spl-cast.cc at line 2540 [6.293070]

B:BD[5.2868] → [5.2868:2927]

                mgen_data(summon_any_demon(DEMON_LESSER),

[5.2868]

[5.2927]

                mgen_data(summon_any_demon(DEMON_LESSER),

Replacement in crawl-ref/source/spl-cast.cc at line 2544 [6.293070]

B:BD[5.3020] → [5.3020:3079]

                mgen_data(summon_any_demon(DEMON_LESSER),

[5.3020]

[5.3079]

                mgen_data(summon_any_demon(DEMON_LESSER),

Replacement in crawl-ref/source/spl-cast.cc at line 2549 [6.293070]

B:BD[5.3176] → [5.3176:3239]

                    mgen_data(summon_any_demon(DEMON_LESSER),

[5.3176]

[5.3239]

                    mgen_data(summon_any_demon(DEMON_LESSER),

Replacement in crawl-ref/source/spl-cast.cc at line 2554 [6.293070]

B:BD[5.3353] → [5.3353:3416]

                    mgen_data(summon_any_demon(DEMON_LESSER),

[5.3353]

[5.3416]

                    mgen_data(summon_any_demon(DEMON_LESSER),

Insertion in crawl-ref/source/spl-book.cc at line 1510 [6.397614]
[8.1380]
[8.1380]
```
        food = calc_hunger(food);
```
Replacement in crawl-ref/source/spl-book.cc at line 1544 [6.397614]
B:BD[9.142180] → [8.1811:1842]
```
    make_hungry( food, true );
```
[9.142180]
[8.1843]
```
    make_hungry(food, true, true);
```
Deletion in crawl-ref/source/spells3.cc at line 330 [6.531613]
B:BD[6.539804] → [6.539804:539876]
```
    unsigned char loopy = 0;    // general purpose loop variable {dlb}
```

Insertion in crawl-ref/source/spells3.cc at line 378 [6.531613]

[6.540428]

[10.363]

            unsigned char loopy = 0;    // general purpose loop variable {dlb}

Deletion in crawl-ref/source/spells3.cc at line 390 [6.531613]
B:BD[6.540656] → [6.540656:540674]
```
                {
```
Deletion in crawl-ref/source/spells3.cc at line 392 [6.531613]
B:BD[6.540760] → [6.540760:540778]
```
                }
```

Replacement in crawl-ref/source/spells3.cc at line 446 [6.531613]

B:BD[5.6036] → [5.6036:6090]

                    mgen_data(MONS_SIMULACRUM_SMALL,

[5.6036]

[5.6090]

                    mgen_data(MONS_SIMULACRUM_SMALL,

Insertion in crawl-ref/source/player.h at line 141 [6.945993]
[6.950570]
[6.950570]
```
int calc_hunger(int food_cost);
```

Insertion in crawl-ref/source/player.cc at line 6004 [6.962854]

[11.2694]

}
// For semi-undead species (Vampire!) reduce food cost for spells and abilities
// to 75% (hungry), 50% (very hungry), 25% (near starving), or zero (starving).
int calc_hunger(int food_cost)
{
    if (you.is_undead == US_SEMI_UNDEAD && you.hunger_state < HS_SATIATED)
    {
        food_cost *= you.hunger_state;
        food_cost /= 4;
    }
    return (food_cost);

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

B:BD[4.2816] → [4.2816:2983]

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

[4.2816]

[12.55]

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

Replacement in crawl-ref/source/mutation.cc at line 1411 [6.1263003]
B:BD[10.3786] → [2.2554:2586]
```
    std::string column[11][7] =
```
[10.3786]
[10.3817]
```
    std::string column[12][7] =
```

Replacement in crawl-ref/source/mutation.cc at line 1435 [6.1263003]

B:BD[2.2812] → [2.2812:2922]

       {"Bat Form             ", "no         ", "no      ", "yes       ",  "yes      ", "yes      ", "yes  "}

[2.2812]

[10.5050]

       {"Bat Form             ", "no         ", "no      ", "yes       ",  "yes      ", "yes      ", "yes  "},
       {"Spell hunger         ", "full       ", "full    ", "full      ",  "reduced  ", "lowered  ", "none "}

Replacement in crawl-ref/source/mutation.cc at line 1464 [6.1263003]

B:BD[10.5502] → [2.2923:2985]

    for (int y = 0; y < 11; y++)      // lines   (properties)

[10.5502]

[10.5563]

    for (int y = 0; y < 12; y++)     // lines   (properties)

Deletion in crawl-ref/source/mutation.cc at line 1476 [6.1263003]

B:BD[10.5868] → [10.5868:6831]

/*
    result = "                     <lightgreen>Alive</lightgreen>      <green>Full</green>    Satiated  "
                                  "<yellow>Thirsty  Near...</yellow>  <lightred>Bloodless</lightred>" EOL
             "Metabolism           very fast  fast    fast      normal   slow     none " EOL
             "Regeneration         very fast  fast    normal    normal   slow     none " EOL
             "Poison resistance                        +         +        +        +   " EOL
             "Cold resistance                                    +        +        ++  " EOL
             "Negative resistance                                +        ++       +++ " EOL
             "Torment resistance                                                   +   " EOL
             "Mutation effects     full       capped  capped    none     none     none " EOL
             "Stealth boost        none       none    none      minor    major    large" EOL;
*/

Replacement in crawl-ref/source/it_use3.cc at line 476 [6.2870456]
B:BD[6.2881768] → [6.2881768:2881811]
```
                make_hungry( 100, false );
```
[6.2881768]
[6.2881811]
```
                make_hungry(100, false, true);
```

Replacement in crawl-ref/source/it_use3.cc at line 487 [6.2870456]

B:BD[6.2882536] → [13.3029:3074]

                    make_hungry(200, false);

[6.2882536]

[6.2883280]

                    make_hungry(200, false, true);

Replacement in crawl-ref/source/it_use3.cc at line 501 [6.2870456]
B:BD[6.2884251] → [6.2884251:2884293]
```
                make_hungry( 50, false );
```
[6.2884251]
[6.2884293]
```
                make_hungry(50, false, true);
```
Replacement in crawl-ref/source/it_use3.cc at line 523 [6.2870456]
B:BD[6.2885018] → [6.2885018:2885060]
```
                make_hungry( 50, false );
```
[6.2885018]
[6.2885060]
```
                make_hungry(50, false, true);
```
Replacement in crawl-ref/source/it_use3.cc at line 562 [6.2870456]
B:BD[6.2885957] → [6.2885957:2885999]
```
                make_hungry( 50, false );
```
[6.2885957]
[6.2885999]
```
                make_hungry(50, false, true);
```
Replacement in crawl-ref/source/it_use3.cc at line 704 [6.2870456]
B:BD[5.44997] → [5.44997:45002]
```
    
```
[5.44997]
[14.1356]

Replacement in crawl-ref/source/food.h at line 63 [6.3041914]

B:BD[6.3042869] → [6.3042869:3042926]

void make_hungry(int hunger_amount, bool suppress_msg);

[6.3042869]

[6.3042926]

void make_hungry(int hunger_amount, bool suppress_msg,
                 bool allow_reducing = false);

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

B:BD[6.3045423] → [6.3045423:3045480]

void make_hungry( int hunger_amount, bool suppress_msg )

[6.3045423]

[6.3045480]

void make_hungry( int hunger_amount, bool suppress_msg, bool allow_reducing )

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

[6.3045535]

[15.8116]

    if (allow_reducing)
        hunger_amount = calc_hunger(hunger_amount);

Replacement in crawl-ref/source/food.cc at line 1848 [6.3043806]
B:BD[16.3323] → [16.3323:3365]
```
    // vampires can never starve to death
```
[16.3323]
[16.3365]
```
    // Vampires can never starve to death.
```

Replacement in crawl-ref/source/abl-show.cc at line 935 [6.4494389]

B:BD[6.4508568] → [3.3395:3451]

    if (hungerCheck && you.hunger_state == HS_STARVING)

[6.4508568]

[6.4508621]

    if (hungerCheck && you.species != SP_VAMPIRE
        && you.hunger_state == HS_STARVING)

Replacement in crawl-ref/source/abl-show.cc at line 967 [6.4494389]
B:BD[17.3092] → [17.3092:3113]
```
    if (hungerCheck)
```
[17.3092]
[17.3113]
```
    if (hungerCheck && you.species != SP_VAMPIRE)
```

Replacement in crawl-ref/source/abl-show.cc at line 1871 [6.4494389]

B:BD[6.4530712] → [6.4530712:4530786]

    const int food_cost = abil.food_cost + random2avg(abil.food_cost, 2);

[6.4530573]

[18.1646]

    const int food_cost  = abil.food_cost + random2avg(abil.food_cost, 2);

Replacement in crawl-ref/source/abl-show.cc at line 1894 [6.4494389]
B:BD[6.4531376] → [6.4531376:4531417]
```
        make_hungry( food_cost, false );
```
[6.4531376]
[6.4531417]
```
        make_hungry( food_cost, false, true );
```

Make vampires' spell (and ability) hunger dependent on their hunger state.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 694 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2498 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2517 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2527 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2540 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2544 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2549 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2554 [6.293070]

Insertion in crawl-ref/source/spl-book.cc at line 1510 [6.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1544 [6.397614]

Deletion in crawl-ref/source/spells3.cc at line 330 [6.531613]

Insertion in crawl-ref/source/spells3.cc at line 378 [6.531613]

Deletion in crawl-ref/source/spells3.cc at line 390 [6.531613]

Deletion in crawl-ref/source/spells3.cc at line 392 [6.531613]

Replacement in crawl-ref/source/spells3.cc at line 446 [6.531613]

Insertion in crawl-ref/source/player.h at line 141 [6.945993]

Insertion in crawl-ref/source/player.cc at line 6004 [6.962854]

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

Replacement in crawl-ref/source/mutation.cc at line 1411 [6.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1435 [6.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1464 [6.1263003]

Deletion in crawl-ref/source/mutation.cc at line 1476 [6.1263003]

Replacement in crawl-ref/source/it_use3.cc at line 476 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 487 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 501 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 523 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 562 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 704 [6.2870456]

Replacement in crawl-ref/source/food.h at line 63 [6.3041914]

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

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

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

Replacement in crawl-ref/source/abl-show.cc at line 935 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 967 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1871 [6.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1894 [6.4494389]