fiddlerwoaroof/crawl - Change XMQ2SLCLZOJMBDJYLSQKQRJ3FGLMEEESBS4N3C2LD4Y4BFHRU4HQC

Move most of the demon-summoning routines to spells3.cc, since they're

unholy.

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

Created by dolorous on June 8, 2008

XMQ2SLCLZOJMBDJYLSQKQRJ3FGLMEEESBS4N3C2LD4Y4BFHRU4HQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1484 [8.293070]
B:BD[7.276] → [7.276:346]
```
        break;
    case SPELL_CALL_IMP:
        cast_call_imp(powc);
```
Deletion in crawl-ref/source/spl-cast.cc at line 1493 [8.293070]
B:BD[4.265] → [4.265:281]
∅:D[4.281] → [9.161:190]
B:BD[10.244] → [9.161:190]
B:BD[9.190] → [11.161:210]
∅:D[11.210] → [12.161:191]
B:BD[9.190] → [12.161:191]
B:BD[12.191] → [11.211:245]
```
        break;
    case SPELL_SUMMON_DEMON:
        cast_summon_demon(powc);
        break;
    case SPELL_DEMONIC_HORDE:
        cast_demonic_horde(powc);
```
Deletion in crawl-ref/source/spl-cast.cc at line 1501 [8.293070]
B:BD[13.233] → [13.233:249]
B:BD[13.249] → [14.161:239]
```
        break;
    case SPELL_SUMMON_GREATER_DEMON:
        cast_summon_greater_demon(powc);
```

Insertion in crawl-ref/source/spl-cast.cc at line 1522 [8.293070]

[6.338]

[15.161]

        break;
    case SPELL_CALL_IMP:
        cast_call_imp(powc);
        break;
    case SPELL_SUMMON_DEMON:
        cast_summon_demon(powc);
        break;
    case SPELL_DEMONIC_HORDE:
        cast_demonic_horde(powc);
        break;
    case SPELL_SUMMON_GREATER_DEMON:
        cast_summon_greater_demon(powc);

Insertion in crawl-ref/source/spells3.h at line 115 [8.526814]

[5.561]

bool cast_call_imp(int pow, bool god_gift = false);
bool summon_lesser_demon(int pow, bool god_gift = false);
bool summon_common_demon(int pow, bool god_gift = false);
bool summon_greater_demon(int pow, bool god_gift = false);
bool cast_summon_demon(int pow, bool god_gift = false);
bool cast_demonic_horde(int pow, bool god_gift = false);
bool cast_summon_greater_demon(int pow, bool god_gift = false);

Insertion in crawl-ref/source/spells3.cc at line 410 [8.531613]

[8.540870]

[8.541125]

    }
    return (success);
}
bool cast_call_imp(int pow, bool god_gift)
{
    bool success = false;
    monster_type mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                       (one_chance_in(7)) ? MONS_SHADOW_IMP
                                          : MONS_IMP;
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    if (create_monster(
            mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                      you.pet_target,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)
    {
        success = true;
        mpr((mon == MONS_WHITE_IMP)  ? "A beastly little devil appears in a puff of frigid air." :
            (mon == MONS_SHADOW_IMP) ? "A shadowy apparition takes form in the air."
                                     : "A beastly little devil appears in a puff of flame.");
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
static bool _summon_demon_class_wrapper(int pow, bool god_gift,
                                        demon_class_type dct, int dur,
                                        bool friendly, bool charmed)
{
    bool success = false;
    mpr("You open a gate to Pandemonium!");
    monster_type mon = summon_any_demon(dct);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY :
                          charmed ? BEH_CHARMED : 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 ? "" :
                 charmed ? " You don't feel so good about this..."
                         : " It doesn't look very happy.");
    }
    return (success);
}
bool summon_lesser_demon(int pow, bool god_gift)
{
    return _summon_demon_class_wrapper(pow, god_gift, DEMON_LESSER,
                                       std::min(2 + (random2(pow) / 4), 6),
                                       random2(pow) > 3, false);
}
bool summon_common_demon(int pow, bool god_gift)
{
    return _summon_demon_class_wrapper(pow, god_gift, DEMON_COMMON,
                                       std::min(2 + (random2(pow) / 4), 6),
                                       random2(pow) > 3, false);
}
bool summon_greater_demon(int pow, bool god_gift)
{
    return _summon_demon_class_wrapper(pow, god_gift, DEMON_GREATER,
                                       5, false, random2(pow) > 5);
}
bool cast_summon_demon(int pow, bool god_gift)
{
    mpr("You open a gate to Pandemonium!");
    bool success = summon_common_demon(pow, god_gift);
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
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_lesser_demon(pow, god_gift))
            success = true;

Insertion in crawl-ref/source/spells3.cc at line 516 [8.531613]
[8.541131]
[8.541131]
```
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
```

Insertion in crawl-ref/source/spells3.cc at line 522 [8.531613]

[5.744]


bool cast_summon_greater_demon(int pow, bool god_gift)
{
    mpr("You open a gate to Pandemonium!");

Insertion in crawl-ref/source/spells3.cc at line 527 [8.531613]

[5.745]

    bool success = summon_greater_demon(pow, god_gift);
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}

Deletion in crawl-ref/source/spells2.h at line 148 [8.562867]
B:BD[7.1145] → [7.1145:1197]
```
bool cast_call_imp(int pow, bool god_gift = false);
```

Deletion in crawl-ref/source/spells2.h at line 149 [8.562867]

B:BD[16.169] → [16.169:227]

B:BD[16.228] → [16.228:286]

B:BD[16.287] → [16.287:346]

B:BD[11.328] → [11.328:384]

B:BD[11.385] → [11.385:442]

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

Deletion in crawl-ref/source/spells2.h at line 151 [8.562867]
B:BD[14.264] → [14.264:328]
```
bool cast_summon_greater_demon(int pow, bool god_gift = false);
```

Deletion in crawl-ref/source/spells2.cc at line 1678 [8.569242]

B:BD[7.1355] → [7.1355:2214]

B:BD[7.2214] → [17.383:389]

B:BD[17.389] → [2.169:178]

        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
bool cast_call_imp(int pow, bool god_gift)
{
    bool success = false;
    monster_type mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                       (one_chance_in(7)) ? MONS_SHADOW_IMP
                                          : MONS_IMP;
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    if (create_monster(
            mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                      you.pet_target,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)
    {
        success = true;
        mpr((mon == MONS_WHITE_IMP)  ? "A beastly little devil appears in a puff of frigid air." :
            (mon == MONS_SHADOW_IMP) ? "A shadowy apparition takes form in the air."
                                     : "A beastly little devil appears in a puff of flame.");
    }
    else

Deletion in crawl-ref/source/spells2.cc at line 1886 [8.569242]

B:BD[4.5243] → [4.5243:5246]

∅:D[4.5246] → [16.423:627]

B:BD[11.536] → [16.423:627]

∅:D[14.402] → [11.674:703]

∅:D[16.627] → [11.674:703]

∅:D[18.851] → [11.674:703]

B:BD[11.674] → [11.674:703]

B:BD[11.703] → [18.852:896]

∅:D[18.896] → [11.749:750]

B:BD[11.749] → [11.749:750]

B:BD[11.750] → [16.628:992]

∅:D[18.936] → [11.1017:1023]

∅:D[16.992] → [11.1017:1023]

B:BD[11.1017] → [11.1017:1023]

B:BD[11.1023] → [16.993:1017]

∅:D[16.1017] → [18.987:988]

B:BD[18.987] → [18.987:988]

B:BD[18.988] → [16.1018:1240]

∅:D[16.1240] → [11.1047:1048]

∅:D[18.1371] → [11.1047:1048]

B:BD[11.1047] → [11.1047:1048]

B:BD[11.1048] → [16.1241:1503]

∅:D[16.1503] → [7.2220:2221]

B:BD[7.2220] → [7.2220:2221]

B:BD[7.2221] → [16.1504:1766]

∅:D[16.1766] → [19.6262:6263]

B:BD[19.6262] → [19.6262:6263]

B:BD[19.6263] → [16.1767:1956]

∅:D[16.1956] → [19.6285:6287]

B:BD[19.6285] → [19.6285:6287]

B:BD[19.6287] → [20.330:331]

B:BD[20.331] → [11.1146:1240]

B:BD[11.1240] → [16.1957:2095]

∅:D[21.483] → [11.1424:1477]

∅:D[14.574] → [11.1424:1477]

∅:D[18.1630] → [11.1424:1477]

∅:D[16.2095] → [11.1424:1477]

B:BD[11.1424] → [11.1424:1477]

B:BD[11.1477] → [16.2096:2123]

∅:D[16.2123] → [11.1504:1590]

B:BD[11.1504] → [11.1504:1590]

B:BD[11.1877] → [11.1877:1878]

B:BD[11.1878] → [16.2124:2334]

}
static bool _summon_demon_class_wrapper(int pow, bool god_gift,
                                        demon_class_type dct, int dur,
                                        bool friendly, bool charmed)
{
    bool success = false;
    mpr("You open a gate to Pandemonium!");
    monster_type mon = summon_any_demon(dct);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY :
                          charmed ? BEH_CHARMED : 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 ? "" :
                 charmed ? " You don't feel so good about this..."
                         : " It doesn't look very happy.");
    }
    return (success);
}
bool summon_lesser_demon(int pow, bool god_gift)
{
    return _summon_demon_class_wrapper(pow, god_gift, DEMON_LESSER,
                                       std::min(2 + (random2(pow) / 4), 6),
                                       random2(pow) > 3, false);
}
bool summon_common_demon(int pow, bool god_gift)
{
    return _summon_demon_class_wrapper(pow, god_gift, DEMON_COMMON,
                                       std::min(2 + (random2(pow) / 4), 6),
                                       random2(pow) > 3, false);
}
bool summon_greater_demon(int pow, bool god_gift)
{
    return _summon_demon_class_wrapper(pow, god_gift, DEMON_GREATER,
                                       5, false, random2(pow) > 5);
}
bool cast_summon_demon(int pow, bool god_gift)
{
    mpr("You open a gate to Pandemonium!");
    bool success = summon_common_demon(pow, god_gift);
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
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_lesser_demon(pow, god_gift))
            success = true;
    }
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);

Deletion in crawl-ref/source/spells2.cc at line 1941 [8.569242]
B:BD[20.1670] → [14.636:694]
B:BD[14.947] → [18.1833:1877]
```
bool cast_summon_greater_demon(int pow, bool god_gift)
{
    mpr("You open a gate to Pandemonium!");
```
Deletion in crawl-ref/source/spells2.cc at line 1942 [8.569242]
B:BD[16.2336] → [3.169:225]
∅:D[3.225] → [20.1670:1671]
∅:D[14.980] → [20.1670:1671]
∅:D[18.1877] → [20.1670:1671]
∅:D[16.2480] → [20.1670:1671]
B:BD[20.1670] → [20.1670:1671]
B:BD[20.1671] → [16.2481:2563]
∅:D[18.1997] → [14.1088:1090]
∅:D[16.2563] → [14.1088:1090]
B:BD[14.1088] → [14.1088:1090]
∅:D[22.1041] → [23.1294:1295]
∅:D[14.1360] → [23.1294:1295]
B:BD[23.1294] → [23.1294:1295]
```
    bool success = summon_greater_demon(pow, god_gift);
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
```

Move most of the demon-summoning routines to spells3.cc, since they're

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1484 [8.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1493 [8.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1501 [8.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1522 [8.293070]

Insertion in crawl-ref/source/spells3.h at line 115 [8.526814]

Insertion in crawl-ref/source/spells3.cc at line 410 [8.531613]

Insertion in crawl-ref/source/spells3.cc at line 516 [8.531613]

Insertion in crawl-ref/source/spells3.cc at line 522 [8.531613]

Insertion in crawl-ref/source/spells3.cc at line 527 [8.531613]

Deletion in crawl-ref/source/spells2.h at line 148 [8.562867]

Deletion in crawl-ref/source/spells2.h at line 149 [8.562867]

Deletion in crawl-ref/source/spells2.h at line 151 [8.562867]

Deletion in crawl-ref/source/spells2.cc at line 1678 [8.569242]

Deletion in crawl-ref/source/spells2.cc at line 1886 [8.569242]

Deletion in crawl-ref/source/spells2.cc at line 1941 [8.569242]

Deletion in crawl-ref/source/spells2.cc at line 1942 [8.569242]