fiddlerwoaroof/crawl - Change MED2SJP7F7BIPCRUXOJRTELR3EOKRN5PFOO2LLMQOEIJLID3LTOAC

Clean up yet more.

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

Created by dolorous on June 7, 2008

MED2SJP7F7BIPCRUXOJRTELR3EOKRN5PFOO2LLMQOEIJLID3LTOAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1498 [6.293070]
∅:D[4.255] → [5.343:401]
B:BD[5.343] → [5.343:401]
```
    // Remember that most holy spells don't yet use powc!
```
Insertion in crawl-ref/source/spl-cast.cc at line 1499 [6.293070]
[7.190]
[8.161]
```
        cast_summon_demon(powc);
        break;
```

Insertion in crawl-ref/source/spl-cast.cc at line 1503 [6.293070]

[8.191]

[6.328091]

        cast_demonic_horde(powc);
        break;
    // Remember that most holy spells don't yet use powc!

Insertion in crawl-ref/source/spells2.h at line 151 [6.562867]

[9.1197]

[4.263]


bool cast_summon_demon(int pow, bool god_gift = false);
bool cast_demonic_horde(int pow, bool god_gift = false);

Insertion in crawl-ref/source/spells2.cc at line 1825 [6.569242]

[9.2214]

    }
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
static bool _summon_demon_wrapper(int pow, bool god_gift, demon_class_type dct,
                                  int dur, bool friendly)
{
    bool success = false;
    monster_type mon = summon_any_demon(dct);
    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;
        mprf("A demon appears!%s",
             friendly ? "" : " It doesn't look very happy.");

Insertion in crawl-ref/source/spells2.cc at line 1859 [6.569242]

[4.331]

bool cast_summon_demon(int pow, bool god_gift)
{
    mpr("You open a gate to Pandemonium!");
    return _summon_demon_wrapper(pow, god_gift, DEMON_COMMON,
                                 std::min(2 + (random2(pow) / 4), 6),
                                 random2(pow) > 3);
}
bool cast_demonic_horde(int pow, bool god_gift)
{
    bool success = false;
    const int how_many = 7 + random2(5);
    mpr("You open a gate to Pandemonium!");
    for (int i = 0; i < how_many; ++i)
    {
        if (_summon_demon_wrapper(pow, god_gift, DEMON_COMMON,
                                  std::min(2 + (random2(pow) / 4), 6),
                                  random2(pow) > 3))
        {
            success = true;
        }
    }
    return (success);
}

Replacement in crawl-ref/source/spells2.cc at line 1961 [6.569242]

B:BD[10.786] → [5.6346:6393]

∅:D[5.6393] → [10.888:940]

B:BD[10.888] → [10.888:940]

B:BD[10.999] → [10.999:1062]

    int hostile = (spell == SPELL_SUMMON_DEMON
                    || spell == SPELL_DEMONIC_HORDE
                    || spell == SPELL_SUMMON_UGLY_THING) ? 3 :

[10.786]

[10.1062]

    int hostile = (spell == SPELL_SUMMON_UGLY_THING) ? 3 :

Replacement in crawl-ref/source/spells2.cc at line 1971 [6.569242]

B:BD[10.1584] → [5.6446:6503]

∅:D[5.6503] → [10.1924:2021]

B:BD[10.1924] → [10.1924:2021]

    int how_many = (spell == SPELL_DEMONIC_HORDE)      ?
                       7 + random2(5) :
                   (spell == SPELL_SUMMON_WRAITHS)     ?

[10.1584]

[11.450]

    int how_many = (spell == SPELL_SUMMON_WRAITHS)     ?

Deletion in crawl-ref/source/spells2.cc at line 1980 [6.569242]

B:BD[10.2689] → [10.2689:3109]

            case SPELL_SUMMON_DEMON:
            case SPELL_DEMONIC_HORDE:
            case SPELL_SUMMON_GREATER_DEMON:
                mon = summon_any_demon(
                        (spell == SPELL_SUMMON_GREATER_DEMON) ? DEMON_GREATER :
                        (spell == SPELL_SUMMON_DEMON)         ? DEMON_COMMON
                                                              : DEMON_LESSER);
                break;

Insertion in crawl-ref/source/spells2.cc at line 1992 [6.569242]

[10.4536]

            case SPELL_SUMMON_GREATER_DEMON:
                mon = summon_any_demon(DEMON_GREATER);
                break;

Replacement in crawl-ref/source/spells2.cc at line 2021 [6.569242]

B:BD[10.5227] → [10.5227:5385]

        if (i == 0 && (spell == SPELL_SUMMON_DEMON
            || spell == SPELL_DEMONIC_HORDE
            || spell == SPELL_SUMMON_GREATER_DEMON))
        {

[10.5227]

[10.5385]

        if (i == 0 && spell == SPELL_SUMMON_GREATER_DEMON)

Deletion in crawl-ref/source/spells2.cc at line 2023 [6.569242]
B:BD[10.5437] → [10.5437:5447]
```
        }
```

Replacement in crawl-ref/source/mstuff2.cc at line 755 [6.1340842]

B:BD[12.216] → [2.2588:2660]

                const monster_type mons = rand_dragon( DRAGON_LIZARD );

[12.216]

[12.279]

                const monster_type mons = summon_any_dragon(DRAGON_LIZARD);

Replacement in crawl-ref/source/mstuff2.cc at line 759 [6.1340842]

B:BD[12.376] → [12.376:446]

                    monsters.push_back( rand_dragon(DRAGON_DRAGON) );

[12.376]

[12.446]

                    monsters.push_back(summon_any_dragon(DRAGON_DRAGON));

Replacement in crawl-ref/source/monplace.h at line 269 [6.1638277]

B:BD[6.1640911] → [13.1676:1739]

monster_type summon_any_demon( demon_class_type demon_class );

[6.1640911]

[6.1640953]

monster_type summon_any_demon(demon_class_type dct);
monster_type summon_any_dragon(dragon_class_type dct);

Deletion in crawl-ref/source/monplace.h at line 273 [6.1638277]
B:BD[14.450208] → [14.450208:450260]
```
monster_type rand_dragon( dragon_class_type type );
```
Replacement in crawl-ref/source/monplace.cc at line 2132 [6.1641732]
B:BD[6.1679186] → [13.1741:1801]
```
monster_type summon_any_demon(demon_class_type demon_class)
```
[6.1679186]
[6.1679225]
```
monster_type summon_any_demon(demon_class_type dct)
```
Replacement in crawl-ref/source/monplace.cc at line 2134 [6.1641732]
B:BD[6.1679227] → [13.1802:1848]
```
    monster_type summoned = MONS_PROGRAM_BUG;
```
[6.1679227]
[6.1679272]
```
    monster_type mon = MONS_PROGRAM_BUG;
```
Replacement in crawl-ref/source/monplace.cc at line 2138 [6.1641732]
B:BD[6.1679336] → [6.1679336:1679361]
```
    switch (demon_class)
```
[6.1679336]
[6.1679361]
```
    switch (dct)
```

Replacement in crawl-ref/source/monplace.cc at line 2142 [6.1641732]

B:BD[6.1679423] → [6.1679423:1679906]

        summoned = ((temp_rand > 49) ? MONS_IMP :        // 10 in 60
                    (temp_rand > 40) ? MONS_WHITE_IMP :  //  9 in 60
                    (temp_rand > 31) ? MONS_LEMURE :     //  9 in 60
                    (temp_rand > 22) ? MONS_UFETUBUS :   //  9 in 60
                    (temp_rand > 13) ? MONS_MANES :      //  9 in 60
                    (temp_rand > 4)  ? MONS_MIDGE        //  9 in 60
                                     : MONS_SHADOW_IMP); //  5 in 60

[6.1679423]

[6.1679906]

        mon = ((temp_rand > 49) ? MONS_IMP :        // 10 in 60
               (temp_rand > 40) ? MONS_WHITE_IMP :  //  9 in 60
               (temp_rand > 31) ? MONS_LEMURE :     //  9 in 60
               (temp_rand > 22) ? MONS_UFETUBUS :   //  9 in 60
               (temp_rand > 13) ? MONS_MANES :      //  9 in 60
               (temp_rand > 4)  ? MONS_MIDGE        //  9 in 60
                                : MONS_SHADOW_IMP); //  5 in 60

Replacement in crawl-ref/source/monplace.cc at line 2153 [6.1641732]

B:BD[6.1679980] → [6.1679980:1681312]

        summoned = ((temp_rand > 3367) ? MONS_NEQOXEC :         // 14.69%
                    (temp_rand > 2787) ? MONS_ORANGE_DEMON :    // 14.69%
                    (temp_rand > 2207) ? MONS_HELLWING :        // 14.69%
                    (temp_rand > 1627) ? MONS_SMOKE_DEMON :     // 14.69%
                    (temp_rand > 1047) ? MONS_YNOXINUL :        // 14.69%
                    (temp_rand > 889)  ? MONS_RED_DEVIL :       //  4.00%
                    (temp_rand > 810)  ? MONS_HELLION :         //  2.00%
                    (temp_rand > 731)  ? MONS_ROTTING_DEVIL :   //  2.00%
                    (temp_rand > 652)  ? MONS_TORMENTOR :       //  2.00%
                    (temp_rand > 573)  ? MONS_REAPER :          //  2.00%
                    (temp_rand > 494)  ? MONS_SOUL_EATER :      //  2.00%
                    (temp_rand > 415)  ? MONS_HAIRY_DEVIL :     //  2.00%
                    (temp_rand > 336)  ? MONS_ICE_DEVIL :       //  2.00%
                    (temp_rand > 257)  ? MONS_BLUE_DEVIL :      //  2.00%
                    (temp_rand > 178)  ? MONS_BEAST :           //  2.00%
                    (temp_rand > 99)   ? MONS_IRON_DEVIL :      //  2.00%
                    (temp_rand > 49)   ? MONS_SUN_DEMON         //  1.26%
                                       : MONS_SHADOW_IMP);      //  1.26%

[6.1679980]

[6.1681312]

        mon = ((temp_rand > 3367) ? MONS_NEQOXEC :         // 14.69%
               (temp_rand > 2787) ? MONS_ORANGE_DEMON :    // 14.69%
               (temp_rand > 2207) ? MONS_HELLWING :        // 14.69%
               (temp_rand > 1627) ? MONS_SMOKE_DEMON :     // 14.69%
               (temp_rand > 1047) ? MONS_YNOXINUL :        // 14.69%
               (temp_rand > 889)  ? MONS_RED_DEVIL :       //  4.00%
               (temp_rand > 810)  ? MONS_HELLION :         //  2.00%
               (temp_rand > 731)  ? MONS_ROTTING_DEVIL :   //  2.00%
               (temp_rand > 652)  ? MONS_TORMENTOR :       //  2.00%
               (temp_rand > 573)  ? MONS_REAPER :          //  2.00%
               (temp_rand > 494)  ? MONS_SOUL_EATER :      //  2.00%
               (temp_rand > 415)  ? MONS_HAIRY_DEVIL :     //  2.00%
               (temp_rand > 336)  ? MONS_ICE_DEVIL :       //  2.00%
               (temp_rand > 257)  ? MONS_BLUE_DEVIL :      //  2.00%
               (temp_rand > 178)  ? MONS_BEAST :           //  2.00%
               (temp_rand > 99)   ? MONS_IRON_DEVIL :      //  2.00%
               (temp_rand > 49)   ? MONS_SUN_DEMON         //  1.26%
                                  : MONS_SHADOW_IMP);      //  1.26%

Replacement in crawl-ref/source/monplace.cc at line 2175 [6.1641732]

B:BD[6.1681387] → [6.1681387:1682044]

        summoned = ((temp_rand > 868) ? MONS_CACODEMON :        // 13.1%
                    (temp_rand > 737) ? MONS_BALRUG :           // 13.1%
                    (temp_rand > 606) ? MONS_BLUE_DEATH :       // 13.1%
                    (temp_rand > 475) ? MONS_GREEN_DEATH :      // 13.1%
                    (temp_rand > 344) ? MONS_EXECUTIONER :      // 13.1%
                    (temp_rand > 244) ? MONS_FIEND :            // 10.0%
                    (temp_rand > 154) ? MONS_ICE_FIEND :        //  9.0%
                    (temp_rand > 73)  ? MONS_SHADOW_FIEND       //  8.1%
                                      : MONS_PIT_FIEND);        //  7.4%

[6.1681387]

[6.1682044]

        mon = ((temp_rand > 868) ? MONS_CACODEMON :        // 13.1%
               (temp_rand > 737) ? MONS_BALRUG :           // 13.1%
               (temp_rand > 606) ? MONS_BLUE_DEATH :       // 13.1%
               (temp_rand > 475) ? MONS_GREEN_DEATH :      // 13.1%
               (temp_rand > 344) ? MONS_EXECUTIONER :      // 13.1%
               (temp_rand > 244) ? MONS_FIEND :            // 10.0%
               (temp_rand > 154) ? MONS_ICE_FIEND :        //  9.0%
               (temp_rand > 73)  ? MONS_SHADOW_FIEND       //  8.1%
                                 : MONS_PIT_FIEND);        //  7.4%

Replacement in crawl-ref/source/monplace.cc at line 2187 [6.1641732]

B:BD[6.1682073] → [6.1682073:1682154]

        summoned = MONS_GIANT_ANT;      // this was the original behaviour {dlb}

[6.1682073]

[6.1682154]

        mon = MONS_GIANT_ANT;     // this was the original behaviour {dlb}

Replacement in crawl-ref/source/monplace.cc at line 2191 [6.1641732]
B:BD[6.1682176] → [6.1682176:1682255]
```
    return summoned;
}                               // end summon_any_demon()
```
[6.1682176]
[14.461080]
```
    return (mon);
}
```
Replacement in crawl-ref/source/monplace.cc at line 2194 [6.1641732]
B:BD[14.461081] → [14.461081:461132]
```
monster_type rand_dragon( dragon_class_type type )
```
[14.461081]
[14.461132]
```
monster_type summon_any_dragon(dragon_class_type dct)
```
Replacement in crawl-ref/source/monplace.cc at line 2196 [6.1641732]
B:BD[14.461134] → [14.461134:461181]
```
    monster_type  summoned = MONS_PROGRAM_BUG;
```
[14.461134]
[14.461181]
```
    monster_type mon = MONS_PROGRAM_BUG;
```
Replacement in crawl-ref/source/monplace.cc at line 2200 [6.1641732]
B:BD[14.461201] → [14.461201:461219]
```
    switch (type)
```
[14.461201]
[14.461219]
```
    switch (dct)
```

Replacement in crawl-ref/source/monplace.cc at line 2204 [6.1641732]

B:BD[14.461283] → [12.1051:1109]

B:BD[12.1109] → [15.10725:10785]

∅:D[15.10785] → [12.1170:1337]

B:BD[12.1170] → [12.1170:1337]

        summoned = ((temp_rand > 80) ? MONS_SWAMP_DRAKE :
                    (temp_rand > 59) ? MONS_KOMODO_DRAGON :
                    (temp_rand > 34) ? MONS_FIREDRAKE :
                    (temp_rand > 11) ? MONS_DEATH_DRAKE :
                                       MONS_DRAGON);

[14.461283]

[14.461751]

        mon = ((temp_rand > 80) ? MONS_SWAMP_DRAKE :
               (temp_rand > 59) ? MONS_KOMODO_DRAGON :
               (temp_rand > 34) ? MONS_FIREDRAKE :
               (temp_rand > 11) ? MONS_DEATH_DRAKE :
                                  MONS_DRAGON);

Replacement in crawl-ref/source/monplace.cc at line 2213 [6.1641732]

B:BD[14.461827] → [14.461827:462258]

        summoned = ((temp_rand > 60) ? MONS_YELLOW_DRACONIAN :
                    (temp_rand > 50) ? MONS_BLACK_DRACONIAN :
                    (temp_rand > 40) ? MONS_PALE_DRACONIAN :
                    (temp_rand > 30) ? MONS_GREEN_DRACONIAN :
                    (temp_rand > 20) ? MONS_PURPLE_DRACONIAN :
                    (temp_rand > 10) ? MONS_RED_DRACONIAN
                                     : MONS_WHITE_DRACONIAN);

[14.461827]

[14.462258]

        mon = ((temp_rand > 60) ? MONS_YELLOW_DRACONIAN :
               (temp_rand > 50) ? MONS_BLACK_DRACONIAN :
               (temp_rand > 40) ? MONS_PALE_DRACONIAN :
               (temp_rand > 30) ? MONS_GREEN_DRACONIAN :
               (temp_rand > 20) ? MONS_PURPLE_DRACONIAN :
               (temp_rand > 10) ? MONS_RED_DRACONIAN
                                : MONS_WHITE_DRACONIAN);

Replacement in crawl-ref/source/monplace.cc at line 2224 [6.1641732]

B:BD[14.462331] → [14.462331:462853]

        summoned = ((temp_rand > 80) ? MONS_MOTTLED_DRAGON :
                    (temp_rand > 70) ? MONS_LINDWURM :
                    (temp_rand > 60) ? MONS_STORM_DRAGON :
                    (temp_rand > 50) ? MONS_MOTTLED_DRAGON :
                    (temp_rand > 40) ? MONS_STEAM_DRAGON :
                    (temp_rand > 30) ? MONS_DRAGON :
                    (temp_rand > 20) ? MONS_ICE_DRAGON :
                    (temp_rand > 10) ? MONS_SWAMP_DRAGON
                                     : MONS_SHADOW_DRAGON);

[14.462331]

[14.462853]

        mon = ((temp_rand > 80) ? MONS_MOTTLED_DRAGON :
               (temp_rand > 70) ? MONS_LINDWURM :
               (temp_rand > 60) ? MONS_STORM_DRAGON :
               (temp_rand > 50) ? MONS_MOTTLED_DRAGON :
               (temp_rand > 40) ? MONS_STEAM_DRAGON :
               (temp_rand > 30) ? MONS_DRAGON :
               (temp_rand > 20) ? MONS_ICE_DRAGON :
               (temp_rand > 10) ? MONS_SWAMP_DRAGON
                                : MONS_SHADOW_DRAGON);

Replacement in crawl-ref/source/monplace.cc at line 2239 [6.1641732]
B:BD[14.462904] → [14.462904:462927]
```
    return (summoned);
```
[14.462904]
[3.4132]
```
    return (mon);
```

Clean up yet more.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1498 [6.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1499 [6.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1503 [6.293070]

Insertion in crawl-ref/source/spells2.h at line 151 [6.562867]

Insertion in crawl-ref/source/spells2.cc at line 1825 [6.569242]

Insertion in crawl-ref/source/spells2.cc at line 1859 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 1961 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 1971 [6.569242]

Deletion in crawl-ref/source/spells2.cc at line 1980 [6.569242]

Insertion in crawl-ref/source/spells2.cc at line 1992 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 2021 [6.569242]

Deletion in crawl-ref/source/spells2.cc at line 2023 [6.569242]

Replacement in crawl-ref/source/mstuff2.cc at line 755 [6.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 759 [6.1340842]

Replacement in crawl-ref/source/monplace.h at line 269 [6.1638277]

Deletion in crawl-ref/source/monplace.h at line 273 [6.1638277]

Replacement in crawl-ref/source/monplace.cc at line 2132 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2134 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2138 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2142 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2153 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2175 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2187 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2191 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2194 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2196 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2200 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2204 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2213 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2224 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2239 [6.1641732]