fiddlerwoaroof/crawl - Change N3NXT75G2JYKVON7ZTE3TG34BBWITCL2HHVQ6H7QREYCDTVQFSGAC

Clean up some more.

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

Created by dolorous on June 7, 2008

N3NXT75G2JYKVON7ZTE3TG34BBWITCL2HHVQ6H7QREYCDTVQFSGAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1007 [6.293070]
[5.129682]
[5.129682]
```
    // Remember that most holy spells don't yet use powc!
```
Deletion in crawl-ref/source/spl-cast.cc at line 1523 [6.293070]
∅:D[3.243] → [7.261:319]
∅:D[8.247] → [7.261:319]
∅:D[9.249] → [7.261:319]
∅:D[10.255] → [7.261:319]
B:BD[7.261] → [7.261:319]
```
    // Remember that most holy spells don't yet use powc!
```
Insertion in crawl-ref/source/spl-cast.cc at line 1524 [6.293070]
[11.311]
[11.311]
```
        cast_summon_guardian(powc);
        break;
```
Insertion in crawl-ref/source/spl-cast.cc at line 1528 [6.293070]
[11.340]
[12.193]
```
        cast_summon_daeva(powc);
        break;
```
Replacement in crawl-ref/source/spl-cast.cc at line 1532 [6.293070]
B:BD[12.223] → [13.161:213]
```
        summon_general_creature_spell(spell, powc);
```
[12.223]
[6.328176]
```
        cast_summon_dragon(powc);
```

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

[3.406]

[14.1722]


bool cast_summon_guardian(int pow, bool god_gift = false);
bool cast_summon_daeva(int pow, bool god_gift = false);
bool cast_summon_dragon(int pow, bool god_gift = false);
bool summon_minor_demon(int pow, bool god_gift = false);

Replacement in crawl-ref/source/spells2.h at line 174 [6.562867]

∅:D[14.1723] → [13.221:342]

B:BD[6.567617] → [13.221:342]

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

[14.1723]

[13.342]

bool summon_demon(int pow, bool god_gift = false);

Replacement in crawl-ref/source/spells2.h at line 176 [6.562867]

∅:D[13.343] → [15.599:667]

B:BD[6.567617] → [15.599:667]

B:BD[15.667] → [16.168:297]

bool summon_general_creature(int pow, bool quiet, monster_type mon,
                             beh_type beha, int hostile = -1, int dur = -1,
                             bool god_gift = false);

[13.343]

[6.567662]

bool summon_specific_demon(monster_type mon, int pow, bool god_gift = false);

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

B:BD[7.616] → [10.330:402]

                                  int dur, bool friendly, bool charmed)

[7.616]

[7.674]

                                  int dur, bool friendly, bool charmed,
                                  int how_many)

Replacement in crawl-ref/source/spells2.cc at line 1898 [6.569242]
B:BD[7.703] → [7.703:749]
```
    monster_type mon = summon_any_demon(dct);
```
[7.703]
[7.749]
```
    mpr("You open a gate to Pandemonium!");
```

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

B:BD[7.750] → [7.750:801]

B:BD[7.801] → [10.403:514]

∅:D[10.514] → [7.862:1017]

B:BD[7.862] → [7.862:1017]

    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)

[7.750]

[7.1017]

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

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

B:BD[7.1023] → [7.1023:1047]

        success = true;

[7.1023]

[7.1047]

        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;

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

B:BD[7.1048] → [7.1048:1145]

        mprf("A demon appears!%s",
             friendly ? "" : " It doesn't look very happy.");

[7.1048]

[17.2214]

            mprf("A demon appears!%s",
                 friendly ? "" :
                     charmed ? " You don't feel so good about this..."
                             : " It doesn't look very happy.");
        }

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

B:BD[7.1240] → [7.1240:1372]

B:BD[7.1372] → [10.515:574]

    return _summon_demon_wrapper(pow, god_gift, DEMON_COMMON,
                                 std::min(2 + (random2(pow) / 4), 6),
                                 random2(pow) > 3, false);

[7.1240]

[7.1424]

    return summon_demon(pow, god_gift);

Deletion in crawl-ref/source/spells2.cc at line 1936 [6.569242]
B:BD[7.1477] → [7.1477:1504]
```
    bool success = false;
```

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

B:BD[7.1590] → [7.1590:1636]

B:BD[7.1636] → [2.169:232]

∅:D[2.232] → [7.1699:1770]

B:BD[7.1699] → [7.1699:1770]

B:BD[7.1770] → [10.575:635]

∅:D[10.635] → [7.1823:1877]

B:BD[7.1823] → [7.1823:1877]


    for (int i = 0; i < how_many; ++i)
    {
        if (_summon_demon_wrapper(pow, god_gift, DEMON_LESSER,
                                  std::min(2 + (random2(pow) / 4), 6),
                                  random2(pow) > 3, false))
        {
            success = true;
        }
    }

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

B:BD[7.1878] → [7.1878:1900]

    return (success);

[7.1878]

[7.1900]

    return _summon_demon_wrapper(pow, god_gift, DEMON_LESSER,
                                 std::min(2 + (random2(pow) / 4), 6),
                                 random2(pow) > 3, false, how_many);

Deletion in crawl-ref/source/spells2.cc at line 2001 [6.569242]
B:BD[10.694] → [10.694:766]
```
    bool success = false;
    mpr("You open a gate to Pandemonium!");
```

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

B:BD[10.805] → [10.805:946]


    if (_summon_demon_wrapper(pow, god_gift, DEMON_GREATER,
                              5, false, charmed))
    {
        success = true;

Replacement in crawl-ref/source/spells2.cc at line 2003 [6.569242]
B:BD[10.947] → [10.947:980]
```
        mpr("A demon appears!");
```
[10.947]
[18.1670]
```
    mpr("You open a gate to Pandemonium!");
```

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

B:BD[18.1671] → [10.981:1088]

        if (charmed)
            mpr("You don't feel so good about this...");
    }
    return (success);

[18.1671]

[10.1088]

    return _summon_demon_wrapper(pow, god_gift, DEMON_GREATER,
                                 5, false, charmed, 1);

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

B:BD[13.4980] → [3.1555:1667]

bool summon_general_creature_spell(spell_type spell, int pow,
                                   bool god_gift)

[13.4980]

[3.1667]

static bool _summon_holy_being_wrapper(int pow, bool god_gift,
                                       holy_being_class_type hbct)

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

B:BD[13.5075] → [3.1696:1737]

    monster_type mon = MONS_PROGRAM_BUG;

[13.5075]

[13.5171]

    monster_type mon = summon_any_holy_being(hbct);
    const int dur = std::min(2 + (random2(pow) / 4), 6);

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

B:BD[13.5172] → [3.1738:1846]

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

[13.5172]

[13.5447]

    mprf("You open a gate to %s's realm!",
         (mon == MONS_DAEVA) ? god_name(GOD_SHINING_ONE).c_str()
                             : god_name(GOD_ZIN).c_str());

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

B:BD[13.5448] → [3.1847:1866]

    switch (spell)

[13.5448]

[3.1866]

    int monster = create_monster(
                      mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                                you.pet_target,
                                god_gift ? MF_GOD_GIFT : 0));
    if (monster != -1)

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

B:BD[3.1872] → [3.1872:2040]

        case SPELL_SUMMON_GUARDIAN:
            mon = MONS_ANGEL;
            break;
        case SPELL_SUMMON_DAEVA:
            mon = MONS_DAEVA;
            break;

[3.1872]

[3.2040]

        success = true;

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

B:BD[3.2041] → [3.2041:2125]

        case SPELL_SUMMON_DRAGON:
            mon = MONS_DRAGON;
            break;

[3.2041]

[3.2125]

        monsters *summon = &menv[monster];
        summon->flags |= MF_ATT_CHANGE_ATTEMPT;

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

B:BD[3.2126] → [3.2126:2162]

∅:D[3.2162] → [13.5615:5622]

B:BD[13.5615] → [13.5615:5622]

B:BD[13.5622] → [3.2163:2279]

∅:D[3.2279] → [19.219:225]

B:BD[19.219] → [19.219:225]

B:BD[19.225] → [3.2280:2304]

        default:
            break;
    }
    if (summon_general_creature(pow, false, mon, BEH_FRIENDLY,
                                hostile, -1, false))
    {
        success = true;

[3.2126]

[19.526]

        mprf("You are momentarily dazzled by a brilliant %s light.",
             (mon == MONS_DAEVA) ? "golden"
                                 : "white");

Insertion in crawl-ref/source/spells2.cc at line 2076 [6.569242]
[19.532]
[19.532]
```
    else
        canned_msg(MSG_NOTHING_HAPPENS);
```

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

∅:D[13.5645] → [15.803:871]

B:BD[6.605084] → [15.803:871]

B:BD[15.871] → [16.631:741]

bool summon_general_creature(int pow, bool quiet, monster_type mon,
                             beh_type beha, int hostile, int dur,
                             bool god_gift)

[13.5645]

[20.429]

bool cast_summon_guardian(int pow, bool god_gift)

Replacement in crawl-ref/source/spells2.cc at line 2084 [6.569242]
B:BD[20.431] → [21.1293:1348]
∅:D[21.1348] → [22.1148:1176]
B:BD[22.1148] → [22.1148:1176]
```
    if (beha != BEH_HOSTILE && random2(pow) > hostile)
        beha = BEH_HOSTILE;
```
[20.431]
[22.1176]
```
    return _summon_holy_being_wrapper(pow, god_gift, HOLY_BEING_ANGEL);
}
```

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

B:BD[22.1177] → [16.742:812]

    if (dur == -1)
        dur = std::min(2 + (random2(pow) / 4), 6);

[22.1177]

[22.1251]

bool cast_summon_daeva(int pow, bool god_gift)
{
    return _summon_holy_being_wrapper(pow, god_gift, HOLY_BEING_DAEVA);
}

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

∅:D[22.1252] → [23.4034:4114]

B:BD[24.672] → [23.4034:4114]

B:BD[23.4114] → [15.987:988]

    unsigned short hitting = (beha == BEH_FRIENDLY) ? you.pet_target : MHITYOU;

[22.1252]

[23.4114]

bool cast_summon_dragon(int pow, bool god_gift)
{
    // Removed the chance of multiple dragons... one should be more
    // than enough, and if it isn't, the player can cast again...
    // especially since these aren't on the Abjuration plan... they'll
    // last until they die (maybe that should be changed, but this is
    // a very high level spell so it might be okay).  -- bwr

Replacement in crawl-ref/source/spells2.cc at line 2101 [6.569242]
B:BD[25.1340] → [25.1340:1366]
```
    std::string msg = "";
```
[25.1340]
[6.605268]
```
    const bool friendly = (random2(pow) > 5);
```

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

B:BD[6.605269] → [23.4141:4158]

    switch (mon)

[6.605269]

[6.605286]

    if (create_monster(
            mgen_data(MONS_DRAGON,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE, 3,
                      you.pos(),
                      friendly ? you.pet_target : MHITYOU)) != -1)

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

∅:D[15.1275] → [26.885:906]

B:BD[6.605380] → [26.885:906]

B:BD[26.906] → [25.1695:1744]

∅:D[26.954] → [6.605466:605481]

∅:D[25.1744] → [6.605466:605481]

B:BD[6.605466] → [6.605466:605481]

    case MONS_ANGEL:
        msg = "You open a gate to Zin's realm!";
        break;

[6.605292]

[6.605481]

        success = true;
        mprf("A dragon appears.%s",
            friendly ? "" : " It doesn't look very happy.");
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);

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

B:BD[6.605482] → [26.955:976]

B:BD[26.976] → [25.1745:1819]

∅:D[26.1049] → [11.1878:1893]

∅:D[25.1819] → [11.1878:1893]

B:BD[6.605681] → [11.1878:1893]

    case MONS_DAEVA:
        msg = "You are momentarily dazzled by a brilliant golden light.";
        break;

[6.605482]

[11.1893]

    return (success);
}
bool summon_minor_demon(int pow, bool god_gift)
{
    return _summon_demon_wrapper(pow, god_gift, DEMON_LESSER,
                                 std::min(2 + (random2(pow) / 4), 6),
                                 random2(pow) > 3, false, 1);
}

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

B:BD[11.1894] → [12.1438:1510]

    case MONS_DRAGON:
        msg = "A dragon appears.";
        break;

[11.1894]

[12.1510]

bool summon_demon(int pow, bool god_gift)
{
    return _summon_demon_wrapper(pow, god_gift, DEMON_COMMON,
                                 std::min(2 + (random2(pow) / 4), 6),
                                 random2(pow) > 3, false, 1);
}

Replacement in crawl-ref/source/spells2.cc at line 2134 [6.569242]
∅:D[12.1511] → [6.605897:605910]
B:BD[6.605897] → [6.605897:605910]
B:BD[6.605910] → [27.1901:1907]
B:BD[27.1907] → [15.1276:1310]
∅:D[15.1310] → [6.606073:606088]
B:BD[6.606073] → [6.606073:606088]
B:BD[6.606088] → [27.2073:2079]
∅:D[27.2079] → [6.606089:606095]
B:BD[6.606089] → [6.606089:606095]
```
    default:
    {
        msg = "A demon appears!";
        break;
    }
    }
```
[12.1511]
[6.606095]
```
bool summon_specific_demon(monster_type mon, int pow, bool god_gift)
{
    bool success = false;
```

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

B:BD[6.606096] → [3.2305:2381]

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

[6.606096]

[15.1387]

    const int dur = std::min(2 + (random2(pow) / 4), 6);

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

∅:D[15.1388] → [28.8237:8279]

B:BD[6.606096] → [28.8237:8279]

B:BD[28.8279] → [16.813:851]

∅:D[16.851] → [23.4199:4293]

B:BD[23.4199] → [23.4199:4293]

    int monster =
        create_monster(
            mgen_data(mon, beha, dur,
                      you.pos(), hitting,
                      god_gift ? MF_GOD_GIFT : 0));

[15.1388]

[23.4293]

    const bool friendly = (random2(pow) > 3);

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

∅:D[23.4294] → [29.401:424]

∅:D[28.8364] → [29.401:424]

B:BD[29.401] → [29.401:424]

    if (monster != -1)

[23.4294]

[29.424]

    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)

Deletion in crawl-ref/source/spells2.cc at line 2149 [6.569242]
B:BD[29.430] → [15.1389:1447]
```
        if (!quiet)
            mprf("%s", msg.c_str());
```
Replacement in crawl-ref/source/spells2.cc at line 2151 [6.569242]
∅:D[25.2194] → [23.4320:4363]
B:BD[23.4320] → [23.4320:4363]
∅:D[23.4363] → [29.515:516]
B:BD[29.515] → [29.515:516]
B:BD[29.516] → [3.2382:2434]
∅:D[19.565] → [23.4395:4447]
∅:D[12.2179] → [23.4395:4447]
∅:D[3.2434] → [23.4395:4447]
B:BD[23.4395] → [23.4395:4447]
```
        monsters *summon = &menv[monster];
        if (mon == MONS_ANGEL || mon == MONS_DAEVA)
            summon->flags |= MF_ATT_CHANGE_ATTEMPT;
```
[23.4320]
[29.575]
```
        mprf("A demon appears!%s",
             friendly ? "" : " It doesn't look very happy.");
```

Replacement in crawl-ref/source/abl-show.cc at line 1280 [6.4494389]

B:BD[6.4516177] → [15.4071:4136]

∅:D[15.4136] → [11.5041:5105]

B:BD[11.5041] → [11.5041:5105]

B:BD[11.5105] → [25.4859:4906]

        summon_general_creature(you.experience_level * 4, false,
                                summon_any_demon(DEMON_LESSER),
                                BEH_FRIENDLY);

[6.4516177]

[6.4516304]

        summon_minor_demon(you.experience_level * 4);

Replacement in crawl-ref/source/abl-show.cc at line 1284 [6.4494389]

∅:D[4.2922] → [15.4137:4202]

B:BD[5.1283118] → [15.4137:4202]

∅:D[15.4202] → [11.5218:5282]

B:BD[11.5218] → [11.5218:5282]

B:BD[11.5282] → [25.4907:4954]

        summon_general_creature(you.experience_level * 4, false,
                                summon_any_demon(DEMON_COMMON),
                                BEH_FRIENDLY);

[4.2922]

[6.4516475]

        summon_demon(you.experience_level * 4);

Replacement in crawl-ref/source/abl-show.cc at line 1437 [6.4494389]

B:BD[6.4521266] → [15.4203:4274]

∅:D[15.4274] → [11.5401:5466]

B:BD[11.5401] → [11.5401:5466]

        summon_general_creature(you.skills[SK_INVOCATIONS] * 4, false,
                                MONS_DAEVA, BEH_FRIENDLY, true);

[6.4521266]

[6.4521340]

        cast_summon_daeva(you.skills[SK_INVOCATIONS] * 4, true);

Replacement in crawl-ref/source/abl-show.cc at line 1459 [6.4494389]

B:BD[6.4521858] → [15.4275:4351]

∅:D[15.4351] → [11.5536:5602]

B:BD[11.5536] → [11.5536:5602]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false,
                                MONS_REAPER, BEH_FRIENDLY, true);

[6.4521858]

[6.4521938]

        summon_specific_demon(MONS_REAPER,
                              20 + you.skills[SK_INVOCATIONS] * 3, true);

Replacement in crawl-ref/source/abl-show.cc at line 1540 [6.4494389]

B:BD[6.4524574] → [15.4352:4428]

∅:D[15.4428] → [11.5672:5848]

B:BD[11.5672] → [11.5672:5848]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false,
                                static_cast<monster_type>(
                                    MONS_NEQOXEC + random2(5)),
                                BEH_FRIENDLY, true);

[6.4524574]

[6.4524701]

        summon_specific_demon(static_cast<monster_type>(
                                  MONS_NEQOXEC + random2(5)),
                              20 + you.skills[SK_INVOCATIONS] * 3, true);

Replacement in crawl-ref/source/abl-show.cc at line 1600 [6.4494389]

B:BD[6.4526722] → [15.4429:4505]

∅:D[15.4505] → [11.5918:6098]

B:BD[11.5918] → [11.5918:6098]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false,
                                static_cast<monster_type>(
                                    MONS_EXECUTIONER + random2(5)),
                                BEH_FRIENDLY, true);

[6.4526722]

[6.4526853]

        summon_specific_demon(static_cast<monster_type>(
                                  MONS_EXECUTIONER + random2(5)),
                              20 + you.skills[SK_INVOCATIONS] * 3, true);