fiddlerwoaroof/crawl - Change O6OHDRHPEF6S5B36LHMW36OMST3B3MJURDR6WVLUXAEMGR6YUD6QC

And do the same for "Summon Wraiths".

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

Created by dolorous on June 7, 2008

O6OHDRHPEF6S5B36LHMW36OMST3B3MJURDR6WVLUXAEMGR6YUD6QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1449 [4.293070]
B:BD[4.327356] → [4.327356:327432]
```
    case SPELL_SUMMON_WRAITHS:
        summon_undead(powc);
        break;
```
Insertion in crawl-ref/source/spl-cast.cc at line 1491 [4.293070]
[5.231]
[6.279]
```
    case SPELL_SUMMON_WRAITHS:
```
Insertion in crawl-ref/source/spl-cast.cc at line 1494 [4.293070]
[6.340]
[6.340]
```
    case SPELL_SUMMON_DRAGON:
```

Replacement in crawl-ref/source/spl-cast.cc at line 1508 [4.293070]

B:BD[7.531] → [7.531:590]

            (spell == SPELL_SUMMON_DRAGON)             ? 5

[7.531]

[7.590]

            (spell == SPELL_SUMMON_WRAITHS
                || spell == SPELL_SUMMON_DRAGON)       ? 5

Replacement in crawl-ref/source/spl-cast.cc at line 1514 [4.293070]

B:BD[3.395] → [3.395:451]

                || spell == SPELL_SUMMON_SCORPIONS) ? 3

[3.395]

[3.451]

                || spell == SPELL_SUMMON_SCORPIONS) ? 3 :
            (spell == SPELL_SUMMON_WRAITHS)         ? 5

Replacement in crawl-ref/source/spl-cast.cc at line 1521 [4.293070]

B:BD[3.736] → [3.736:801]

            (spell == SPELL_DEMONIC_HORDE)      ? 7 + random2(5)

[3.736]

[3.801]

            (spell == SPELL_DEMONIC_HORDE)      ? 7 + random2(5) :
            (spell == SPELL_SUMMON_WRAITHS)     ? stepdown_value(1 + random2(powc) / 30 + random2(powc) / 30, 2, 2, 6, 8)

Deletion in crawl-ref/source/spl-cast.cc at line 1545 [4.293070]

B:BD[8.740] → [8.740:836]

                    if (i == 0)
                        mpr("You open a gate to Pandemonium!");

Replacement in crawl-ref/source/spl-cast.cc at line 1594 [4.293070]

B:BD[5.911] → [9.401:482]

                case SPELL_SUMMON_DRAGON:
                    mon = MONS_DRAGON;

[5.911]

[9.482]

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

Insertion in crawl-ref/source/spl-cast.cc at line 1601 [4.293070]
[9.509]
[9.509]
```
                }
```

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

[5.1100]

                    break;
                case SPELL_SUMMON_DRAGON:
                    mon = MONS_DRAGON;

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

[6.1243]

[3.970]

            if (i == 0 && (spell == SPELL_SUMMON_DEMON ||
                spell == SPELL_DEMONIC_HORDE))
            {
                mpr("You open a gate to Pandemonium!");
            }

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

B:BD[4.568787] → [4.568787:569025]

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

Replacement in crawl-ref/source/spells2.cc at line 1570 [4.569242]

B:BD[4.605380] → [9.1202:1259]

    case MONS_DRAGON:
        msg = "A dragon appears.";

[4.605380]

[9.1259]

    case MONS_WRAITH:
    case MONS_FREEZING_WRAITH:
    case MONS_SPECTRAL_WARRIOR:
        msg = "An insubstantial figure forms in the air.";

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

[6.1894]

[4.605897]

    case MONS_DRAGON:
        msg = "A dragon appears.";
        break;

Replacement in crawl-ref/source/spells2.cc at line 1596 [4.569242]

B:BD[9.1340] → [9.1340:1387]

        msg += " It doesn't look very happy.";

[9.1340]

[9.1387]

    {
        if (mons_class_holiness(mon) == MH_UNDEAD)
            msg = "You sense a hostile presence.";
        else
            msg += " It doesn't look very happy.";
    }

Replacement in crawl-ref/source/spells2.cc at line 1618 [4.569242]

B:BD[10.516] → [11.4364:4395]

        if (mon == MONS_DAEVA)

[10.516]

[11.4395]

        if (mons_class_holiness(mon) == MH_UNDEAD)
        {
            //jmf: Kiku sometimes deflects this
            if (!you.is_undead
                && !(you.religion == GOD_KIKUBAAQUDGHA
                    && (!player_under_penance()
                        && you.piety >= piety_breakpoint(3)
                        && you.piety > random2(MAX_PIETY))))
            {
                disease_player(25 + random2(50));
            }
        }
        else if (mon == MONS_DAEVA)

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

B:BD[4.609059] → [4.609059:609112]

B:BD[4.609112] → [11.6128:6169]

∅:D[11.6169] → [4.609184:609362]

∅:D[12.8842] → [4.609184:609362]

B:BD[4.609184] → [4.609184:609362]

B:BD[4.609362] → [11.6170:6221]

∅:D[11.6221] → [4.609413:609453]

B:BD[4.609413] → [4.609413:609453]

B:BD[4.609453] → [11.6222:6414]

∅:D[13.384] → [4.609669:609670]

∅:D[14.388] → [4.609669:609670]

∅:D[11.6414] → [4.609669:609670]

B:BD[4.609669] → [4.609669:609670]

B:BD[4.609670] → [15.3051:3096]

B:BD[15.3096] → [12.8843:8871]

B:BD[12.8871] → [11.6415:6446]

∅:D[16.398] → [12.8912:9088]

∅:D[11.6446] → [12.8912:9088]

B:BD[12.8912] → [12.8912:9088]

∅:D[15.3432] → [4.609700:609710]

∅:D[12.9088] → [4.609700:609710]

B:BD[4.609700] → [4.609700:609710]

B:BD[4.609710] → [15.3433:3542]

∅:D[15.3542] → [4.609871:609925]

B:BD[4.609871] → [4.609871:609925]

B:BD[4.610221] → [4.610221:610231]

B:BD[4.610231] → [11.6447:6453]

∅:D[11.6453] → [4.610279:610431]

B:BD[4.610279] → [4.610279:610431]

B:BD[4.610431] → [17.135:188]

B:BD[17.188] → [2.169:223]

∅:D[2.223] → [4.610500:610612]

∅:D[17.237] → [4.610500:610612]

B:BD[4.610500] → [4.610500:610612]

void summon_undead(int pow)
{
    int temp_rand = 0;
    monster_type mon = MONS_PROGRAM_BUG;
    int numsc = 1 + random2(pow) / 30 + random2(pow) / 30;
    numsc = stepdown_value(numsc, 2, 2, 6, 8);  //see stuff.cc {dlb}
    mpr("You call on the undead to aid you!");
    for (int scount = 0; scount < numsc; ++scount)
    {
        temp_rand = random2(25);
        mon = ((temp_rand > 8) ? MONS_WRAITH :           // 64%
               (temp_rand > 3) ? MONS_FREEZING_WRAITH    // 20%
                               : MONS_SPECTRAL_WARRIOR); // 16%
        bool friendly = (random2(pow) > 5);
        if (create_monster(
                mgen_data(mon,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE, 5,
                          you.pos(),
                          friendly ? you.pet_target : MHITYOU)) != -1)
        {
            if (friendly)
                mpr("An insubstantial figure forms in the air.");
            else
                mpr("You sense a hostile presence.");
        }
    }
    //jmf: Kiku sometimes deflects this
    if (!you.is_undead
        && !(you.religion == GOD_KIKUBAAQUDGHA
             && (!player_under_penance()
                 && you.piety >= piety_breakpoint(3)
                 && you.piety > random2(MAX_PIETY))))
    {
        disease_player( 25 + random2(50) );
    }
}                               // end summon_undead()