fiddlerwoaroof/crawl - Change QZUSP5WXCHQKOZ6TO574PITHBAJHPDBSVJJ6YUGFMJNGVN6A427AC

Simplify yet again.

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

Created by dolorous on June 6, 2008

QZUSP5WXCHQKOZ6TO574PITHBAJHPDBSVJJ6YUGFMJNGVN6A427AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1493 [4.293070]
[3.190]
[4.328091]
```
    case SPELL_DEMONIC_HORDE:
```

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

[5.391]

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

Replacement in crawl-ref/source/spl-cast.cc at line 1503 [4.293070]
B:BD[5.392] → [5.392:415]
```
        switch (spell)
```
[5.392]
[5.415]
```
        for (int i = 0; i < how_many; ++i)
```

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

B:BD[5.425] → [5.425:630]

B:BD[5.630] → [3.191:214]

            case SPELL_CALL_IMP:
                mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                      (one_chance_in(7)) ? MONS_SHADOW_IMP
                                         : MONS_IMP;
                break;

[5.425]

[3.214]

            switch (spell)
            {
                case SPELL_CALL_IMP:
                    mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                          (one_chance_in(7)) ? MONS_SHADOW_IMP
                                             : MONS_IMP;
                    break;

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

B:BD[3.215] → [3.215:362]

∅:D[3.362] → [5.630:653]

B:BD[5.630] → [5.630:653]

            case SPELL_SUMMON_DEMON:
                mpr("You open a gate to Pandemonium!");
                mon = summon_any_demon(DEMON_COMMON);
                break;

[3.215]

[5.653]

                case SPELL_SUMMON_DEMON:
                case SPELL_DEMONIC_HORDE:
                    if (i == 0)
                        mpr("You open a gate to Pandemonium!");
                    mon = summon_any_demon(
                        (spell == DEMONIC_HORDE) ? DEMON_LESSER
                                                 : DEMON_COMMON);
                    break;

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

B:BD[5.654] → [5.654:756]

            case SPELL_SUMMON_ICE_BEAST:
                mon = MONS_ICE_BEAST;
                break;

[5.654]

[5.756]

                case SPELL_SUMMON_ICE_BEAST:
                    mon = MONS_ICE_BEAST;
                    break;

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

B:BD[5.1050] → [5.1050:1147]

            case SPELL_SUMMON_GUARDIAN:
                mon = MONS_ANGEL;
                break;

[5.757]

[5.1147]

                case SPELL_SUMMON_GUARDIAN:
                    mon = MONS_ANGEL;
                    break;

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

B:BD[5.1148] → [5.1148:1219]

B:BD[5.1219] → [2.161:184]

            case SPELL_SUMMON_DAEVA:
                mon = MONS_DAEVA;
                break;

[5.1148]

[2.184]

                case SPELL_SUMMON_DAEVA:
                    mon = MONS_DAEVA;
                    break;

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

B:BD[2.185] → [2.185:533]

∅:D[2.533] → [5.1219:1242]

B:BD[5.1219] → [5.1219:1242]

            // Starting here, there's a chance of monsters' being
            // unfriendly.
            case SPELL_SUMMON_UGLY_THING:
            {
                const int chance = std::max(6 - (powc / 12), 1);
                mon = (one_chance_in(chance)) ? MONS_VERY_UGLY_THING
                                              : MONS_UGLY_THING;
                break;

[2.185]

[2.534]

                // Starting here, there's a chance of monsters' being
                // unfriendly.
                case SPELL_SUMMON_UGLY_THING:
                {
                    const int chance = std::max(6 - (powc / 12), 1);
                    mon = (one_chance_in(chance)) ? MONS_VERY_UGLY_THING
                                                  : MONS_UGLY_THING;
                    break;
                }
                default:
                    break;

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

B:BD[5.1243] → [5.1243:1287]

            default:
                break;

[5.1243]

[5.1287]

            summon_general_creature(powc, mon, BEH_FRIENDLY, false);

Deletion in crawl-ref/source/spl-cast.cc at line 1550 [4.293070]
B:BD[5.1297] → [5.1297:1363]
```
        summon_general_creature(powc, mon, BEH_FRIENDLY, false);
```

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

B:BD[4.331049] → [4.331049:331127]

B:BD[4.331223] → [4.331223:331233]

B:BD[4.331233] → [6.349:435]

B:BD[6.435] → [7.1385:1399]

B:BD[7.1399] → [5.1496:1636]

∅:D[5.1636] → [7.1533:1547]

B:BD[7.1533] → [7.1533:1547]

∅:D[6.539] → [4.331305:331331]

∅:D[7.1547] → [4.331305:331331]

B:BD[4.331305] → [4.331305:331331]

    case SPELL_DEMONIC_HORDE:
        mpr("You open a gate to Pandemonium!");
        {
            const int num = 7 + random2(5);
            for (int i = 0; i < num; ++i)
            {
                summon_general_creature(powc, summon_any_demon(DEMON_LESSER),
                                        BEH_FRIENDLY, false);
            }
        }
        break;