fiddlerwoaroof/crawl - Change UW6UG6U4J27IFH2472MBAU6BT7AUKO5YW7YOTYZ5KX4JRHUNORUAC

Revert some of the previous simplifications, as they make other things

more complicated.

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

Created by dolorous on June 7, 2008

UW6UG6U4J27IFH2472MBAU6BT7AUKO5YW7YOTYZ5KX4JRHUNORUAC

Dependencies

In channels

main

Change contents

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

B:BD[4.343] → [5.227:363]

bool summon_demon(monster_type mon, int pow, bool force_hostile = false,
                  bool quiet = false, bool permanent = false);

[4.343]

[3.168]

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

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

B:BD[3.169] → [3.169:229]

bool summon_berserker(int pow, bool force_hostile = false);

[3.169]

[6.567662]

bool summon_berserker(int pow, bool god_gift = false,
                      bool force_hostile = false);

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

B:BD[6.567663] → [3.230:354]

bool summon_guardian(int pow, bool force_hostile = false, bool quiet = false,
                     bool permanent = false);

[6.567663]

[3.354]

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

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

B:BD[3.355] → [3.355:473]

bool summon_daeva(int pow, bool force_hostile = false, bool quiet = false,
                  bool permanent = false);

[3.355]

[6.567663]

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

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

B:BD[7.2836] → [7.2836:2904]

                      friendly ? you.pet_target : MHITYOU )) != -1)

[7.2836]

[8.991]

                      friendly ? you.pet_target : MHITYOU)) != -1)

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

∅:D[3.541] → [5.534:645]

B:BD[9.1511] → [5.534:645]

bool summon_demon(monster_type mon, int pow, bool force_hostile,
                  bool quiet, bool permanent)

[3.541]

[10.4639]

bool summon_demon(monster_type mon, int pow, bool god_gift)

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

B:BD[11.1388] → [5.646:718]

    const bool friendly = (force_hostile) ? false : (random2(pow) > 3);

[11.1388]

[7.4293]

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

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

B:BD[10.4982] → [5.719:762]

                      MF_GOD_GIFT)) != -1)

[10.4982]

[12.424]

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

Replacement in crawl-ref/source/spells2.cc at line 2117 [6.569242]
∅:D[13.532] → [14.6504:6555]
B:BD[7.4542] → [14.6504:6555]
```
bool summon_berserker(int pow, bool force_hostile)
```
[13.532]
[15.4513]
```
bool summon_berserker(int pow, bool god_gift, bool force_hostile)
```

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

B:BD[14.6886] → [14.6886:6923]

                      MF_GOD_GIFT));

[14.6886]

[16.705]

                      god_gift ? MF_GOD_GIFT : 0));

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

B:BD[6.606235] → [13.533:735]

static bool _summon_holy_being_wrapper(int pow, holy_being_class_type hbct,
                                       bool force_hostile, bool quiet,
                                       bool permanent)

[6.606235]

[13.735]

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 2202 [6.569242]

B:BD[13.817] → [13.817:892]

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

[13.817]

[13.892]

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

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

B:BD[13.893] → [13.893:1100]

    if (!quiet)
    {
        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());
    }

[13.893]

[13.1100]

    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 2209 [6.569242]

B:BD[13.1135] → [13.1135:1419]

                      mgen_data(mon,
                                !force_hostile ? BEH_FRIENDLY : BEH_HOSTILE,
                                dur, you.pos(),
                                !force_hostile ? you.pet_target : MHITYOU,
                                MF_GOD_GIFT));

[13.1135]

[13.1419]

                      mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                                you.pet_target,
                                god_gift ? MF_GOD_GIFT : 0));

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

B:BD[13.1565] → [13.1565:1775]

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

[13.1565]

[13.1775]

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

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

B:BD[13.1845] → [13.1845:1944]

bool summon_guardian(int pow, bool force_hostile, bool quiet,
                     bool permanent)

[13.1845]

[13.1944]

bool summon_guardian(int pow, bool god_gift)

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

B:BD[13.1946] → [13.1946:2079]

    return _summon_holy_being_wrapper(pow, HOLY_BEING_ANGEL, force_hostile,
                                      quiet, permanent);

[13.1946]

[13.2079]

    return _summon_holy_being_wrapper(pow, god_gift, HOLY_BEING_ANGEL);

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

B:BD[13.2119] → [13.2119:2212]

bool summon_daeva(int pow, bool force_hostile, bool quiet,
                  bool permanent)

[13.2119]

[13.2212]

bool summon_daeva(int pow, bool god_gift)

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

B:BD[13.2214] → [13.2214:2347]

    return _summon_holy_being_wrapper(pow, HOLY_BEING_DAEVA, force_hostile,
                                      quiet, permanent);

[13.2214]

[13.2347]

    return _summon_holy_being_wrapper(pow, god_gift, HOLY_BEING_DAEVA);

Replacement in crawl-ref/source/religion.cc at line 3019 [6.804403]

B:BD[7.9397] → [13.4710:4761]

            if (summon_daeva(0, true, true, true))

[7.9397]

[17.2594]

            if (create_monster(
                    mgen_data::alert_hostile_at(MONS_DAEVA,
                        you.pos(), MF_GOD_GIFT)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3120 [6.804403]

B:BD[7.9839] → [13.4762:4820]

                if (summon_guardian(0, true, true, true))

[7.9839]

[18.2952]

                if (create_monster(
                        mgen_data::alert_hostile_at(MONS_ANGEL,
                            you.pos(), MF_GOD_GIFT)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3282 [6.804403]

B:BD[19.2864] → [5.3122:3283]

        bool success =
            summon_demon(
                static_cast<monster_type>(MONS_EXECUTIONER + random2(5)),
                0, true, true, true);

[19.2864]

[7.10409]

        bool success = (create_monster(
                           mgen_data::alert_hostile_at(
                               static_cast<monster_type>(
                                   MONS_EXECUTIONER + random2(5)),
                               you.pos(), MF_GOD_GIFT)) != -1);

Replacement in crawl-ref/source/religion.cc at line 3300 [6.804403]

B:BD[7.10890] → [5.3496:3642]

            if (summon_demon(
                    static_cast<monster_type>(MONS_NEQOXEC + random2(5)),
                    0, true, true, true))

[7.10890]

[7.10997]

            if (create_monster(
                   mgen_data::alert_hostile_at(
                       static_cast<monster_type>(
                           MONS_NEQOXEC + random2(5)),
                       you.pos(), MF_GOD_GIFT)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3330 [6.804403]

B:BD[7.11337] → [5.3643:3707]

            if (summon_demon(MONS_REAPER, 0, true, true, true))

[7.11337]

[7.11455]

            if (create_monster(
                    mgen_data::alert_hostile_at(MONS_REAPER,
                        you.pos(), MF_GOD_GIFT)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3710 [6.804403]

B:BD[19.17114] → [2.2528:2689]

        bool success =
            summon_demon(
                static_cast<monster_type>(MONS_GREEN_DEATH + random2(3)),
                0, true, true, true);

[19.17114]

[20.2583]

        bool success = (create_monster(
                           mgen_data::alert_hostile_at(
                               static_cast<monster_type>(
                                   MONS_GREEN_DEATH + random2(3)),
                               you.pos(), MF_GOD_GIFT)) != -1);

Replacement in crawl-ref/source/religion.cc at line 3728 [6.804403]

B:BD[6.873516] → [2.2690:2836]

            if (summon_demon(
                    static_cast<monster_type>(MONS_NEQOXEC + random2(5)),
                    0, true, true, true))

[6.873516]

[6.873686]

            if (create_monster(
                   mgen_data::alert_hostile_at(
                       static_cast<monster_type>(
                           MONS_NEQOXEC + random2(5)),
                       you.pos(), MF_GOD_GIFT)) != -1)

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

B:BD[6.4521858] → [5.4006:4078]

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

[6.4521858]

[6.4521938]

        summon_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[5.4154] → [5.4154:4222]

                              20 + you.skills[SK_INVOCATIONS] * 3);

[5.4154]

[6.4524701]

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

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

B:BD[5.4302] → [5.4302:4370]

                              20 + you.skills[SK_INVOCATIONS] * 3);

[5.4302]

[6.4526853]

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