fiddlerwoaroof/crawl - Change NFJKJYTT6CBLOKLGT6HIVIDEPWXMGXJV5AAL37SBZTG2HSFMJMKQC

Start cleaning up summoning routines in a better way. Sorry for the

mess in the meantime.

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

Created by dolorous on June 7, 2008

NFJKJYTT6CBLOKLGT6HIVIDEPWXMGXJV5AAL37SBZTG2HSFMJMKQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1391 [5.293070]
B:BD[5.325276] → [6.432:461]
B:BD[6.461] → [7.738:787]
∅:D[7.787] → [5.325342:325358]
B:BD[5.325342] → [5.325342:325358]
```
    case SPELL_SUMMON_SWARM:
        summon_swarm(powc, BEH_FRIENDLY, false);
        break;
```
Deletion in crawl-ref/source/spl-cast.cc at line 1478 [5.293070]
B:BD[5.328091] → [8.161:219]
```
    // Remember that most holy spells don't yet use powc!
```
Insertion in crawl-ref/source/spl-cast.cc at line 1479 [5.293070]
[9.196]
[2.161]
```
        cast_summon_butterflies(powc);
        break;
```

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

[2.194]

[8.219]

        cast_summon_scorpions(powc);
        break;
    case SPELL_SUMMON_SWARM:
        summon_swarm(powc);
        break;
    // Remember that most holy spells don't yet use powc!

Replacement in crawl-ref/source/spl-cast.cc at line 1571 [5.293070]
∅:D[10.8344] → [5.330575:330612]
B:BD[5.330575] → [5.330575:330612]
```
        dancing_weapon(powc, false);
```
[10.8344]
[5.330612]
```
        dancing_weapon(powc);
```

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

B:BD[5.529251] → [11.166:237]

bool dancing_weapon(int pow, bool force_hostile, bool silent = false);

[5.529251]

[5.529301]

bool dancing_weapon(int pow, bool force_hostile = false, bool quiet = false);

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

B:BD[5.543441] → [11.239:301]

bool dancing_weapon(int pow, bool force_hostile, bool silent)

[5.543441]

[5.543490]

bool dancing_weapon(int pow, bool force_hostile, bool quiet)

Replacement in crawl-ref/source/spells3.cc at line 477 [5.531613]
B:BD[5.543492] → [12.509:562]
B:BD[5.543649] → [5.543649:543668]
```
    int numsc = std::min(2 + (random2(pow) / 5), 6);
    int summs = 0;
```
[5.543492]
[13.550]
```
    bool success = true;
```
Replacement in crawl-ref/source/spells3.cc at line 479 [5.531613]
∅:D[14.235] → [15.189:214]
∅:D[13.551] → [15.189:214]
B:BD[16.1323] → [15.189:214]
B:BD[15.214] → [13.552:594]
```
    bool failed = false;
    const int wpn = you.equip[EQ_WEAPON];
```
[13.551]
[5.543700]
```
    int monster;
```

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

B:BD[5.543701] → [13.595:629]

B:BD[13.629] → [17.687:732]

    beh_type beha = BEH_FRIENDLY;
    unsigned short hitting = you.pet_target;

[5.543701]

[5.543743]

    const int dur = std::min(2 + (random2(pow) / 5), 6);
    const int wpn = you.equip[EQ_WEAPON];

Replacement in crawl-ref/source/spells3.cc at line 491 [5.531613]
B:BD[5.543958] → [15.215:238]
```
        failed = true;
```
[5.543958]
[5.543985]
```
        success = false;
```
Replacement in crawl-ref/source/spells3.cc at line 497 [5.531613]
B:BD[5.544097] → [15.269:292]
```
        failed = true;
```
[5.544097]
[5.544124]
```
        success = false;
```
Replacement in crawl-ref/source/spells3.cc at line 499 [5.531613]
B:BD[5.544125] → [11.389:406]
```
    if (!failed)
```
[5.544125]
[15.312]
```
    if (success)
```

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

B:BD[5.544248] → [15.319:418]

B:BD[15.418] → [14.236:319]

        // cursed weapons become hostile
        if (item_cursed( you.inv[wpn] ) || force_hostile)
        {
            beha = BEH_HOSTILE;
            hitting = MHITYOU;
        }

[15.318]

[18.274]

        // Cursed weapons become hostile.
        bool friendly = (!force_hostile && !item_cursed(you.inv[wpn]));

Replacement in crawl-ref/source/spells3.cc at line 504 [5.531613]
B:BD[18.275] → [19.6247:6263]
```
        summs =
```
[18.275]
[19.6263]
```
        monster =
```

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

B:BD[19.6291] → [19.6291:6399]

∅:D[19.6399] → [11.584:609]

B:BD[11.584] → [11.584:609]

∅:D[11.609] → [18.344:371]

B:BD[15.633] → [18.344:371]

                mgen_data(MONS_DANCING_WEAPON, beha, numsc,
                          you.pos(), hitting));
        if (summs == -1)
            failed = true;

[19.6291]

[15.672]

                mgen_data(MONS_DANCING_WEAPON,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                          dur, you.pos(),
                          friendly ? you.pet_target : MHITYOU));
        if (monster == -1)
            success = false;

Replacement in crawl-ref/source/spells3.cc at line 515 [5.531613]
B:BD[5.544385] → [11.610:626]
```
    if (failed)
```
[5.544385]
[5.544404]
```
    if (!success)
```
Replacement in crawl-ref/source/spells3.cc at line 519 [5.531613]
B:BD[11.628] → [11.628:649]
```
        if (!silent)
```
[11.628]
[11.649]
```
        if (!quiet)
```
Replacement in crawl-ref/source/spells3.cc at line 528 [5.531613]
∅:D[11.895] → [20.534:556]
B:BD[15.930] → [20.534:556]
```
        return false;
```
[11.895]
[5.544559]
```
        return (false);
```

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

B:BD[5.544566] → [5.544566:544592]

B:BD[5.544592] → [21.214:291]

    // We are successful:
    unwield_item(); // unwield the weapon (including removing wield effects)

[5.544566]

[5.544664]

    // We are successful.  Unwield the weapon, removing any wield effects.
    unwield_item();

Replacement in crawl-ref/source/spells3.cc at line 534 [5.531613]
B:BD[5.544665] → [5.544665:544730]
```
    // copy item (done here after any wield effects are removed)
```
[5.544665]
[5.544730]
```
    // Copy the unwielded item.
```

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

B:BD[5.544852] → [22.33:110]

    // Mark the weapon as thrown so we'll autograb it when the tango's done.

[5.544852]

[22.110]

    // Mark the weapon as thrown, so that we'll autograb it when the
    // tango's done.

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

B:BD[5.545055] → [5.545055:545094]

B:BD[5.545094] → [23.147388:147429]

    menv[summs].inv[MSLOT_WEAPON] = i;
    menv[summs].colour = mitm[i].colour;

[5.545055]

[24.151]

    menv[monster].inv[MSLOT_WEAPON] = i;
    menv[monster].colour = mitm[i].colour;

Replacement in crawl-ref/source/spells3.cc at line 553 [5.531613]
B:BD[20.558] → [20.558:575]
∅:D[24.172] → [5.545218:545274]
∅:D[25.227] → [5.545218:545274]
∅:D[20.575] → [5.545218:545274]
∅:D[26.3443] → [5.545218:545274]
∅:D[23.147590] → [5.545218:545274]
B:BD[5.545218] → [5.545218:545274]
```
    return true;
}                               // end dancing_weapon()
```
[20.558]
[5.545274]
```
    return (true);
}
```

Insertion in crawl-ref/source/spells2.h at line 135 [5.562867]

[5.567617]

[27.221]

bool cast_summon_butterflies(int pow, bool god_gift = false);
bool cast_summon_scorpions(int pow, bool god_gift = false);

Replacement in crawl-ref/source/spells2.h at line 160 [5.562867]

B:BD[5.568149] → [7.1964:2026]

bool summon_berserker(int pow, beh_type beha, bool god_gift);

[5.568149]

bool summon_berserker(int pow, bool force_hostile = false);

Replacement in crawl-ref/source/spells2.h at line 166 [5.562867]

B:BD[5.568378] → [7.2027:2085]

bool summon_swarm(int pow, beh_type beha, bool god_gift);

[5.568378]

[5.568440]

bool summon_swarm(int pow, bool god_gift = false, bool force_hostile = false,
                  bool quiet = false);

Insertion in crawl-ref/source/spells2.cc at line 1662 [5.569242]

[28.1817]

[27.345]


bool cast_summon_butterflies(int pow, bool god_gift)
{
    bool success = false;
    const int how_many = std::max(15, 4 + random2(3) + random2(pow) / 10);
    for (int i = 0; i < how_many; ++i)
    {
        if (create_monster(
                mgen_data(MONS_BUTTERFLY, BEH_FRIENDLY, 3,
                          you.pos(), you.pet_target,
                          god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            success = true;
        }
    }
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
bool cast_summon_scorpions(int pow, bool god_gift)
{
    bool success = false;
    const int how_many = stepdown_value(1 + random2(pow)/10 + random2(pow)/10,
                                        2, 2, 6, 8);
    for (int i = 0; i < how_many; ++i)
    {
        bool friendly = (random2(pow) > 3);
        if (create_monster(
                mgen_data(MONS_SCORPION,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                          3, you.pos(),
                          friendly ? you.pet_target : MHITYOU,
                          god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            success = true;
            mprf("A scorpion appears.%s",
                 friendly ? "" : " It doesn't look very happy.");
        }
    }
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
bool summon_swarm(int pow, bool god_gift, bool force_hostile,
                  bool quiet)
{
    bool success = false;
    monster_type mon = MONS_PROGRAM_BUG;
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    const int how_many = stepdown_value(2 + random2(pow)/10 + random2(pow)/25,
                                        2, 2, 6, 8);
    for (int i = 0; i < how_many; ++i)
    {
        switch (random2(14))
        {
        case 0:
        case 1:         // prototypical swarming creature {dlb}
            mon = MONS_KILLER_BEE;
            break;
        case 2:         // comment said "larva", code read scorpion {dlb}
            mon = MONS_SCORPION;
            break;              // think: "The Arrival" {dlb}

Insertion in crawl-ref/source/spells2.cc at line 1742 [5.569242]

[27.346]

        case 3:         //jmf: technically not insects but still cool
            mon = MONS_WORM;
            break;              // but worms kinda "swarm" so s'ok {dlb}
        case 4:         // comment read "larva", code was for scorpion
            mon = MONS_GIANT_MOSQUITO;
            break;              // changed into giant mosquito 12jan2000 {dlb}
        case 5:         // think: scarabs in "The Mummy" {dlb}
            mon = MONS_GIANT_BEETLE;
            break;
        case 6:         //jmf: blowfly instead of queen bee
            mon = MONS_GIANT_BLOWFLY;
            break;
            // queen bee added if more than x bees in swarm? {dlb}
            // the above would require code rewrite - worth it? {dlb}
        case 8:         //jmf: changed to red wasp; was wolf spider
            mon = MONS_WOLF_SPIDER;    //jmf: spiders aren't insects
            break;              // think: "Kingdom of the Spiders" {dlb}
            // not just insects!!! - changed back {dlb}
        case 9:
            mon = MONS_BUTTERFLY;      // comic relief? {dlb}
            break;
        case 10:                // change into some kind of snake -- {dlb}
            mon = MONS_YELLOW_WASP;    // do wasps swarm? {dlb}
            break;              // think: "Indiana Jones" and snakepit? {dlb}
        default:                // 3 in 14 chance, 12jan2000 {dlb}
            mon = MONS_GIANT_ANT;
            break;
        }                       // end switch
        bool friendly = (god_gift) ? !force_hostile
                                   : (random2(pow) > 7);
        if (create_monster(
                mgen_data(mon,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                          dur, you.pos(),
                          friendly ? you.pet_target : MHITYOU,
                          god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            success = true;
            if (!god_gift && !quiet)
            {
                mprf("A swarming creature appears!%s",
                     friendly ? "" : " It doesn't look very happy.");
            }
        }
    }
    if (!god_gift && !quiet && !success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}

Replacement in crawl-ref/source/spells2.cc at line 1810 [5.569242]

B:BD[27.487] → [27.487:600]

    bool quiet = (spell == SPELL_SUMMON_BUTTERFLIES
                    || spell == SPELL_CALL_CANINE_FAMILIAR);

[27.487]

[27.600]

    bool quiet = (spell == SPELL_CALL_CANINE_FAMILIAR);

Replacement in crawl-ref/source/spells2.cc at line 1817 [5.569242]

B:BD[27.786] → [27.786:888]

    int hostile = (spell == SPELL_SUMMON_SCORPIONS
                    || spell == SPELL_SUMMON_DEMON

[27.786]

[27.888]

    int hostile = (spell == SPELL_SUMMON_DEMON

Replacement in crawl-ref/source/spells2.cc at line 1826 [5.569242]

B:BD[27.1295] → [3.299:457]

    int dur = (spell == SPELL_SUMMON_BUTTERFLIES
                || spell == SPELL_SUMMON_SCORPIONS) ? 3 :
              (spell == SPELL_SUMMON_GREATER_DEMON

[27.1295]

[3.457]

    int dur = (spell == SPELL_SUMMON_GREATER_DEMON

Replacement in crawl-ref/source/spells2.cc at line 1830 [5.569242]

B:BD[27.1584] → [27.1584:1772]

B:BD[27.1772] → [4.316:449]

∅:D[4.449] → [27.1867:1924]

B:BD[27.1867] → [27.1867:1924]

    int how_many = (spell == SPELL_SUMMON_BUTTERFLIES) ?
                       std::max(15, 4 + random2(3) + random2(pow) / 10) :
                   (spell == SPELL_SUMMON_SCORPIONS)   ?
                       stepdown_value(1 + random2(pow) / 10 + random2(pow) / 10,
                                      2, 2, 6, 8) :
                   (spell == SPELL_DEMONIC_HORDE)      ?

[27.1584]

[27.1924]

    int how_many = (spell == SPELL_DEMONIC_HORDE)      ?

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

B:BD[27.2253] → [27.2253:2460]

            case SPELL_SUMMON_BUTTERFLIES:
                mon = MONS_BUTTERFLY;
                break;
            case SPELL_SUMMON_SCORPIONS:
                mon = MONS_SCORPION;
                break;

Replacement in crawl-ref/source/spells2.cc at line 2074 [5.569242]
B:BD[7.4542] → [7.4542:4603]
```
bool summon_berserker(int pow, beh_type beha, bool god_gift)
```
[7.4542]
[29.4513]
```
bool summon_berserker(int pow, bool force_hostile)
```
Deletion in crawl-ref/source/spells2.cc at line 2081 [5.569242]
B:BD[4.858] → [4.858:859]
∅:D[4.859] → [7.4647:4727]
B:BD[29.4673] → [7.4647:4727]
```
    unsigned short hitting = (beha == BEH_FRIENDLY) ? you.pet_target : MHITYOU;
```

Replacement in crawl-ref/source/spells2.cc at line 2085 [5.569242]

B:BD[30.211] → [30.211:320]

        if (coinflip())
            mon = MONS_BLACK_BEAR;
        else
            mon = MONS_GRIZZLY_BEAR;

[30.211]

[29.4839]

        mon = (coinflip()) ? MONS_BLACK_BEAR : MONS_GRIZZLY_BEAR;

Replacement in crawl-ref/source/spells2.cc at line 2119 [5.569242]

B:BD[30.750] → [30.750:858]

        if (coinflip())
            mon = MONS_HILL_GIANT;
        else
            mon = MONS_STONE_GIANT;

[30.750]

[29.5516]

        mon = (coinflip()) ? MONS_HILL_GIANT : MONS_STONE_GIANT;

Replacement in crawl-ref/source/spells2.cc at line 2124 [5.569242]

B:BD[19.8404] → [4.860:898]

∅:D[4.898] → [7.4787:4881]

B:BD[7.4787] → [7.4787:4881]

            mgen_data(mon, beha, dur,
                      you.pos(), hitting,
                      god_gift ? MF_GOD_GIFT : 0));

[19.8404]

[31.705]

            mgen_data(mon,
                      !force_hostile ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, you.pos(),
                      !force_hostile ? you.pet_target : MHITYOU,
                      MF_GOD_GIFT));

Replacement in crawl-ref/source/spells2.cc at line 2140 [5.569242]

B:BD[30.1176] → [30.1176:1269]

        // Let Trog gifts berserk longer, and set abj timeout ==
        // berserk timeout.

[30.1176]

[32.152]

        // Let Trog's gifts berserk longer, and set the abjuration
        // timeout to the berserk timeout.

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

B:BD[5.606235] → [7.4974:5031]

∅:D[7.5031] → [5.606296:606298]

B:BD[5.606296] → [5.606296:606298]

B:BD[5.606298] → [4.899:926]

∅:D[4.926] → [7.5032:5074]

B:BD[5.606298] → [7.5032:5074]

B:BD[7.5074] → [4.927:979]

∅:D[4.979] → [7.5075:5155]

B:BD[5.606429] → [7.5075:5155]

∅:D[7.5181] → [5.606456:606457]

B:BD[5.606456] → [5.606456:606457]

B:BD[5.606457] → [4.980:1104]

∅:D[4.1104] → [5.606544:606545]

∅:D[7.5229] → [5.606544:606545]

B:BD[5.606544] → [5.606544:606545]

B:BD[5.606545] → [4.1105:1159]

∅:D[4.1159] → [5.606596:606721]

∅:D[7.5281] → [5.606596:606721]

B:BD[5.606596] → [5.606596:606721]

B:BD[5.606721] → [7.5282:5317]

∅:D[7.5317] → [5.606765:606859]

B:BD[5.606765] → [5.606765:606859]

B:BD[5.606859] → [7.5318:5351]

∅:D[7.5351] → [5.606901:607034]

B:BD[5.606901] → [5.606901:607034]

B:BD[5.607034] → [7.5352:5381]

∅:D[7.5381] → [5.607072:607217]

B:BD[5.607072] → [5.607072:607217]

B:BD[5.607217] → [7.5382:5421]

∅:D[7.5421] → [5.607265:607408]

B:BD[5.607265] → [5.607265:607408]

B:BD[5.607408] → [7.5422:5459]

∅:D[7.5459] → [5.607454:607534]

B:BD[5.607454] → [5.607454:607534]

B:BD[5.607534] → [7.5460:5498]

∅:D[7.5498] → [5.607581:607807]

B:BD[5.607581] → [5.607581:607807]

B:BD[5.607807] → [7.5499:5568]

∅:D[7.5568] → [5.607885:608031]

B:BD[5.607885] → [5.607885:608031]

B:BD[5.608031] → [7.5569:5631]

∅:D[7.5631] → [5.608102:608197]

B:BD[5.608102] → [5.608102:608197]

B:BD[5.608197] → [7.5632:5696]

∅:D[7.5696] → [5.608270:608416]

B:BD[5.608270] → [5.608270:608416]

B:BD[5.608416] → [7.5697:5731]

∅:D[7.5731] → [5.608459:608524]

B:BD[5.608459] → [5.608459:608524]

∅:D[33.1926] → [5.608588:608589]

B:BD[5.608588] → [5.608588:608589]

B:BD[5.608589] → [7.5732:5920]

∅:D[7.5920] → [5.608790:608791]

B:BD[5.608790] → [5.608790:608791]

B:BD[5.608791] → [19.8594:8622]

B:BD[19.8622] → [4.1160:1202]

∅:D[4.1202] → [7.5965:6073]

B:BD[7.5965] → [7.5965:6073]

∅:D[34.487] → [5.608925:608935]

∅:D[35.2003] → [5.608925:608935]

∅:D[36.3050] → [5.608925:608935]

∅:D[37.4104] → [5.608925:608935]

∅:D[7.6073] → [5.608925:608935]

∅:D[19.8791] → [5.608925:608935]

B:BD[5.608925] → [5.608925:608935]

B:BD[5.608935] → [7.6074:6102]

∅:D[7.6102] → [5.608964:608981]

B:BD[5.608964] → [5.608964:608981]

B:BD[5.608981] → [7.6103:6127]

∅:D[7.6127] → [5.609058:609059]

B:BD[5.609058] → [5.609058:609059]

bool summon_swarm(int pow, beh_type beha, bool god_gift)
{
    bool success = false;
    monster_type mon = MONS_PROGRAM_BUG;
    int dur = std::min(2 + (random2(pow) / 4), 6);
    unsigned short hitting = (beha == BEH_FRIENDLY) ? you.pet_target : MHITYOU;
    int how_many = stepdown_value(2 + random2(pow) / 10 + random2(pow) / 25,
                                  2, 2, 6, 8);
    for (int scount = 0; scount < how_many; ++scount)
    {
        switch (random2(14))
        {
        case 0:
        case 1:         // prototypical swarming creature {dlb}
            mon = MONS_KILLER_BEE;
            break;
        case 2:         // comment said "larva", code read scorpion {dlb}
            mon = MONS_SCORPION;
            break;              // think: "The Arrival" {dlb}
        case 3:         //jmf: technically not insects but still cool
            mon = MONS_WORM;
            break;              // but worms kinda "swarm" so s'ok {dlb}
        case 4:         // comment read "larva", code was for scorpion
            mon = MONS_GIANT_MOSQUITO;
            break;              // changed into giant mosquito 12jan2000 {dlb}
        case 5:         // think: scarabs in "The Mummy" {dlb}
            mon = MONS_GIANT_BEETLE;
            break;
        case 6:         //jmf: blowfly instead of queen bee
            mon = MONS_GIANT_BLOWFLY;
            break;
            // queen bee added if more than x bees in swarm? {dlb}
            // the above would require code rewrite - worth it? {dlb}
        case 8:         //jmf: changed to red wasp; was wolf spider
            mon = MONS_WOLF_SPIDER;    //jmf: spiders aren't insects
            break;              // think: "Kingdom of the Spiders" {dlb}
            // not just insects!!! - changed back {dlb}
        case 9:
            mon = MONS_BUTTERFLY;      // comic relief? {dlb}
            break;
        case 10:                // change into some kind of snake -- {dlb}
            mon = MONS_YELLOW_WASP;    // do wasps swarm? {dlb}
            break;              // think: "Indiana Jones" and snakepit? {dlb}
        default:                // 3 in 14 chance, 12jan2000 {dlb}
            mon = MONS_GIANT_ANT;
            break;
        }                       // end switch
        // If it's not a god gift, it's from a spell.
        if (!god_gift && random2(pow) > 7)
        {
            beha = BEH_FRIENDLY;
            hitting = you.pet_target;
        }
        if (create_monster(
                mgen_data(mon, beha, dur,
                          you.pos(), hitting,
                          god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            success = true;
        }
    }
    return (success);
}

Replacement in crawl-ref/source/religion.cc at line 3136 [5.804403]

B:BD[7.10318] → [7.10318:10378]

                                        BEH_HOSTILE, true);

[7.10318]

[38.3507]

                                        true, true, true);

Replacement in crawl-ref/source/religion.cc at line 3424 [5.804403]

B:BD[39.411] → [7.11865:11933]

                if (summon_berserker(cost * 20, BEH_HOSTILE, true))

[39.411]

[40.3007]

                if (summon_berserker(cost * 20, true))

Deletion in crawl-ref/source/effects.cc at line 55 [5.3382105]
B:BD[5.3382742] → [5.3382742:3382763]
```
#include "spells4.h"
```
Replacement in crawl-ref/source/effects.cc at line 791 [5.3382105]
B:BD[41.2876] → [9.4694:4753]
```
        your_spells(SPELL_SUMMON_BUTTERFLIES, 100, false);
```
[41.2876]
[5.3393685]
```
        cast_summon_butterflies(100);
```

Replacement in crawl-ref/source/abl-show.cc at line 1637 [5.4494389]

B:BD[42.4010] → [42.4010:4080]

B:BD[42.4080] → [7.14604:14650]

                         random2(you.piety/4) - random2(you.piety/4),
                         BEH_FRIENDLY, true);

[42.4010]

[5.4527464]

                         random2(you.piety/4) - random2(you.piety/4));

Start cleaning up summoning routines in a better way. Sorry for the

Dependencies

In channels

Change contents

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

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

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

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

Replacement in crawl-ref/source/spl-cast.cc at line 1571 [5.293070]

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

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

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

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

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

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

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

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

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

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