fiddlerwoaroof/crawl - Change WZWOQZCXUB7QX7PGQMIUCH5JM5YME25GE2GMMT2NIJP5OIZUZLBQC

Reorganize again, and move cast_summon_wraiths() to spells3.cc, since

it's a necromantic spell.

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

Created by dolorous on June 8, 2008

WZWOQZCXUB7QX7PGQMIUCH5JM5YME25GE2GMMT2NIJP5OIZUZLBQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 691 [7.224557]

B:BD[7.232189] → [4.148:249]

// usage: cast_summon_swarm() summon_wraiths() summon_scorpions()
//        summon_horrible_things()

[7.232189]

[7.232265]

// usage: cast_summon_swarm() cast_summon_wraiths() cast_summon_scorpions()
//        cast_summon_horrible_things()

Deletion in crawl-ref/source/spl-cast.cc at line 1519 [7.293070]

B:BD[8.255] → [9.161:243]

    case SPELL_SUMMON_WRAITHS:
        cast_summon_wraiths(powc);
        break;

Replacement in crawl-ref/source/spl-cast.cc at line 1540 [7.293070]

B:BD[10.177] → [10.177:255]

    case SPELL_SUBLIMATION_OF_BLOOD:
        cast_sublimation_of_blood(powc);

[10.177]

[11.310]

    case SPELL_SUMMON_HORRIBLE_THINGS:
        cast_summon_horrible_things(powc);

Replacement in crawl-ref/source/spl-cast.cc at line 1545 [7.293070]
B:BD[11.353] → [11.353:379]
```
        simulacrum(powc);
```
[11.353]
[5.161]
```
        cast_simulacrum(powc);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1548 [7.293070]

B:BD[5.177] → [5.177:254]

    case SPELL_SUMMON_HORRIBLE_THINGS:
        summon_horrible_things(powc);

[5.177]

[10.256]

    case SPELL_SUMMON_WRAITHS:
        cast_summon_wraiths(powc);

Insertion in crawl-ref/source/spl-cast.cc at line 1616 [7.293070]

[7.330545]

[12.171]

    case SPELL_SUBLIMATION_OF_BLOOD:
        cast_sublimation_of_blood(powc);
        break;

Replacement in crawl-ref/source/spells3.h at line 114 [7.526814]

B:BD[7.530942] → [11.385:434]

B:BD[11.434] → [13.166:227]

bool simulacrum(int pow, bool god_gift = false);
bool summon_horrible_things(int pow, bool god_gift = false);

[10.383]

[6.166]


bool cast_summon_horrible_things(int pow, bool god_gift = false);
bool cast_simulacrum(int pow, bool god_gift = false);
bool cast_summon_wraiths(int pow, bool god_gift = false);

Insertion in crawl-ref/source/spells3.cc at line 413 [7.531613]

[10.1482]

}
bool cast_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);
    }
    mpr("Your call goes unanswered.");
    return (false);

Replacement in crawl-ref/source/spells3.cc at line 494 [7.531613]
B:BD[7.541934] → [11.436:476]
```
bool simulacrum(int pow, bool god_gift)
```
[7.541934]
[7.541961]
```
bool cast_simulacrum(int pow, bool god_gift)
```
Replacement in crawl-ref/source/spells3.cc at line 545 [7.531613]
B:BD[13.252] → [13.252:304]
```
bool summon_horrible_things(int pow, bool god_gift)
```
[13.252]
[13.304]
```
bool cast_summon_wraiths(int pow, bool god_gift)
```

Replacement in crawl-ref/source/spells3.cc at line 547 [7.531613]

B:BD[13.306] → [13.306:833]

    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++;
    }

[13.306]

[13.833]

    bool success = false;

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

B:BD[13.834] → [13.834:961]

    // No more than 8 summons.
    how_many_small = std::min(8, how_many_small);
    how_many_big = std::min(8, how_many_big);

[13.834]

[13.961]

    const int chance = random2(25);
    monster_type mon = ((chance > 8) ? MONS_WRAITH :           // 64%
                        (chance > 3) ? MONS_FREEZING_WRAITH    // 20%
                                     : MONS_SPECTRAL_WARRIOR); // 16%

Replacement in crawl-ref/source/spells3.cc at line 554 [7.531613]
B:BD[13.962] → [13.962:981]
```
    int count = 0;
```
[13.962]
[13.981]
```
    const bool friendly = (random2(pow) > 5);
```

Replacement in crawl-ref/source/spells3.cc at line 556 [7.531613]

B:BD[13.982] → [13.982:1011]

    while (how_many_big > 0)

[13.982]

[13.1011]

    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      5, you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)

Replacement in crawl-ref/source/spells3.cc at line 563 [7.531613]

B:BD[13.1017] → [13.1017:1269]

        if (create_monster(
               mgen_data(MONS_TENTACLED_MONSTROSITY, BEH_FRIENDLY, 6,
                         you.pos(), you.pet_target,
                         god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            count++;
        }

[13.1017]

[13.1269]

        success = true;

Replacement in crawl-ref/source/spells3.cc at line 565 [7.531613]

B:BD[13.1270] → [13.1270:1294]

        how_many_big--;

[13.1270]

[13.1294]

        mprf("%s",
             friendly ? "An insubstantial figure forms in the air."
                      : "You sense a hostile presence.");

Insertion in crawl-ref/source/spells3.cc at line 569 [7.531613]
[13.1300]
[13.1300]
```
    else
        canned_msg(MSG_NOTHING_HAPPENS);
```

Replacement in crawl-ref/source/spells3.cc at line 572 [7.531613]

B:BD[13.1301] → [13.1301:1332]

    while (how_many_small > 0)

[13.1301]

[13.1332]

    //jmf: Kiku sometimes deflects this
    if (!(you.religion == GOD_KIKUBAAQUDGHA
           && (!player_under_penance()
               && you.piety >= piety_breakpoint(3)
               && you.piety > random2(MAX_PIETY))))

Replacement in crawl-ref/source/spells3.cc at line 578 [7.531613]

B:BD[13.1338] → [13.1338:1613]

        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--;

[13.1338]

[13.1613]

        disease_player(25 + random2(50));

Replacement in crawl-ref/source/spells3.cc at line 581 [7.531613]

B:BD[13.1620] → [13.1620:1801]

∅:D[13.1801] → [11.1715:1735]

B:BD[11.1715] → [11.1715:1735]

    if (count > 0)
    {
        mprf("Some Thing%s answered your call!",
             (count > 1) ? "s" : "");
        return (true);
    }
    mpr("Your call goes unanswered.");
    return (false);

[13.1620]

[14.1595]

    return (success);

Deletion in crawl-ref/source/spells2.h at line 165 [7.562867]
B:BD[9.348] → [9.348:406]
```
bool cast_summon_wraiths(int pow, bool god_gift = false);
```

Deletion in crawl-ref/source/spells2.cc at line 2165 [7.569242]

B:BD[8.1090] → [8.1090:1091]

B:BD[8.1091] → [9.408:457]

∅:D[9.457] → [15.458:486]

B:BD[15.458] → [15.458:486]

∅:D[14.6345] → [15.600:601]

B:BD[15.600] → [15.600:601]

B:BD[15.601] → [9.458:704]

∅:D[15.642] → [7.605083:605084]

∅:D[9.704] → [7.605083:605084]

B:BD[7.605083] → [7.605083:605084]

B:BD[7.605084] → [2.900:946]

∅:D[16.315] → [15.785:786]

∅:D[9.745] → [15.785:786]

∅:D[2.946] → [15.785:786]

∅:D[8.1257] → [15.785:786]

B:BD[15.785] → [15.785:786]

B:BD[15.786] → [9.746:1041]


bool cast_summon_wraiths(int pow, bool god_gift)
{
    bool success = false;
    const int chance = random2(25);
    monster_type mon = ((chance > 8) ? MONS_WRAITH :           // 64%
                        (chance > 3) ? MONS_FREEZING_WRAITH    // 20%
                                     : MONS_SPECTRAL_WARRIOR); // 16%
    const bool friendly = (random2(pow) > 5);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      5, you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)
    {
        success = true;

Deletion in crawl-ref/source/spells2.cc at line 2166 [7.569242]

B:BD[15.1295] → [9.1042:1193]

B:BD[9.1193] → [3.169:178]

∅:D[3.178] → [9.1212:1253]

B:BD[9.1212] → [9.1212:1253]

∅:D[9.1253] → [15.2174:2175]

B:BD[15.2174] → [15.2174:2175]

B:BD[15.2175] → [9.1254:1480]

∅:D[9.1480] → [15.2214:2220]

B:BD[15.2214] → [15.2214:2220]

B:BD[15.2220] → [9.1481:1523]

∅:D[9.2304] → [17.526:532]

∅:D[18.2918] → [17.526:532]

B:BD[17.526] → [17.526:532]

∅:D[18.2969] → [17.532:533]

B:BD[17.532] → [17.532:533]

∅:D[17.533] → [16.756:778]

B:BD[15.5622] → [16.756:778]

B:BD[19.1856] → [19.1856:1859]

        mprf("%s",
             friendly ? "An insubstantial figure forms in the air."
                      : "You sense a hostile presence.");
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    //jmf: Kiku sometimes deflects this
    if (!(you.religion == GOD_KIKUBAAQUDGHA
           && (!player_under_penance()
               && you.piety >= piety_breakpoint(3)
               && you.piety > random2(MAX_PIETY))))
    {
        disease_player(25 + random2(50));
    }
    return (success);
}