fiddlerwoaroof/crawl - Change WVIVA3M3ABBQTBYTCFE2W53IE4IZ223FBSQ6P7BACWKIJPYA66ZQC

Clean up yet some more.

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

Created by dolorous on June 7, 2008

WVIVA3M3ABBQTBYTCFE2W53IE4IZ223FBSQ6P7BACWKIJPYA66ZQC

Dependencies

In channels

main

Change contents

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

[3.255]

[4.261]

    case SPELL_SUMMON_WRAITHS:
        cast_summon_wraiths(powc);
        break;

Deletion in crawl-ref/source/spl-cast.cc at line 1523 [5.293070]
∅:D[6.198] → [7.161:192]
B:BD[8.231] → [7.161:192]
```
    case SPELL_SUMMON_WRAITHS:
```
Replacement in crawl-ref/source/spl-cast.cc at line 2788 [5.293070]
∅:D[9.19145] → [5.366747:366792]
B:BD[5.366747] → [5.366747:366792]
```
            canned_msg(MSG_NOTHING_HAPPENS);
```
[9.19145]
[9.19146]
```
            mpr("You feel very uncomfortable.");
```
Replacement in crawl-ref/source/spl-cast.cc at line 2791 [5.293070]
B:BD[9.19181] → [9.19181:19230]
```
            mpr("You feel very uncomfortable.");
```
[9.19181]
[5.366792]
```
            canned_msg(MSG_NOTHING_HAPPENS);
```
Insertion in crawl-ref/source/spells2.h at line 163 [5.562867]
[3.328]
[10.1722]
```
bool cast_summon_wraiths(int pow, bool god_gift = false);
```
Replacement in crawl-ref/source/spells2.cc at line 2029 [5.569242]
∅:D[3.1091] → [11.346:458]
∅:D[12.1671] → [11.346:458]
∅:D[10.6288] → [11.346:458]
B:BD[11.346] → [11.346:458]
```
bool summon_general_creature_spell(spell_type spell, int pow,
                                   bool god_gift)
```
[3.1091]
[11.458]
```
bool cast_summon_wraiths(int pow, bool god_gift)
```

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

B:BD[11.601] → [11.601:642]

    monster_type mon = MONS_PROGRAM_BUG;

[11.601]

[5.605083]

    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/spells2.cc at line 2038 [5.569242]

B:BD[5.605084] → [3.1092:1257]

    int hostile = (spell == SPELL_SUMMON_WRAITHS
                    || spell == SPELL_SUMMON_DRAGON) ? 5
                                                     : -1;

[5.605084]

[11.785]

    bool friendly = (random2(pow) > 5);

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

B:BD[11.786] → [3.1258:1360]

    int dur = (spell == SPELL_SUMMON_WRAITHS) ? 5
                                              : -1;

[11.786]

[11.1294]

    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;

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

B:BD[11.1584] → [4.1964:2021]

∅:D[4.2021] → [13.450:581]

B:BD[11.2021] → [13.450:581]

∅:D[13.581] → [11.2114:2174]

B:BD[11.2114] → [11.2114:2174]

    int how_many = (spell == SPELL_SUMMON_WRAITHS)     ?
                       stepdown_value(1 + random2(pow) / 30 + random2(pow) / 30,
                                      2, 2, 6, 8)
                                                       : 1;

[11.1295]

[11.2174]

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

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

B:BD[11.2175] → [11.2175:2214]

    for (int i = 0; i < how_many; ++i)

[11.2175]

[11.2214]

    //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/spells2.cc at line 2063 [5.569242]

B:BD[11.2220] → [11.2220:2253]

∅:D[4.2146] → [11.4536:4637]

B:BD[11.4536] → [11.4536:4637]

B:BD[11.4637] → [13.582:755]

∅:D[13.755] → [11.4844:4881]

B:BD[11.4844] → [11.4844:4881]

        switch (spell)
        {
            case SPELL_SUMMON_WRAITHS:
            {
                const int chance = random2(25);
                mon = ((chance > 8) ? MONS_WRAITH :
                       (chance > 3) ? MONS_FREEZING_WRAITH
                                    : MONS_SPECTRAL_WARRIOR);
                break;
            }

[11.2220]

[11.4881]

        disease_player(25 + random2(50));
    }

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

B:BD[11.4882] → [11.4882:4979]

            case SPELL_SUMMON_GUARDIAN:
                mon = MONS_ANGEL;
                break;

[11.4882]

[11.4979]

    return (success);
}

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

B:BD[11.4980] → [11.4980:5074]

            case SPELL_SUMMON_DAEVA:
                mon = MONS_DAEVA;
                break;

[11.4980]

[11.5074]

bool summon_general_creature_spell(spell_type spell, int pow,
                                   bool god_gift)
{
    bool success = false;

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

B:BD[11.5075] → [11.5075:5171]

            case SPELL_SUMMON_DRAGON:
                mon = MONS_DRAGON;
                break;

[11.5075]

[11.5171]

    monster_type mon = MONS_PROGRAM_BUG;

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

B:BD[11.5172] → [11.5172:5226]

            default:
                break;
        }

[11.5172]

[11.5447]

    int hostile = (spell == SPELL_SUMMON_DRAGON) ? 5
                                                 : -1;

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

B:BD[11.5448] → [3.1361:1428]

∅:D[3.1428] → [14.572:630]

∅:D[12.1731] → [14.572:630]

B:BD[11.5507] → [14.572:630]

∅:D[14.630] → [11.5567:5615]

B:BD[11.5567] → [11.5567:5615]

        if (summon_general_creature(pow, false, mon, BEH_FRIENDLY,
                                    hostile, dur, false))
        {
            success = true;
        }

[11.5448]

[11.5615]

    switch (spell)
    {
        case SPELL_SUMMON_GUARDIAN:
            mon = MONS_ANGEL;
            break;
        case SPELL_SUMMON_DAEVA:
            mon = MONS_DAEVA;
            break;
        case SPELL_SUMMON_DRAGON:
            mon = MONS_DRAGON;
            break;
        default:
            break;

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

B:BD[11.5622] → [2.169:219]

    if (success && spell == SPELL_SUMMON_WRAITHS)

[11.5622]

[2.219]

    if (summon_general_creature(pow, false, mon, BEH_FRIENDLY,
                                hostile, -1, false))

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

B:BD[2.225] → [2.225:526]

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

[2.225]

[2.526]

        success = true;

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

B:BD[5.605380] → [7.1293:1437]

∅:D[7.1437] → [15.1259:1275]

B:BD[15.1259] → [15.1259:1275]

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

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

B:BD[5.606096] → [6.1349:1480]

∅:D[6.1480] → [7.1512:1690]

B:BD[15.1340] → [7.1512:1690]

    if (beha == BEH_CHARMED)
    {
        msg += " You don't feel so good about this...";
    }
    else if (beha == BEH_HOSTILE)
    {
        if (mons_class_holiness(mon) == MH_UNDEAD)
            msg = "You sense a hostile presence.";
        else
            msg += " It doesn't look very happy.";
    }

[5.606096]

[15.1387]

    if (beha == BEH_HOSTILE)
        msg += " It doesn't look very happy.";

Replacement in crawl-ref/source/spells2.cc at line 2161 [5.569242]
B:BD[16.516] → [2.534:565]
```
        if (mon == MONS_DAEVA)
```
[16.516]
[17.4395]
```
        if (mon == MONS_ANGEL || mon == MONS_DAEVA)
```