fiddlerwoaroof/crawl - Change DL4ZORRUZ3X4OCAGW5GVSIXLNK72KFHQOVA5QXU5QHT4YPRLFS2QC

Clean up "Twisted Resurrection" some more.

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

Created by dolorous on June 8, 2008

DL4ZORRUZ3X4OCAGW5GVSIXLNK72KFHQOVA5QXU5QHT4YPRLFS2QC

Dependencies

In channels

main

Change contents

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

[2.243]

[4.161]

        break;
    case SPELL_TWISTED_RESURRECTION:
        cast_twisted_resurrection(powc);

Deletion in crawl-ref/source/spl-cast.cc at line 1589 [5.293070]
∅:D[6.3120] → [5.329316:329331]
B:BD[5.329316] → [5.329316:329331]
B:BD[5.329371] → [5.329371:329372]
B:BD[5.329602] → [5.329602:329639]
B:BD[5.329639] → [3.161:202]
```
        break;
    case SPELL_TWISTED_RESURRECTION:
        cast_twisted_resurrection(powc);
```
Insertion in crawl-ref/source/spells3.h at line 119 [5.526814]
[2.300]
[7.682]
```
bool cast_twisted_resurrection(int pow, bool god_gift = false);
```

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

[2.720]


bool cast_twisted_resurrection(int pow, bool god_gift)
{
    if (igrd[you.x_pos][you.y_pos] == NON_ITEM)
    {
        mpr("There's nothing here!");
        return (false);
    }
    int objl = igrd[you.x_pos][you.y_pos];
    int next;

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

[2.721]

[7.2366]

    int how_many_corpses = 0;
    int total_mass = 0;
    int rotted = 0;
    while (objl != NON_ITEM)
    {
        next = mitm[objl].link;
        if (mitm[objl].base_type == OBJ_CORPSES
                && mitm[objl].sub_type == CORPSE_BODY)
        {
            total_mass += mons_weight(mitm[objl].plus);
            how_many_corpses++;
            if (food_is_rotten(mitm[objl]))
                rotted++;
            destroy_item(objl);
        }
        objl = next;
    }
#if DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Mass for abomination: %d", total_mass);
#endif
    // This is what the old statement pretty much boils down to,
    // the average will be approximately 10 * pow (or about 1000
    // at the practical maximum).  That's the same as the mass
    // of a hippogriff, a spiny frog, or a steam dragon.  Thus,
    // material components are far more important to this spell. -- bwr
    total_mass += roll_dice(20, pow);
#if DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Mass including power bonus: %d", total_mass);
#endif
    if (total_mass < 400 + roll_dice(2, 500)
        || how_many_corpses < (coinflip() ? 3 : 2))
    {
        mpr("The spell fails.");
        mprf("The corpse%s collapse%s into a pulpy mess.",
             how_many_corpses > 1 ? "s": "", how_many_corpses > 1 ? "": "s");
        return (false);
    }
    monster_type mon =
        (total_mass > 500 + roll_dice(3, 1000)) ? MONS_ABOMINATION_LARGE
                                                : MONS_ABOMINATION_SMALL;
    char colour = (rotted == how_many_corpses)          ? BROWN :
                  (rotted >= random2(how_many_corpses)) ? RED
                                                        : LIGHTRED;
    int monster = create_monster(
                      mgen_data(mon, BEH_FRIENDLY, 0,
                      you.pos(), you.pet_target,
                      god_gift ? MF_GOD_GIFT : 0,
                      MONS_PROGRAM_BUG, 0, colour));
    if (monster == -1)
    {
        mpr("The corpses collapse into a pulpy mess.");
        return (false);
    }
    // This was probably intended, but it's really boring. (jpeg)
    // Use menv[mon].number instead (set in create_monster()).
//    menv[mon].colour = colour;
    mpr("The heap of corpses melds into an agglomeration of writhing flesh!");
    if (mon == MONS_ABOMINATION_LARGE)
    {
        menv[monster].hit_dice = 8 + total_mass / ((colour == LIGHTRED) ? 500 :
                                                   (colour == RED)      ? 1000
                                                                        : 2500);
        if (menv[monster].hit_dice > 30)
            menv[monster].hit_dice = 30;
        // XXX: No convenient way to get the hit dice size right now.
        menv[monster].hit_points = hit_points(menv[monster].hit_dice, 2, 5);
        menv[monster].max_hit_points = menv[monster].hit_points;
        if (colour == LIGHTRED)
            menv[monster].ac += total_mass / 1000;
    }
    return (true);
}

Deletion in crawl-ref/source/spells2.h at line 111 [5.562867]

B:BD[5.566417] → [5.566417:566517]

B:BD[5.566517] → [3.210:274]

∅:D[3.274] → [5.566577:566686]

∅:D[8.358] → [5.566577:566686]

∅:D[9.1374] → [5.566577:566686]

B:BD[5.566577] → [5.566577:566686]

 * called from: spell
 * *********************************************************************** */
void cast_twisted_resurrection(int pow, bool god_gift = false);
// last updated 24may2000 {dlb}
/* ***********************************************************************

Deletion in crawl-ref/source/spells2.cc at line 655 [5.569242]

B:BD[5.579113] → [5.579113:579114]

B:BD[5.579114] → [3.276:331]

∅:D[3.331] → [5.579173:579175]

∅:D[8.477] → [5.579173:579175]

∅:D[9.1794] → [5.579173:579175]

B:BD[5.579173] → [5.579173:579175]

B:BD[5.579319] → [5.579319:579491]

B:BD[5.579491] → [8.478:548]

∅:D[8.548] → [5.579491:579673]

B:BD[5.579491] → [5.579491:579673]

B:BD[5.579673] → [8.549:605]

∅:D[8.605] → [5.579731:579759]

B:BD[5.579731] → [5.579731:579759]

B:BD[5.579759] → [8.606:607]

∅:D[8.607] → [10.519:563]

B:BD[5.579759] → [10.519:563]

∅:D[10.563] → [5.579801:579828]

B:BD[5.579801] → [5.579801:579828]

B:BD[5.579828] → [8.608:640]

∅:D[8.640] → [5.579862:579923]

B:BD[5.579862] → [5.579862:579923]

B:BD[5.579923] → [11.6565:6634]

∅:D[11.6634] → [5.580031:580038]

B:BD[5.580031] → [5.580031:580038]


void cast_twisted_resurrection(int pow, bool god_gift)
{
    if (igrd[you.x_pos][you.y_pos] == NON_ITEM)
    {
        mpr("There's nothing here!");
        return;
    }
    int objl = igrd[you.x_pos][you.y_pos];
    int next;
    int total_mass = 0;
    int num_corpses = 0;
    int rotted = 0;
    while (objl != NON_ITEM)
    {
        next = mitm[objl].link;
        if (mitm[objl].base_type == OBJ_CORPSES
                && mitm[objl].sub_type == CORPSE_BODY)
        {
            total_mass += mons_weight(mitm[objl].plus);
            num_corpses++;
            if (food_is_rotten(mitm[objl]))
                rotted++;
            destroy_item(objl);
        }
        objl = next;
    }
#if DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Mass for abomination: %d", total_mass);
#endif

Deletion in crawl-ref/source/spells2.cc at line 656 [5.569242]

B:BD[5.580039] → [12.3819:3884]

B:BD[12.3884] → [8.641:706]

∅:D[8.706] → [5.580172:580235]

B:BD[5.580172] → [5.580172:580235]

B:BD[5.580235] → [12.3885:3949]

∅:D[12.3949] → [5.580300:580372]

B:BD[5.580300] → [5.580300:580372]

B:BD[5.580372] → [8.707:745]

∅:D[8.745] → [5.580414:580437]

B:BD[5.580414] → [5.580414:580437]

B:BD[5.580437] → [11.6635:6710]

∅:D[11.6710] → [5.580551:580559]

B:BD[5.580551] → [5.580551:580559]

B:BD[5.580559] → [8.746:791]

∅:D[8.791] → [5.580606:580692]

B:BD[5.580606] → [5.580606:580692]

B:BD[5.580692] → [8.792:793]

∅:D[8.793] → [13.802:929]

B:BD[5.580692] → [13.802:929]

∅:D[13.929] → [5.580748:580771]

B:BD[5.580748] → [5.580748:580771]

B:BD[5.580771] → [8.794:964]

∅:D[8.964] → [5.580866:580867]

B:BD[5.580866] → [5.580866:580867]

B:BD[5.580867] → [8.965:1181]

B:BD[8.1181] → [3.332:538]

∅:D[3.538] → [5.581027:581028]

∅:D[8.1332] → [5.581027:581028]

B:BD[5.581027] → [5.581027:581028]

B:BD[5.581028] → [8.1333:1440]

∅:D[8.1440] → [14.169:170]

B:BD[15.6923] → [14.169:170]

B:BD[14.170] → [8.1441:1682]

∅:D[8.1682] → [5.581158:581159]

∅:D[15.6962] → [5.581158:581159]

B:BD[5.581158] → [5.581158:581159]

B:BD[5.581159] → [8.1683:1722]

∅:D[8.1722] → [5.581243:581249]

B:BD[5.581243] → [5.581243:581249]

B:BD[5.581249] → [8.1723:1803]

∅:D[8.1803] → [12.3950:4029]

B:BD[5.581473] → [12.3950:4029]

∅:D[12.4029] → [5.581553:581635]

B:BD[5.581553] → [5.581553:581635]

B:BD[5.581635] → [8.1804:1886]

∅:D[8.1886] → [5.581717:581718]

B:BD[5.581717] → [5.581717:581718]

B:BD[5.581718] → [8.1887:2099]

∅:D[8.2099] → [5.581928:581929]

B:BD[5.581928] → [5.581928:581929]

B:BD[5.581929] → [8.2100:2183]

∅:D[8.2183] → [5.582036:582042]

B:BD[5.582036] → [5.582036:582042]

B:BD[5.582042] → [8.2184:2186]

∅:D[8.2186] → [5.582096:582097]

B:BD[5.582096] → [5.582096:582097]

    // This is what the old statement pretty much boils down to,
    // the average will be approximately 10 * pow (or about 1000
    // at the practical maximum).  That's the same as the mass
    // of a hippogriff, a spiny frog, or a steam dragon.  Thus,
    // material components are far more important to this spell. -- bwr
    total_mass += roll_dice(20, pow);
#if DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Mass including power bonus: %d", total_mass);
#endif
    if (total_mass < 400 + roll_dice(2, 500)
        || num_corpses < (coinflip() ? 3 : 2))
    {
        mpr("The spell fails.");
        mprf("The corpse%s collapse%s into a pulpy mess.",
             num_corpses > 1 ? "s": "", num_corpses > 1 ? "": "s");
        return;
    }
    monster_type mon =
        (total_mass > 500 + roll_dice(3, 1000)) ? MONS_ABOMINATION_LARGE
                                                : MONS_ABOMINATION_SMALL;
    char colour = (rotted == num_corpses)          ? BROWN :
                  (rotted >= random2(num_corpses)) ? RED
                                                   : LIGHTRED;
    int monster = create_monster(
                      mgen_data(mon, BEH_FRIENDLY, 0,
                      you.pos(), you.pet_target,
                      god_gift ? MF_GOD_GIFT : 0,
                      MONS_PROGRAM_BUG, 0, colour));
    if (monster == -1)
    {
        mpr("The corpses collapse into a pulpy mess.");
        return;
    }
    // This was probably intended, but it's really boring. (jpeg)
    // Use menv[mon].number instead (set in create_monster()).
//    menv[mon].colour = colour;
    mpr("The heap of corpses melds into an agglomeration of writhing flesh!");
    if (mon == MONS_ABOMINATION_LARGE)
    {
        menv[monster].hit_dice = 8 + total_mass / ((colour == LIGHTRED) ? 500 :
                                                   (colour == RED)      ? 1000
                                                                        : 2500);
        if (menv[monster].hit_dice > 30)
            menv[monster].hit_dice = 30;
        // XXX: No convenient way to get the hit dice size right now.
        menv[monster].hit_points = hit_points(menv[monster].hit_dice, 2, 5);
        menv[monster].max_hit_points = menv[monster].hit_points;
        if (colour == LIGHTRED)
            menv[monster].ac += total_mass / 1000;
    }
}