fiddlerwoaroof/crawl - Change H2ERUJYERUFJSBNYFGH25XGXJR2IJXDGKHI5TCYGOH4U4T6SPNLQC

Add miscellaneous minor fixes.

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

Created by dolorous on March 14, 2009

H2ERUJYERUFJSBNYFGH25XGXJR2IJXDGKHI5TCYGOH4U4T6SPNLQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.h at line 31 [5.434549]
∅:D[4.1006] → [5.435240:435282]
B:BD[5.435240] → [5.435240:435282]
```
void cast_fulsome_distillation(int powc);
```
[4.1006]
[5.435282]
```
void cast_fulsome_distillation(int pow);
```
Replacement in crawl-ref/source/spells4.cc at line 1013 [5.436250]
B:BD[5.486247] → [5.486247:486289]
```
    UNUSED( pow );
    UNUSED( garbage );
```
[5.486247]
[5.486289]
```
    UNUSED(pow);
    UNUSED(garbage);
```
Replacement in crawl-ref/source/spells4.cc at line 1183 [5.436250]
B:BD[5.491753] → [6.430:466]
```
        exercise( SK_THROWING, 1 );
```
[5.491753]
[5.491789]
```
        exercise(SK_THROWING, 1);
```
Replacement in crawl-ref/source/spells4.cc at line 1194 [5.436250]
B:BD[7.209] → [8.5612:5653]
```
    dec_inv_item_quantity( pot_idx, 1 );
```
[7.209]
[5.491898]
```
    dec_inv_item_quantity(pot_idx, 1);
```

Replacement in crawl-ref/source/spells4.cc at line 1204 [5.436250]

∅:D[9.521] → [5.492277:492392]

B:BD[5.492277] → [5.492277:492392]

// using up the corpse might also lead to game balance problems. -- bwr
void cast_fulsome_distillation( int powc )

[9.521]

[5.492392]

// using up the corpse might also lead to game balance problems. - bwr
void cast_fulsome_distillation(int pow)

Replacement in crawl-ref/source/spells4.cc at line 1207 [5.436250]
B:BD[5.492431] → [5.492431:492469]
```
    if (powc > 50)
        powc = 50;
```
[5.492394]
[5.492469]
```
    pow = std::min(50, pow);
```

Replacement in crawl-ref/source/spells4.cc at line 1216 [5.436250]

B:BD[5.493056] → [10.1061:1129]

B:BD[10.1129] → [11.585:643]

            snprintf( info, INFO_SIZE, "Distill a potion from %s?",
                      si->name(DESC_NOCAP_THE).c_str() );

[5.493056]

[5.493196]

            snprintf(info, INFO_SIZE, "Distill a potion from %s?",
                     si->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells4.cc at line 1219 [5.436250]
B:BD[5.493197] → [12.191364:191411]
```
            if (yesno( info, true, 0, false ))
```
[5.493197]
[5.493241]
```
            if (yesno(info, true, 0, false))
```
Replacement in crawl-ref/source/spells4.cc at line 1234 [5.436250]
∅:D[13.514] → [5.493489:493566]
∅:D[14.2061] → [5.493489:493566]
B:BD[5.493489] → [5.493489:493566]
```
    const bool big_monster = (mons_type_hit_dice( mitm[corpse].plus ) >= 5);
```
[14.2061]
[14.2062]
```
    const bool big_monster = (mons_type_hit_dice(mitm[corpse].plus) >= 5);
```

Replacement in crawl-ref/source/spells4.cc at line 1266 [5.436250]

B:BD[5.494656] → [15.143957:144014]

        switch (mons_corpse_effect( mitm[corpse].plus ))

[5.494656]

[5.494713]

        switch (mons_corpse_effect(mitm[corpse].plus))

Replacement in crawl-ref/source/spells4.cc at line 1300 [5.436250]
∅:D[16.2906] → [5.495674:495716]
B:BD[5.495674] → [5.495674:495716]
```
    if (random2(50) > powc + 10 * rotten)
```
[16.2906]
[5.495716]
```
    if (random2(50) > pow + 10 * rotten)
```
Replacement in crawl-ref/source/spells4.cc at line 1335 [5.436250]
∅:D[17.1068] → [5.496484:496542]
B:BD[5.496484] → [5.496484:496542]
```
    item_colour( mitm[corpse] );  // sets special as well
```
[17.1068]
[5.496542]
```
    item_colour(mitm[corpse]); // sets special as well
```

Replacement in crawl-ref/source/spells4.cc at line 1341 [5.436250]

∅:D[16.3196] → [5.496762:496809]

B:BD[5.496762] → [5.496762:496809]

B:BD[5.496815] → [5.496815:496878]

    if (move_item_to_player( corpse, 1 ) != 1)
        mpr( "Unfortunately, you can't carry it right now!" );

[16.3196]

[5.501322]

    if (move_item_to_player(corpse, 1) != 1)
        mpr("Unfortunately, you can't carry it right now!");

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

[5.538864]

    if (!you.weapon() || you.weapon()->base_type != OBJ_CORPSES)
    {
        canned_msg(MSG_SPELL_FIZZLES);
        return (false);
    }

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

B:BD[5.538937] → [18.1936:2001]

B:BD[5.539057] → [5.539057:539096]

B:BD[5.539102] → [18.2002:2058]

∅:D[18.2058] → [5.539174:539239]

B:BD[5.539174] → [5.539174:539239]

    if (!you.weapon() || you.weapon()->base_type != OBJ_CORPSES)
        canned_msg(MSG_SPELL_FIZZLES);
    else if (you.weapon()->sub_type != CORPSE_SKELETON)
        mpr("The corpse collapses into a mass of pulpy flesh.");

[5.538937]

[15.147214]

    if (you.weapon()->sub_type != CORPSE_SKELETON)
    {
        mpr("The corpse collapses into a pulpy mess.");
        dec_inv_item_quantity(you.equip[EQ_WEAPON], 1);
    }

Replacement in crawl-ref/source/spells3.cc at line 305 [5.531613]
B:BD[5.539418] → [18.2059:2111]
```
        power += mons_weight( you.weapon()->plus );
```
[5.539418]
[5.539486]
```
        power += mons_weight(you.weapon()->plus);
```

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

B:BD[5.539556] → [5.539556:539614]

        dec_inv_item_quantity( you.equip[EQ_WEAPON], 1 );

[5.539556]

[5.539614]

        dec_inv_item_quantity(you.equip[EQ_WEAPON], 1);

Replacement in crawl-ref/source/enum.h at line 695 [5.3287960]

B:BD[19.7032] → [20.6122:6159]

B:BD[20.6159] → [21.6409:6446]

    DID_KILL_NATURAL_EVIL,    // TSO
    DID_KILL_CHAOTIC,         // Zin

[19.7032]

[19.7072]

    DID_KILL_NATURAL_EVIL,              // TSO
    DID_KILL_CHAOTIC,                   // Zin

Replacement in crawl-ref/source/enum.h at line 718 [5.3287960]

B:BD[15.909232] → [22.6064:6175]

B:BD[22.6175] → [2.33485:33551]

∅:D[2.33551] → [23.2992:3031]

B:BD[22.6175] → [23.2992:3031]

    DID_EAT_SOULED_BEING,     // Zin
    DID_DELIBERATE_MUTATING,  // Zin
    DID_CAUSE_GLOWING,        // Zin
    DID_CHAOS,                // Zin (used weapon/magic of chaos)
    DID_DESTROY_ORCISH_IDOL,  // Beogh

[15.909232]

[24.2619]

    DID_EAT_SOULED_BEING,               // Zin
    DID_DELIBERATE_MUTATING,            // Zin
    DID_CAUSE_GLOWING,                  // Zin
    DID_CHAOS,                          // Zin (used weapon/magic of chaos)
    DID_DESTROY_ORCISH_IDOL,            // Beogh

Replacement in crawl-ref/source/delay.cc at line 1164 [5.3963459]
B:BD[25.1372] → [25.1372:1422]
```
        const item_def &item = mitm[delay.parm1];
```
[25.1372]
[25.1422]
```
        item_def &item = mitm[delay.parm1];
```

Replacement in crawl-ref/source/delay.cc at line 1186 [5.3963459]

B:BD[26.3054] → [26.3054:3109]

B:BD[26.3109] → [3.2910:2978]

∅:D[3.2978] → [27.3288:3361]

B:BD[27.3288] → [27.3288:3361]

                item_def &corpse = mitm[delay.parm1];
                if (mons_skeleton(corpse.plus) && one_chance_in(3))
                    turn_corpse_into_skeleton_and_blood_potions(corpse);

[26.3054]

[27.3361]

                if (mons_skeleton(item.plus) && one_chance_in(3))
                    turn_corpse_into_skeleton_and_blood_potions(item);

Replacement in crawl-ref/source/delay.cc at line 1189 [5.3963459]

B:BD[27.3382] → [27.3382:3442]

                    turn_corpse_into_blood_potions(corpse);

[27.3382]

[28.16526]

                    turn_corpse_into_blood_potions(item);

Replacement in crawl-ref/source/delay.cc at line 1222 [5.3963459]

B:BD[29.3843] → [26.3166:3221]

B:BD[26.3221] → [3.2979:3047]

∅:D[3.3047] → [30.4158:4224]

B:BD[30.4158] → [30.4158:4224]

                item_def &corpse = mitm[delay.parm1];
                if (mons_skeleton(corpse.plus) && one_chance_in(3))
                    turn_corpse_into_skeleton_and_chunks(corpse);

[29.3843]

[30.4224]

                if (mons_skeleton(item.plus) && one_chance_in(3))
                    turn_corpse_into_skeleton_and_chunks(item);

Replacement in crawl-ref/source/delay.cc at line 1225 [5.3963459]

B:BD[30.4245] → [30.4245:4298]

                    turn_corpse_into_chunks(corpse);

[30.4245]

[15.1006146]

                    turn_corpse_into_chunks(item);

Add miscellaneous minor fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells4.h at line 31 [5.434549]

Replacement in crawl-ref/source/spells4.cc at line 1013 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1183 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1194 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1204 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1207 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1216 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1219 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 1234 [5.436250]