fiddlerwoaroof/crawl - Change HHKRUVC6WMVKQRUQRYB5VAEDXUS6TMAKO7BSTBGVVL2AUOEBFUJAC

Reorganize the consolidated summoning routines.

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

Created by dolorous on June 7, 2008

HHKRUVC6WMVKQRUQRYB5VAEDXUS6TMAKO7BSTBGVVL2AUOEBFUJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1496 [5.293070]

∅:D[3.195] → [4.340:346]

∅:D[6.223] → [4.340:346]

B:BD[4.340] → [4.340:346]

B:BD[4.346] → [7.161:229]

∅:D[7.229] → [8.255:312]

B:BD[8.255] → [8.255:312]

∅:D[8.312] → [9.219:220]

B:BD[9.219] → [9.219:220]

∅:D[9.220] → [4.346:391]

B:BD[4.346] → [4.346:391]

B:BD[4.391] → [2.199:354]

∅:D[2.354] → [10.161:162]

B:BD[4.391] → [10.161:162]

B:BD[10.162] → [2.355:377]

∅:D[2.377] → [7.255:347]

B:BD[7.255] → [7.255:347]

∅:D[7.347] → [8.367:531]

B:BD[8.367] → [8.367:531]

B:BD[8.531] → [2.378:476]

∅:D[2.476] → [6.267:326]

B:BD[6.267] → [6.267:326]

∅:D[6.326] → [8.590:651]

B:BD[8.590] → [8.590:651]

∅:D[8.651] → [9.338:339]

B:BD[10.376] → [9.338:339]

∅:D[9.339] → [11.232:252]

∅:D[10.376] → [11.232:252]

B:BD[4.391] → [11.232:252]

B:BD[11.252] → [7.348:395]

B:BD[7.395] → [6.327:385]

B:BD[6.385] → [2.477:582]

∅:D[6.441] → [7.451:509]

∅:D[2.582] → [7.451:509]

B:BD[7.451] → [7.451:509]

∅:D[7.509] → [9.399:400]

∅:D[8.772] → [9.399:400]

B:BD[9.399] → [9.399:400]

∅:D[9.400] → [11.394:417]

∅:D[10.527] → [11.394:417]

B:BD[11.394] → [11.394:417]

B:BD[11.417] → [7.510:736]

B:BD[7.736] → [6.442:631]

∅:D[6.631] → [7.801:854]

B:BD[7.801] → [7.801:854]

∅:D[12.322] → [4.391:392]

∅:D[11.640] → [4.391:392]

∅:D[10.763] → [4.391:392]

∅:D[7.854] → [4.391:392]

∅:D[8.1014] → [4.391:392]

B:BD[4.391] → [4.391:392]

B:BD[4.392] → [12.323:366]

∅:D[12.366] → [4.415:425]

B:BD[4.415] → [4.415:425]

B:BD[4.425] → [12.367:408]

B:BD[12.408] → [11.641:758]

B:BD[11.758] → [7.855:969]

∅:D[11.758] → [12.408:656]

∅:D[7.969] → [12.408:656]

B:BD[12.408] → [12.408:656]

∅:D[12.656] → [13.214:215]

B:BD[13.214] → [13.214:215]

B:BD[13.215] → [12.657:740]

B:BD[12.740] → [2.583:632]

∅:D[2.632] → [12.836:880]

B:BD[12.836] → [12.836:880]

B:BD[12.880] → [2.633:881]

∅:D[14.303] → [12.1010:1037]

∅:D[2.881] → [12.1010:1037]

∅:D[11.909] → [12.1010:1037]

B:BD[12.1010] → [12.1010:1037]

∅:D[12.1037] → [4.653:654]

B:BD[4.653] → [4.653:654]

B:BD[4.654] → [8.1015:2172]

∅:D[8.2172] → [12.1038:1125]

B:BD[4.654] → [12.1038:1125]

B:BD[12.1342] → [12.1342:1369]

∅:D[12.1369] → [15.184:185]

B:BD[15.184] → [15.184:185]

B:BD[12.1471] → [12.1471:1791]

B:BD[12.1791] → [11.910:911]

B:BD[11.911] → [6.632:964]

∅:D[6.964] → [9.482:509]

B:BD[9.482] → [9.482:509]

B:BD[9.509] → [6.965:983]

∅:D[6.983] → [9.509:510]

B:BD[9.509] → [9.509:510]

∅:D[9.510] → [11.911:1100]

B:BD[11.911] → [11.911:1100]

B:BD[11.1100] → [6.984:1093]

∅:D[6.1093] → [11.1100:1127]

B:BD[11.1100] → [11.1100:1127]

∅:D[11.1127] → [12.1791:1844]

B:BD[12.1791] → [12.1791:1844]

∅:D[12.1844] → [15.534:548]

B:BD[4.1242] → [15.534:548]

∅:D[15.548] → [4.1242:1243]

B:BD[4.1242] → [4.1242:1243]

B:BD[4.1243] → [2.882:1042]

∅:D[2.1042] → [6.1199:1284]

B:BD[6.1199] → [6.1199:1284]

B:BD[6.1284] → [2.1043:1163]

∅:D[10.888] → [4.1287:1297]

∅:D[7.1101] → [4.1287:1297]

∅:D[2.1163] → [4.1287:1297]

∅:D[11.1204] → [4.1287:1297]

∅:D[12.1914] → [4.1287:1297]

B:BD[4.1287] → [4.1287:1297]

    {
        bool quiet =
            (spell == SPELL_SUMMON_BUTTERFLIES
                || spell == SPELL_CALL_CANINE_FAMILIAR);
        monster_type mon = MONS_PROGRAM_BUG;
        beh_type beha =
            (spell == SPELL_SUMMON_GREATER_DEMON) ? BEH_CHARMED
                                                  : BEH_FRIENDLY;
        int hostile =
            (spell == SPELL_SUMMON_SCORPIONS
                || spell == SPELL_SUMMON_DEMON
                || spell == SPELL_DEMONIC_HORDE
                || spell == SPELL_CALL_CANINE_FAMILIAR
                || spell == SPELL_SUMMON_UGLY_THING)   ? 3 :
            (spell == SPELL_SUMMON_GREATER_DEMON
                || spell == SPELL_SUMMON_WRAITHS
                || spell == SPELL_SUMMON_DRAGON)       ? 5
                                                       : -1;
        int numsc =
            (spell == SPELL_SUMMON_BUTTERFLIES
                || spell == SPELL_SUMMON_SCORPIONS) ? 3 :
            (spell == SPELL_SUMMON_GREATER_DEMON
                || spell == SPELL_SUMMON_WRAITHS)   ? 5
                                                    : -1;
        int how_many =
            (spell == SPELL_SUMMON_BUTTERFLIES) ? std::max(15, 4 + random2(3) + random2(powc) / 10) :
            (spell == SPELL_SUMMON_SCORPIONS)   ? stepdown_value(1 + random2(powc) / 10 + random2(powc) / 10, 2, 2, 6, 8) :
            (spell == SPELL_DEMONIC_HORDE)      ? 7 + random2(5) :
            (spell == SPELL_SUMMON_WRAITHS)     ? stepdown_value(1 + random2(powc) / 30 + random2(powc) / 30, 2, 2, 6, 8)
                                                : 1;
        for (int i = 0; i < how_many; ++i)
        {
            switch (spell)
            {
                case SPELL_SUMMON_BUTTERFLIES:
                    mon = MONS_BUTTERFLY;
                    break;
                case SPELL_SUMMON_SCORPIONS:
                    mon = MONS_SCORPION;
                    break;
                case SPELL_CALL_IMP:
                    mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                          (one_chance_in(7)) ? MONS_SHADOW_IMP
                                             : MONS_IMP;
                    break;
                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;
                case SPELL_CALL_CANINE_FAMILIAR:
                {
                    const int chance = random2(powc);
                    if (chance < 10)
                        mon = MONS_JACKAL;
                    else if (chance < 15)
                        mon = MONS_HOUND;
                    else
                    {
                        switch (chance % 7)
                        {
                        case 0:
                            if (one_chance_in(you.species == SP_HILL_ORC ? 3 : 6))
                                mon = MONS_WARG;
                            else
                                mon = MONS_WOLF;
                            break;
                        case 1:
                        case 2:
                            mon = MONS_WAR_DOG;
                            break;
                        case 3:
                        case 4:
                            mon = MONS_HOUND;
                            break;
                        default:
                            mon = MONS_JACKAL;
                            break;
                        }
                    }
                }
                case SPELL_SUMMON_ICE_BEAST:
                    mon = MONS_ICE_BEAST;
                    break;
                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;
                }
                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%
                    break;
                }
                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;
            }
            if (i == 0 && (spell == SPELL_SUMMON_DEMON
                || spell == SPELL_DEMONIC_HORDE
                || spell == SPELL_SUMMON_GREATER_DEMON))
            {
                mpr("You open a gate to Pandemonium!");
            }
            summon_general_creature(powc, quiet, mon, beha,
                                    hostile, numsc, false);
        }

[6.223]

[5.328176]

        summon_general_creature_spell(spell, powc);

Deletion in crawl-ref/source/spl-cast.cc at line 1498 [5.293070]
B:BD[5.328191] → [4.1364:1370]
```
    }
```

Insertion in crawl-ref/source/spells2.h at line 135 [5.562867]

[5.567617]

[9.599]

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

Insertion in crawl-ref/source/spells2.cc at line 1662 [5.569242]

[16.1817]

[5.605083]


bool summon_general_creature_spell(spell_type spell, int pow,
                                   bool god_gift)
{
    bool success = false;
    bool quiet = (spell == SPELL_SUMMON_BUTTERFLIES
                    || spell == SPELL_CALL_CANINE_FAMILIAR);
    monster_type mon = MONS_PROGRAM_BUG;

Insertion in crawl-ref/source/spells2.cc at line 1673 [5.569242]

[5.605084]

[9.803]

    beh_type beha =
        (spell == SPELL_SUMMON_GREATER_DEMON) ? BEH_CHARMED
                                              : BEH_FRIENDLY;
    int hostile = (spell == SPELL_SUMMON_SCORPIONS
                    || spell == SPELL_SUMMON_DEMON
                    || spell == SPELL_DEMONIC_HORDE
                    || spell == SPELL_CALL_CANINE_FAMILIAR
                    || spell == SPELL_SUMMON_UGLY_THING) ? 3 :
                  (spell == SPELL_SUMMON_GREATER_DEMON
                    || spell == SPELL_SUMMON_WRAITHS
                    || spell == SPELL_SUMMON_DRAGON)     ? 5
                                                         : -1;
    int numsc = (spell == SPELL_SUMMON_BUTTERFLIES
                    || spell == SPELL_SUMMON_SCORPIONS) ? 3 :
                (spell == SPELL_SUMMON_GREATER_DEMON
                    || spell == SPELL_SUMMON_WRAITHS)   ? 5
                                                        : -1;
    int how_many = (spell == SPELL_SUMMON_BUTTERFLIES) ?
                       std::max(15, 4 + random2(3) + random2(pow) / 10) :
                   (spell == SPELL_SUMMON_SCORPIONS)   ?
                       stepdown_value(1 + random2(pow) / 10 + random2(pow) / 10, 2, 2, 6, 8) :
                   (spell == SPELL_DEMONIC_HORDE)      ?
                       7 + random2(5) :
                   (spell == SPELL_SUMMON_WRAITHS)     ?
                       stepdown_value(1 + random2(pow) / 30 + random2(pow) / 30, 2, 2, 6, 8)
                                                       : 1;
    for (int i = 0; i < how_many; ++i)
    {
        switch (spell)
        {
            case SPELL_SUMMON_BUTTERFLIES:
                mon = MONS_BUTTERFLY;
                break;
            case SPELL_SUMMON_SCORPIONS:
                mon = MONS_SCORPION;
                break;
            case SPELL_CALL_IMP:
                mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                      (one_chance_in(7)) ? MONS_SHADOW_IMP
                                         : MONS_IMP;
                break;
            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;
            case SPELL_CALL_CANINE_FAMILIAR:
            {
                const int chance = random2(pow);
                if (chance < 10)
                    mon = MONS_JACKAL;
                else if (chance < 15)
                    mon = MONS_HOUND;
                else
                {
                    switch (chance % 7)
                    {
                    case 0:
                        if (one_chance_in(you.species == SP_HILL_ORC ? 3 : 6))
                            mon = MONS_WARG;
                        else
                            mon = MONS_WOLF;
                        break;
                    case 1:
                    case 2:
                        mon = MONS_WAR_DOG;
                        break;
                    case 3:
                    case 4:
                        mon = MONS_HOUND;
                        break;
                    default:
                        mon = MONS_JACKAL;
                        break;
                    }
                }
            }
            case SPELL_SUMMON_ICE_BEAST:
                mon = MONS_ICE_BEAST;
                break;
            case SPELL_SUMMON_UGLY_THING:
            {
                const int chance = std::max(6 - (pow / 12), 1);
                mon = (one_chance_in(chance)) ? MONS_VERY_UGLY_THING
                                              : MONS_UGLY_THING;
                break;
            }
            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%
                break;
            }
            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;
        }
        if (i == 0 && (spell == SPELL_SUMMON_DEMON
            || spell == SPELL_DEMONIC_HORDE
            || spell == SPELL_SUMMON_GREATER_DEMON))
        {
            mpr("You open a gate to Pandemonium!");
        }
        if (summon_general_creature(pow, quiet, mon, beha,
                                    hostile, numsc, false))
        {
            success = true;
        }
    }
    return success;
}