fiddlerwoaroof/crawl - Change DZD6YG52TXNI4CJ2FRGFULBH6G5MDLRVQV3X3V35AW533Z3TVBKAC

Add more summoning-related cleanups.

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

Created by dolorous on June 9, 2008

DZD6YG52TXNI4CJ2FRGFULBH6G5MDLRVQV3X3V35AW533Z3TVBKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 426 [4.531613]
B:BD[3.1233] → [3.1233:1257]
```
    if (create_monster(
```
[3.1233]
[3.1257]
```
    const int monster =
        create_monster(
```

Replacement in crawl-ref/source/spells3.cc at line 430 [4.531613]

B:BD[3.1352] → [2.456:514]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

[3.1352]

[3.1410]

                      (god_gift ? MG_GOD_GIFT : 0) | MG_FORCE_BEH));
    if (monster != -1)

Insertion in crawl-ref/source/spells3.cc at line 439 [4.531613]
[3.1719]
[3.1719]
```
        player_angers_monster(&menv[monster]);
```

Replacement in crawl-ref/source/spells3.cc at line 448 [4.531613]

B:BD[3.1801] → [3.1801:2005]

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

[3.1801]

[3.2005]

static bool _summon_demon_wrapper(int pow, bool god_gift, monster_type mon,
                                  int dur, bool friendly, bool charmed)

Replacement in crawl-ref/source/spells3.cc at line 453 [4.531613]

B:BD[3.2034] → [3.2034:2150]

    mpr("You open a gate to Pandemonium!");
    monster_type mon = summon_any_demon(dct);
    if (create_monster(

[3.2034]

[3.2150]

    const int monster =
        create_monster(

Replacement in crawl-ref/source/spells3.cc at line 460 [4.531613]

B:BD[3.2385] → [2.515:573]

                      god_gift ? MG_GOD_GIFT : 0)) != -1)

[3.2385]

[3.2443]

                      (god_gift ? MG_GOD_GIFT : 0) | MG_FORCE_BEH));
    if (monster != -1)

Replacement in crawl-ref/source/spells3.cc at line 466 [4.531613]

B:BD[3.2474] → [3.2474:2665]

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

[3.2474]

[3.2665]

        mprf("A demon appears!");
        if (!player_angers_monster(&menv[monster]) && !friendly)
        {
            mpr(charmed ? "You don't feel so good about this..."
                        : "It doesn't look very happy.");
        }

Insertion in crawl-ref/source/spells3.cc at line 476 [4.531613]

[3.2694]

}
static bool _summon_demon_wrapper(int pow, bool god_gift, demon_class_type dct,
                                  int dur, bool friendly, bool charmed)
{
    monster_type mon = summon_any_demon(dct);
    return _summon_demon_wrapper(pow, god_gift, mon, dur, friendly, charmed);

Replacement in crawl-ref/source/spells3.cc at line 488 [4.531613]

B:BD[3.2748] → [3.2748:2957]

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

[3.2748]

[3.2957]

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

Replacement in crawl-ref/source/spells3.cc at line 495 [4.531613]

B:BD[3.3011] → [3.3011:3220]

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

[3.3011]

[3.3220]

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

Replacement in crawl-ref/source/spells3.cc at line 502 [4.531613]

B:BD[3.3275] → [3.3275:3412]

    return _summon_demon_class_wrapper(pow, god_gift, DEMON_GREATER,
                                       5, false, random2(pow) > 5);

[3.3275]

[3.3412]

    return _summon_demon_wrapper(pow, god_gift, DEMON_GREATER,
                                 5, false, random2(pow) > 5);
}
// Makhleb or Kikubaaqudgha sends a demonic buddy (or enemy) for a
// follower.
bool summon_demon_type(monster_type mon, int pow, bool god_gift)
{
    return _summon_demon_wrapper(pow, god_gift, mon,
                                 std::min(2 + (random2(pow) / 4), 6),
                                 false, random2(pow) > 3);

Replacement in crawl-ref/source/spells3.cc at line 559 [4.531613]

B:BD[5.309] → [5.309:454]

// Makhleb or Kikubaaqudgha sends a demonic buddy (or enemy) for a
// follower.
bool summon_demon_type(monster_type mon, int pow, bool god_gift)

[5.309]

[5.454]

bool cast_shadow_creatures(bool god_gift)

Replacement in crawl-ref/source/spells3.cc at line 563 [4.531613]

B:BD[5.483] → [5.483:587]

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

[5.483]

[5.587]

    const int monster =
        create_monster(
            mgen_data(RANDOM_MONSTER, BEH_FRIENDLY, 2,
                      you.pos(), you.pet_target,
                      (god_gift ? MG_GOD_GIFT : 0) | MG_FORCE_BEH));

Replacement in crawl-ref/source/spells3.cc at line 569 [4.531613]

B:BD[5.588] → [5.588:797]

B:BD[5.797] → [2.574:632]

    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      god_gift ? MG_GOD_GIFT : 0)) != -1)

[5.588]

[5.855]

    if (monster != -1)

Deletion in crawl-ref/source/spells3.cc at line 572 [4.531613]

B:BD[5.885] → [5.885:983]

B:BD[5.983] → [6.302:358]


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

Replacement in crawl-ref/source/spells3.cc at line 573 [4.531613]
B:BD[6.359] → [6.359:383]
```
    return (success);
}
```
[6.359]
[6.383]
```
        mpr("Wisps of shadow whirl around you...");
```

Replacement in crawl-ref/source/spells3.cc at line 575 [4.531613]

B:BD[6.384] → [6.384:581]

B:BD[6.581] → [2.633:690]

∅:D[2.690] → [6.638:721]

B:BD[6.638] → [6.638:721]

bool cast_shadow_creatures(bool god_gift)
{
    bool success = false;
    if (create_monster(
           mgen_data(RANDOM_MONSTER, BEH_FRIENDLY, 2,
                     you.pos(), you.pet_target,
                     god_gift ? MG_GOD_GIFT : 0)) != -1)
    {
        success = true;
        mpr("Wisps of shadow whirl around you...");

[6.384]

[5.983]

        player_angers_monster(&menv[monster]);

Replacement in crawl-ref/source/spells3.cc at line 837 [4.531613]

B:BD[7.7279] → [7.7279:7407]

B:BD[7.7407] → [2.815:867]

∅:D[2.867] → [7.7459:7506]

B:BD[7.7459] → [7.7459:7506]

    int monster = create_monster(
                    mgen_data(mon, beha, 0,
                        coord_def(x, y), hitting,
                        god_gift ? MG_GOD_GIFT : 0,
                        zombie_type, number));

[7.7279]

[7.7506]

    const int monster = create_monster(
                            mgen_data(mon, beha, 0,
                                      coord_def(x, y), hitting,
                                      god_gift ? MG_GOD_GIFT : 0,
                                      zombie_type, number));

Replacement in crawl-ref/source/spells3.cc at line 1136 [4.531613]

B:BD[8.2299] → [8.2299:2436]

B:BD[8.2436] → [2.927:977]

∅:D[2.977] → [8.2486:2539]

B:BD[8.2486] → [8.2486:2539]

    int monster = create_monster(
                      mgen_data(mon, BEH_FRIENDLY, 0,
                      you.pos(), you.pet_target,
                      god_gift ? MG_GOD_GIFT : 0,
                      MONS_PROGRAM_BUG, 0, colour));

[8.2299]

[8.2539]

    const int monster = create_monster(
                            mgen_data(mon, BEH_FRIENDLY, 0,
                                      you.pos(), you.pet_target,
                                      god_gift ? MG_GOD_GIFT : 0,
                                      MONS_PROGRAM_BUG, 0, colour));

Replacement in crawl-ref/source/spells2.cc at line 1241 [4.569242]

B:BD[9.3091] → [9.3091:3199]

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

[9.3091]

[9.3199]

            mpr("A scorpion appears.");
            if (!friendly)
                mpr("It doesn't look very happy.");

Replacement in crawl-ref/source/spells2.cc at line 1329 [4.569242]

B:BD[9.6024] → [9.6024:6149]

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

[9.6024]

[9.6149]

                mpr("A swarming creature appears!");
                if (!friendly)
                    mpr("It doesn't look very happy.");

Replacement in crawl-ref/source/spells2.cc at line 1394 [4.569242]

B:BD[10.1625] → [10.1625:1723]

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

[10.1625]

[11.444]

        mpr("A canine appears!");
        if (!friendly)
            mpr("It doesn't look very happy.");

Replacement in crawl-ref/source/spells2.cc at line 1595 [4.569242]

B:BD[12.1139] → [12.1139:1350]

        mprf((mon == MONS_VERY_UGLY_THING) ? "A very ugly thing appears.%s"
                                           : "An ugly thing appears.%s",
             friendly ? "" : " It doesn't look very happy.");

[12.1139]

[13.1579]

        mpr((mon == MONS_VERY_UGLY_THING) ? "A very ugly thing appears."
                                          : "An ugly thing appears.");
        if (!friendly)
            mpr("It doesn't look very happy.");

Replacement in crawl-ref/source/spells2.cc at line 1627 [4.569242]

B:BD[14.3903] → [14.3903:4000]

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

[14.3903]

[15.336]

        mpr("A dragon appears.");
        if (!friendly)
            mpr("It doesn't look very happy.");