fiddlerwoaroof/crawl - Change NQ2PC2EO6VIBYU5MR4LNSLV3LDOYABKSKZEVEDTML6BAJAQAWWBAC

Simplify summoning of hostile holy beings.

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

Created by dolorous on June 7, 2008

NQ2PC2EO6VIBYU5MR4LNSLV3LDOYABKSKZEVEDTML6BAJAQAWWBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1524 [5.293070]
B:BD[4.311] → [3.220:256]
```
        cast_summon_guardian(powc);
```
[4.311]
[3.256]
```
        summon_guardian(powc);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1528 [5.293070]
B:BD[4.340] → [3.273:306]
```
        cast_summon_daeva(powc);
```
[4.340]
[3.306]
```
        summon_daeva(powc);
```
Deletion in crawl-ref/source/spells2.h at line 165 [5.562867]
B:BD[6.406] → [3.365:425]
```
bool cast_summon_guardian(int pow, bool god_gift = false);
```
Deletion in crawl-ref/source/spells2.h at line 166 [5.562867]
B:BD[3.426] → [3.426:483]
```
bool cast_summon_daeva(int pow, bool god_gift = false);
```

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

[5.568441]

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

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

B:BD[6.1523] → [6.1523:1529]

∅:D[6.1529] → [7.4881:4882]

B:BD[7.4881] → [7.4881:4882]

B:BD[7.4882] → [6.1530:1554]

∅:D[6.1554] → [7.4979:4980]

B:BD[7.4979] → [7.4979:4980]

B:BD[7.4980] → [3.1998:2128]

∅:D[3.2128] → [6.1667:1695]

B:BD[6.1667] → [6.1667:1695]

∅:D[6.1695] → [7.5074:5075]

B:BD[7.5074] → [7.5074:5075]

B:BD[7.5075] → [3.2129:2239]

∅:D[6.1737] → [7.5171:5172]

∅:D[3.2239] → [7.5171:5172]

B:BD[7.5171] → [7.5171:5172]

B:BD[7.5172] → [3.2240:2407]

∅:D[6.1846] → [7.5447:5448]

∅:D[3.2407] → [7.5447:5448]

B:BD[7.5447] → [7.5447:5448]

B:BD[7.5448] → [3.2408:2642]

∅:D[3.2642] → [6.1866:1872]

B:BD[6.1866] → [6.1866:1872]

B:BD[6.1872] → [3.2643:2667]

∅:D[3.2667] → [6.2040:2041]

B:BD[6.2040] → [6.2040:2041]

B:BD[6.2041] → [3.2668:2759]

∅:D[3.2759] → [6.2125:2126]

B:BD[6.2125] → [6.2125:2126]

B:BD[6.2126] → [3.2760:2918]

    }
    return (success);
}
static bool _summon_holy_being_wrapper(int pow, bool god_gift,
                                       holy_being_class_type hbct)
{
    bool success = false;
    monster_type mon = summon_any_holy_being(hbct);
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    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());
    int monster = create_monster(
                      mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                                you.pet_target,
                                god_gift ? MF_GOD_GIFT : 0));
    if (monster != -1)
    {
        success = true;
        monsters *summon = &menv[monster];
        summon->flags |= MF_ATT_CHANGE_ATTEMPT;
        mprf("You are momentarily dazzled by a brilliant %s light.",
             (mon == MONS_DAEVA) ? "golden"
                                 : "white");

Deletion in crawl-ref/source/spells2.cc at line 2044 [5.569242]
B:BD[8.532] → [3.2919:2969]
```
    else
        canned_msg(MSG_NOTHING_HAPPENS);
```
Deletion in crawl-ref/source/spells2.cc at line 2046 [5.569242]
∅:D[9.778] → [7.5642:5645]
B:BD[7.5642] → [7.5642:5645]
B:BD[7.5645] → [3.2970:3020]
∅:D[10.741] → [11.429:431]
∅:D[12.986] → [11.429:431]
∅:D[13.1088] → [11.429:431]
∅:D[14.1338] → [11.429:431]
∅:D[4.1877] → [11.429:431]
∅:D[3.3020] → [11.429:431]
B:BD[11.429] → [11.429:431]
B:BD[11.431] → [3.3021:3093]
```
}
bool cast_summon_guardian(int pow, bool god_gift)
{
    return _summon_holy_being_wrapper(pow, god_gift, HOLY_BEING_ANGEL);
```
Deletion in crawl-ref/source/spells2.cc at line 2048 [5.569242]
B:BD[13.1177] → [3.3096:3219]
∅:D[10.812] → [13.1251:1252]
∅:D[3.3219] → [13.1251:1252]
B:BD[13.1251] → [13.1251:1252]
```
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 2116 [5.569242]

B:BD[15.4435] → [16.4474:4542]

// Trog sends some fighting buddies (or enemies) for his followers.

[15.4435]

[17.6504]

// Trog sends a fighting buddy (or enemy) for a follower.

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

[5.606235]

[2.319]

static bool _summon_holy_being_wrapper(int pow, holy_being_class_type hbct,
                                       bool force_hostile, bool quiet,
                                       bool permanent)
{
    bool success = false;
    monster_type mon = summon_any_holy_being(hbct);
    const int dur = (permanent) ? 0 : std::min(2 + (random2(pow) / 4), 6);
    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());
    }
    int monster = create_monster(
                      mgen_data(mon,
                                !force_hostile ? BEH_FRIENDLY : BEH_HOSTILE,
                                dur, you.pos(),
                                !force_hostile ? you.pet_target : MHITYOU,
                                MF_GOD_GIFT));
    if (monster != -1)
    {
        success = true;
        monsters *summon = &menv[monster];
        summon->flags |= MF_ATT_CHANGE_ATTEMPT;
        if (!quiet)
        {
            mprf("You are momentarily dazzled by a brilliant %s light.",
                 (mon == MONS_DAEVA) ? "golden"
                                     : "white");
        }
    }
    return (success);
}
// Zin sends an angel for a follower.
bool summon_guardian(int pow, bool force_hostile, bool quiet,
                     bool permanent)
{
    return _summon_holy_being_wrapper(pow, HOLY_BEING_ANGEL, force_hostile,
                                      quiet, permanent);
}
// TSO sends a daeva for a follower.
bool summon_daeva(int pow, bool force_hostile, bool quiet,
                  bool permanent)
{
    return _summon_holy_being_wrapper(pow, HOLY_BEING_DAEVA, force_hostile,
                                      quiet, permanent);
}

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

∅:D[16.9397] → [18.12090:12122]

B:BD[19.629] → [18.12090:12122]

B:BD[18.12122] → [16.9398:9514]

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

[16.9397]

[20.2594]

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

Replacement in crawl-ref/source/religion.cc at line 3118 [5.804403]

∅:D[16.9839] → [18.12240:12276]

B:BD[21.2763] → [18.12240:12276]

B:BD[18.12276] → [16.9840:9964]

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

[16.9839]

[21.2952]

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

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

B:BD[5.4521266] → [3.7844:7909]

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

[5.4521266]

[5.4521340]

        summon_daeva(you.skills[SK_INVOCATIONS] * 4);

Simplify summoning of hostile holy beings.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1524 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1528 [5.293070]

Deletion in crawl-ref/source/spells2.h at line 165 [5.562867]

Deletion in crawl-ref/source/spells2.h at line 166 [5.562867]