fiddlerwoaroof/crawl - Change EY6KXNVGJ5OWJQWBE3W5E4T625XZXUNJMXIEQLCZUAJASUK4KHMQC

Clean up "Sublimation of Blood" and "Death Channel".

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

Created by dolorous on June 8, 2008

EY6KXNVGJ5OWJQWBE3W5E4T625XZXUNJMXIEQLCZUAJASUK4KHMQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1546 [5.293070]

[4.310]

        break;
    case SPELL_SUBLIMATION_OF_BLOOD:
        cast_sublimation_of_blood(powc);

Insertion in crawl-ref/source/spl-cast.cc at line 1554 [5.293070]

[4.379]

[5.328176]

        break;
    case SPELL_DEATH_CHANNEL:
        cast_death_channel(powc);

Deletion in crawl-ref/source/spl-cast.cc at line 1618 [5.293070]
∅:D[6.3372] → [5.330449:330529]
B:BD[5.330449] → [5.330449:330529]
```
        break;
    case SPELL_SUBLIMATION_OF_BLOOD:
        sublimation(powc);
```
Deletion in crawl-ref/source/spl-cast.cc at line 1811 [5.293070]
B:BD[5.336200] → [5.336200:336280]
```
        break;
    case SPELL_DEATH_CHANNEL:
        cast_death_channel(powc);
```

Deletion in crawl-ref/source/spells3.h at line 40 [5.526814]

∅:D[7.813] → [5.527824:528074]

∅:D[8.3746] → [5.527824:528074]

∅:D[9.146295] → [5.527824:528074]

B:BD[5.527824] → [5.527824:528074]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell - spells1
 * *********************************************************************** */
bool cast_death_channel(int power);

Replacement in crawl-ref/source/spells3.h at line 113 [5.526814]
B:BD[5.530712] → [5.530712:530741]
```
void sublimation(int power);
```
[5.530712]
[5.530741]
```
bool cast_sublimation_of_blood(int pow);
```

Insertion in crawl-ref/source/spells3.h at line 121 [5.526814]

[4.434]

[5.530970]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell - spells1
 * *********************************************************************** */
bool cast_death_channel(int pow);

Replacement in crawl-ref/source/spells3.cc at line 331 [5.531613]
B:BD[5.539774] → [5.539774:539802]
```
void sublimation(int power)
```
[5.539774]
[5.539802]
```
bool cast_sublimation_of_blood(int pow)
```
Insertion in crawl-ref/source/spells3.cc at line 333 [5.531613]
[5.539804]
[10.329]
```
    bool success = false;
```
Insertion in crawl-ref/source/spells3.cc at line 336 [5.531613]
[10.369]
[10.369]
Insertion in crawl-ref/source/spells3.cc at line 343 [5.531613]
[10.588]
[10.588]

Replacement in crawl-ref/source/spells3.cc at line 346 [5.531613]

B:BD[10.657] → [10.657:702]

            inc_mp( 7 + random2(7), false );

[10.657]

[10.702]

            inc_mp(7 + random2(7), false);

Replacement in crawl-ref/source/spells3.cc at line 348 [5.531613]

B:BD[10.703] → [10.703:752]

            dec_inv_item_quantity( wielded, 1 );

[10.703]

[10.752]

            dec_inv_item_quantity(wielded, 1);

Replacement in crawl-ref/source/spells3.cc at line 353 [5.531613]

B:BD[10.950] → [10.950:1101]

                 you.inv[wielded].quantity == 1 ? "the flask you are holding"
                                                : "one of your flasks");

[10.950]

[11.167]

                 you.inv[wielded].quantity > 1 ? "one of your flasks"
                                               : "the flask you are holding");

Replacement in crawl-ref/source/spells3.cc at line 356 [5.531613]

B:BD[11.168] → [11.168:227]

            split_potions_into_decay( wielded, 1, false );

[11.168]

[10.1159]

            mpr("A flood of magical energy pours into your mind!");

Replacement in crawl-ref/source/spells3.cc at line 358 [5.531613]

B:BD[10.1160] → [10.1160:1273]

            mpr("A flood of magical energy pours into your mind!");
            inc_mp( 7 + random2(7), false );

[10.1160]

[10.1273]

            inc_mp(7 + random2(7), false);
            split_potions_into_decay(wielded, 1, false);

Replacement in crawl-ref/source/spells3.cc at line 362 [5.531613]
B:BD[10.1283] → [10.1283:1327]
```
        else // no appropriate item wielded
```
[10.1283]
[10.1327]
```
        else
```
Replacement in crawl-ref/source/spells3.cc at line 378 [5.531613]
∅:D[12.362] → [5.540206:540256]
B:BD[5.540206] → [5.540206:540256]
```
        else if (!enough_hp( 2, true ))
        {
```
[12.362]
[5.540256]
```
        else if (!enough_hp(2, true))
```
Deletion in crawl-ref/source/spells3.cc at line 380 [5.531613]
B:BD[5.540330] → [5.540330:540340]
```
        }
```
Insertion in crawl-ref/source/spells3.cc at line 382 [5.531613]
[5.540363]
[5.540363]
```
            // For vampires.
            int food = 0;
```
Deletion in crawl-ref/source/spells3.cc at line 387 [5.531613]
B:BD[5.540428] → [13.729:808]
∅:D[13.808] → [12.363:405]
B:BD[5.540428] → [12.363:405]
```
            unsigned char loopy = 0;    // general purpose loop variable {dlb}
            int food = 0; // for Vampires
```
Insertion in crawl-ref/source/spells3.cc at line 390 [5.531613]
[5.540516]
[5.540516]
```
                success = true;
```

Replacement in crawl-ref/source/spells3.cc at line 398 [5.531613]

B:BD[5.540585] → [5.540585:540656]

B:BD[5.540674] → [5.540674:540718]

                for (loopy = 0; loopy < (you.hp > 1 ? 3 : 0); loopy++)
                    if (random2(power) < 6)

[5.540585]

[5.540718]

                for (int loopy = 0; loopy < (you.hp > 1 ? 3 : 0); ++loopy)
                {
                    if (random2(pow) < 6)

Insertion in crawl-ref/source/spells3.cc at line 402 [5.531613]
[5.540760]
[5.540778]
```
                }
```
Replacement in crawl-ref/source/spells3.cc at line 404 [5.531613]
B:BD[5.540779] → [5.540779:540819]
```
                if (random2(power) < 6)
```
[5.540779]
[5.540819]
```
                if (random2(pow) < 6)
```
Insertion in crawl-ref/source/spells3.cc at line 407 [5.531613]
[5.540860]
[12.640]
Replacement in crawl-ref/source/spells3.cc at line 412 [5.531613]
B:BD[5.541132] → [5.541132:541197]
```
    return;
}                               // end sublimation()
```
[5.541132]
[5.541197]
```
    return (success);
}
```

Insertion in crawl-ref/source/spells3.cc at line 480 [5.531613]

[14.1597]

[5.545274]


bool cast_death_channel(int pow)
{
    bool success = false;
    if (you.duration[DUR_DEATH_CHANNEL] < 30)
    {
        mpr("Malign forces permeate your being, awaiting release.");
        you.duration[DUR_DEATH_CHANNEL] += 15 + random2(1 + (pow / 3));

Insertion in crawl-ref/source/spells3.cc at line 491 [5.531613]

[5.545275]

[3.188]

        if (you.duration[DUR_DEATH_CHANNEL] > 100)
            you.duration[DUR_DEATH_CHANNEL] = 100;
        success = true;
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}

Deletion in crawl-ref/source/spells3.cc at line 1236 [5.531613]

∅:D[2.1852] → [5.562290:562830]

B:BD[5.562290] → [5.562290:562830]


bool cast_death_channel(int power)
{
    bool success = false;
    if (you.duration[DUR_DEATH_CHANNEL] < 30)
    {
        mpr("Malign forces permeate your being, awaiting release.");
        you.duration[DUR_DEATH_CHANNEL] += 15 + random2(1 + (power / 3));
        if (you.duration[DUR_DEATH_CHANNEL] > 100)
            you.duration[DUR_DEATH_CHANNEL] = 100;
        success = true;
    }
    else
    {
        canned_msg(MSG_NOTHING_HAPPENS);
    }
    return (success);
}                               // end cast_death_channel()

Clean up "Sublimation of Blood" and "Death Channel".

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1546 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1554 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1618 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1811 [5.293070]

Deletion in crawl-ref/source/spells3.h at line 40 [5.526814]

Replacement in crawl-ref/source/spells3.h at line 113 [5.526814]

Insertion in crawl-ref/source/spells3.h at line 121 [5.526814]

Replacement in crawl-ref/source/spells3.cc at line 331 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 333 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 336 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 343 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 346 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 348 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 353 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 356 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 358 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 362 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 378 [5.531613]

Deletion in crawl-ref/source/spells3.cc at line 380 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 382 [5.531613]

Deletion in crawl-ref/source/spells3.cc at line 387 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 390 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 398 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 402 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 404 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 407 [5.531613]

Replacement in crawl-ref/source/spells3.cc at line 412 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 480 [5.531613]

Insertion in crawl-ref/source/spells3.cc at line 491 [5.531613]

Deletion in crawl-ref/source/spells3.cc at line 1236 [5.531613]