fiddlerwoaroof/crawl - Change RQIADBIESWPIW3Y6T7PQ7UH6PBH32ECSM65SM2DFVUEJME6P524AC

Clean up "Summon Horrible Things".

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

Created by dolorous on June 7, 2008

RQIADBIESWPIW3Y6T7PQ7UH6PBH32ECSM65SM2DFVUEJME6P524AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1390 [4.293070]
∅:D[3.2469] → [4.325260:325276]
B:BD[4.325260] → [4.325260:325276]
B:BD[4.325358] → [4.325358:325426]
```
        break;
    case SPELL_SUMMON_HORRIBLE_THINGS:
        summon_things(powc);
```

Insertion in crawl-ref/source/spl-cast.cc at line 1525 [4.293070]

[5.221]

[6.306]

        break;
    case SPELL_SUMMON_HORRIBLE_THINGS:
        summon_horrible_things(powc);

Insertion in crawl-ref/source/spells2.h at line 171 [4.562867]
[7.406]
[6.425]
```
bool summon_horrible_things(int pow, bool god_gift = false);
```

Deletion in crawl-ref/source/spells2.h at line 201 [4.562867]

B:BD[4.568549] → [4.568549:568787]

 * called from: spell
 * *********************************************************************** */
void summon_things(int pow);
// last updated 24may2000 {dlb}
/* ***********************************************************************

Insertion in crawl-ref/source/spells2.cc at line 2077 [4.569242]

[8.1177]

[6.3220]

bool summon_horrible_things(int pow, bool god_gift)
{
    if (one_chance_in(3)
        && !lose_stat(STAT_INTELLIGENCE, 1, true, "summoning horrible things"))
    {
        mpr("Your call goes unanswered.");
        return (false);
    }
    int how_many_small =
        stepdown_value(2 + (random2(pow) / 10) + (random2(pow) / 10),
                       2, 2, 6, -1);
    int how_many_big = 0;
    // No more than 2 tentacled monstrosities.
    while (how_many_small > 2 && how_many_big < 2 && one_chance_in(3))
    {
        how_many_small -= 2;
        how_many_big++;
    }
    // No more than 8 summons.
    how_many_small = std::min(8, how_many_small);
    how_many_big = std::min(8, how_many_big);
    int count = 0;
    while (how_many_big > 0)
    {
        if (create_monster(
               mgen_data(MONS_TENTACLED_MONSTROSITY, BEH_FRIENDLY, 6,
                         you.pos(), you.pet_target,
                         god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            count++;
        }
        how_many_big--;
    }
    while (how_many_small > 0)
    {
        if (create_monster(
               mgen_data(MONS_ABOMINATION_LARGE, BEH_FRIENDLY, 6,
                         you.pos(), you.pet_target,
                         god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            count++;
        }
        how_many_small--;
    }
    if (count > 0)
    {
        mprf("Some Thing%s answered your call!",
             (count > 1) ? "s" : "");
        return (true);
    }
    return (false);
}

Deletion in crawl-ref/source/spells2.cc at line 2316 [4.569242]

∅:D[2.1735] → [5.2347:2350]

B:BD[5.2347] → [5.2347:2350]

∅:D[5.2350] → [9.319:347]

B:BD[4.609059] → [9.319:347]

∅:D[9.347] → [4.610642:610668]

B:BD[4.610642] → [4.610642:610668]

B:BD[4.610668] → [10.35:36]

∅:D[10.36] → [4.610668:610732]

B:BD[4.610668] → [4.610668:610732]

B:BD[4.610732] → [11.2831:2967]

∅:D[10.107] → [4.610802:610845]

∅:D[12.107] → [4.610802:610845]

∅:D[11.2967] → [4.610802:610845]

B:BD[4.610802] → [4.610802:610845]

B:BD[4.610845] → [11.2968:2974]

∅:D[11.2974] → [4.610845:610915]

B:BD[4.610845] → [4.610845:610915]

B:BD[4.610915] → [13.371:422]

∅:D[13.422] → [10.158:222]

B:BD[10.158] → [10.158:222]

∅:D[10.222] → [4.610941:610951]

B:BD[4.610941] → [4.610941:610951]

B:BD[4.611009] → [4.611009:611033]

B:BD[4.611033] → [10.223:249]

∅:D[10.249] → [4.611059:611215]

B:BD[4.611059] → [4.611059:611215]

B:BD[4.611215] → [14.9089:9243]

∅:D[15.2411] → [4.611361:611434]

∅:D[16.4481] → [4.611361:611434]

∅:D[14.9243] → [4.611361:611434]

B:BD[4.611361] → [4.611361:611434]

B:BD[4.611434] → [14.9244:9339]

B:BD[14.9339] → [17.6454:6509]

∅:D[15.2540] → [4.611576:611608]

∅:D[16.4623] → [4.611576:611608]

∅:D[17.6509] → [4.611576:611608]

∅:D[14.9395] → [4.611576:611608]

B:BD[4.611576] → [4.611576:611608]

B:BD[4.611608] → [18.7412:7461]

B:BD[18.7461] → [17.6510:6561]

∅:D[17.6561] → [4.611757:611763]

∅:D[18.7513] → [4.611757:611763]

B:BD[4.611757] → [4.611757:611763]

}
void summon_things(int pow)
{
    int big_things = 0;
    int numsc = 2 + (random2(pow) / 10) + (random2(pow) / 10);
    if (one_chance_in(3)
        && !lose_stat( STAT_INTELLIGENCE, 1, true,
                       "summoning horrible things" ))
    {
        mpr("Your call goes unanswered.");
    }
    else
    {
        numsc = stepdown_value( numsc, 2, 2, 6, -1 );
        // No more than 2 tentacled monstrosities.
        while (numsc > 2 && big_things < 2 && one_chance_in(3))
        {
            numsc -= 2;
            ++big_things;
        }
        if (numsc > 8)
            numsc = 8;
        if (big_things > 8)
            big_things = 8;
        while (big_things > 0)
        {
            create_monster(
                mgen_data(MONS_TENTACLED_MONSTROSITY, BEH_FRIENDLY, 6,
                          you.pos(), you.pet_target));
            big_things--;
        }
        while (numsc > 0)
        {
            create_monster(
                mgen_data(MONS_ABOMINATION_LARGE, BEH_FRIENDLY, 6,
                          you.pos(), you.pet_target));
            numsc--;
        }
        mprf("Some Thing%s answered your call!",
             (numsc + big_things > 1) ? "s" : "");
    }