fiddlerwoaroof/crawl - Change I67F2U3V27EIFFIEOTQN3G3NFT7PW2J7EHUMDEUC4BVNBMSJAPUQC

Simplify summoning of hostile demons.

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

Created by dolorous on June 7, 2008

I67F2U3V27EIFFIEOTQN3G3NFT7PW2J7EHUMDEUC4BVNBMSJAPUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.h at line 170 [4.562867]

B:BD[3.1723] → [2.599:650]

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

[3.1723]

[5.342]

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

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

B:BD[5.343] → [2.651:729]

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

[5.343]

[4.567662]

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

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

B:BD[3.5533] → [3.5533:5642]

        bool friendly = (god_gift) ? !force_hostile
                                   : (random2(pow) > 7);

[3.5533]

[3.5642]

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

Replacement in crawl-ref/source/spells2.cc at line 1930 [4.569242]
B:BD[6.1240] → [2.1590:1630]
```
    return summon_demon(pow, god_gift);
```
[6.1240]
[6.1424]
```
    return summon_common_demon(pow, god_gift);
```
Replacement in crawl-ref/source/spells2.cc at line 2082 [4.569242]
B:BD[7.1894] → [2.4329:4371]
```
bool summon_demon(int pow, bool god_gift)
```
[7.1894]
[2.4371]
```
bool summon_common_demon(int pow, bool god_gift)
```

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

B:BD[8.1511] → [2.4570:4639]

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

[8.1511]

[2.4639]

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

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

B:BD[9.1388] → [2.4726:4772]

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

[9.1388]

[10.4293]

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

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

B:BD[2.4982] → [2.4982:5040]

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

[2.4982]

[11.424]

                      MF_GOD_GIFT)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3278 [4.804403]

B:BD[12.2864] → [10.10379:10409]

        bool success = false;

[12.2864]

[10.10409]

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

Replacement in crawl-ref/source/religion.cc at line 3283 [4.804403]

B:BD[10.10410] → [10.10410:10483]

∅:D[10.10483] → [13.12485:12588]

B:BD[13.12485] → [13.12485:12588]

B:BD[13.12588] → [10.10484:10812]

        if (create_monster(
                mgen_data::alert_hostile_at(
                    static_cast<monster_type>(
                        MONS_EXECUTIONER + random2(5)),
                    you.pos(), MF_GOD_GIFT)) != -1)
        {
            success = true;
            simple_god_message(success ?
                               " sends a greater servant after you!" :
                               "'s greater servant is unavoidably detained.",
                               god);
        }

[10.10410]

[12.3297]

        simple_god_message(success ?
                           " sends a greater servant after you!" :
                           "'s greater servant is unavoidably detained.",
                           god);

Replacement in crawl-ref/source/religion.cc at line 3295 [4.804403]

∅:D[10.10890] → [13.12673:12705]

B:BD[12.3362] → [13.12673:12705]

B:BD[13.12705] → [10.10891:10940]

∅:D[10.10940] → [13.12736:12843]

B:BD[13.12736] → [13.12736:12843]

B:BD[13.12843] → [10.10941:10997]

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

[10.10890]

[10.10997]

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

Replacement in crawl-ref/source/religion.cc at line 3323 [4.804403]

∅:D[10.11337] → [13.12936:12968]

B:BD[12.3899] → [13.12936:12968]

B:BD[13.12968] → [10.11338:11455]

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

[10.11337]

[10.11455]

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

Replacement in crawl-ref/source/abl-show.cc at line 1284 [4.4494389]
B:BD[14.2922] → [2.7795:7843]
```
        summon_demon(you.experience_level * 4);
```
[14.2922]
[4.4516475]
```
        summon_common_demon(you.experience_level * 4);
```

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

B:BD[4.4521858] → [2.7910:8027]

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

[4.4521858]

[4.4521938]

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

Replacement in crawl-ref/source/abl-show.cc at line 1539 [4.4494389]

B:BD[4.4524574] → [2.8028:8221]

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

[4.4524574]

[4.4524701]

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

Replacement in crawl-ref/source/abl-show.cc at line 1598 [4.4494389]

B:BD[4.4526722] → [2.8222:8419]

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

[4.4526722]

[4.4526853]

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