fiddlerwoaroof/crawl - Change 7KBQYZSNXBMQGEEOAZI6YU34XZ5ECFGTJA32QIJDZP2NYS3SF3IQC

Consolidate the demon-summoning routines again.

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

Created by dolorous on June 7, 2008

7KBQYZSNXBMQGEEOAZI6YU34XZ5ECFGTJA32QIJDZP2NYS3SF3IQC

Dependencies

In channels

main

Change contents

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

[3.320]

[4.327]


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);

Deletion in crawl-ref/source/spells2.h at line 173 [5.562867]
B:BD[6.540] → [6.540:598]
∅:D[7.319] → [8.1722:1723]
∅:D[9.328] → [8.1722:1723]
∅:D[10.328] → [8.1722:1723]
∅:D[3.381] → [8.1722:1723]
∅:D[11.406] → [8.1722:1723]
∅:D[6.598] → [8.1722:1723]
∅:D[12.1197] → [8.1722:1723]
B:BD[8.1722] → [8.1722:1723]
B:BD[8.1723] → [13.168:226]
```
bool summon_minor_demon(int pow, bool god_gift = false);
bool summon_common_demon(int pow, bool god_gift = false);
```

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

B:BD[14.343] → [2.168:237]

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

[14.343]

[15.168]

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

Replacement in crawl-ref/source/spells2.cc at line 1891 [5.569242]

B:BD[4.536] → [4.536:616]

B:BD[4.616] → [6.731:851]

static bool _summon_demon_wrapper(int pow, bool god_gift, demon_class_type dct,
                                  int dur, bool friendly, bool charmed,
                                  int how_many)

[4.536]

[4.674]

static bool _summon_demon_class_wrapper(int pow, bool god_gift,
                                        demon_class_type dct, int dur,
                                        bool friendly, bool charmed)

Replacement in crawl-ref/source/spells2.cc at line 1899 [5.569242]

B:BD[4.750] → [6.897:936]

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

[4.750]

[4.1017]

    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)

Replacement in crawl-ref/source/spells2.cc at line 1909 [5.569242]
B:BD[4.1023] → [6.937:987]
```
        monster_type mon = summon_any_demon(dct);
```
[4.1023]
[6.987]
```
        success = true;
```

Replacement in crawl-ref/source/spells2.cc at line 1911 [5.569242]

B:BD[6.988] → [6.988:1371]

        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;

[6.988]

[4.1047]

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

Replacement in crawl-ref/source/spells2.cc at line 1920 [5.569242]

B:BD[4.1048] → [6.1372:1589]

∅:D[4.1145] → [12.2214:2220]

∅:D[6.1589] → [12.2214:2220]

B:BD[12.2214] → [12.2214:2220]

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

[4.1048]

[12.2220]

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);
}

Replacement in crawl-ref/source/spells2.cc at line 1927 [5.569242]

B:BD[12.2221] → [12.2221:2239]

∅:D[12.2239] → [8.6221:6262]

B:BD[8.6221] → [8.6221:6262]

    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);

[12.2221]

[8.6262]

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);
}

Replacement in crawl-ref/source/spells2.cc at line 1934 [5.569242]

B:BD[8.6263] → [8.6263:6285]

    return (success);

[8.6263]

[8.6285]

bool summon_greater_demon(int pow, bool god_gift)
{
    return _summon_demon_class_wrapper(pow, god_gift, DEMON_GREATER,
                                       5, false, random2(pow) > 5);

Replacement in crawl-ref/source/spells2.cc at line 1944 [5.569242]

B:BD[4.1240] → [13.436:483]

    return summon_common_demon(pow, god_gift);

[4.1240]

[4.1424]

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

Insertion in crawl-ref/source/spells2.cc at line 1954 [5.569242]
[4.1477]
[4.1504]
```
    bool success = false;
```

Replacement in crawl-ref/source/spells2.cc at line 1960 [5.569242]

B:BD[4.1878] → [6.1631:1832]

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

[4.1878]

[4.1900]

    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);

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

[6.1877]

[9.1670]


    bool success = _summon_demon_class_wrapper(pow, god_gift, DEMON_GREATER,
                                               5, false, charmed);

Replacement in crawl-ref/source/spells2.cc at line 2035 [5.569242]

B:BD[9.1671] → [6.1878:1997]

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

[9.1671]

[10.1088]

    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);

Replacement in crawl-ref/source/spells2.cc at line 2108 [5.569242]

B:BD[6.4082] → [6.4082:4130]

bool summon_minor_demon(int pow, bool god_gift)

[6.4082]

[6.4130]

// A demon-associated god sends a demonic buddy (or enemy) for a follower.
bool summon_demon_type(monster_type mon, int pow, bool god_gift)

Deletion in crawl-ref/source/spells2.cc at line 2111 [5.569242]

B:BD[6.4132] → [6.4132:4328]

∅:D[6.4328] → [16.1893:1894]

B:BD[16.1893] → [16.1893:1894]

B:BD[16.1894] → [13.484:533]

∅:D[13.533] → [6.4371:4569]

B:BD[6.4371] → [6.4371:4569]

∅:D[6.4569] → [17.1510:1511]

B:BD[17.1510] → [17.1510:1511]

B:BD[17.1511] → [15.475:541]

B:BD[15.541] → [2.520:580]

∅:D[2.580] → [6.4639:4641]

∅:D[13.645] → [6.4639:4641]

B:BD[6.4639] → [6.4639:4641]

    return _summon_demon_wrapper(pow, god_gift, DEMON_LESSER,
                                 std::min(2 + (random2(pow) / 4), 6),
                                 random2(pow) > 3, false, 1);
}
bool summon_common_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);
}
// One of the demon-associated gods sends a demon for a follower.
bool summon_demon(monster_type mon, int pow, bool god_gift)
{

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

B:BD[5.4516177] → [6.7740:7794]

        summon_minor_demon(you.experience_level * 4);

[5.4516177]

[5.4516304]

        summon_lesser_demon(you.experience_level * 4);

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

B:BD[5.4521858] → [2.5851:5929]

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

[5.4521858]

[5.4521938]

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

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

B:BD[5.4524574] → [13.4079:4154]

B:BD[13.4154] → [2.5930:6004]

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

[5.4524574]

[5.4524701]

        summon_demon_type(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 1599 [5.4494389]

B:BD[5.4526722] → [13.4223:4302]

B:BD[13.4302] → [2.6005:6079]

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

[5.4526722]

[5.4526853]

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