fiddlerwoaroof/crawl - Change SLLTYX5LKR3TL75K5CTVINM42WQR5XY5HWYROSCXHP4DTFEGTCMAC

Add more holy being-related cleanups.

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

Created by dolorous on October 30, 2008

SLLTYX5LKR3TL75K5CTVINM42WQR5XY5HWYROSCXHP4DTFEGTCMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1513 [4.293070]
B:BD[3.337] → [3.337:370]
```
        summon_angel(powc, god);
```
[3.337]
[5.256]
```
        summon_holy_being_type(MONS_ANGEL, powc, god);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1517 [4.293070]
B:BD[6.340] → [7.1132:1165]
```
        summon_daeva(powc, god);
```
[6.340]
[8.161]
```
        summon_holy_being_type(MONS_DAEVA, powc, god);
```
Deletion in crawl-ref/source/spells3.cc at line 492 [4.531613]
B:BD[9.1690] → [9.1690:1770]
```
// Makhleb or Kikubaaqudgha sends a demonic buddy (or enemy) for a
// follower.
```

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

B:BD[10.343] → [2.274:564]

bool summon_angel(int pow, god_type god = GOD_NO_GOD, bool quiet = false,
                  bool force_hostile = false, bool permanent = false);
bool summon_daeva(int pow, god_type god = GOD_NO_GOD, bool quiet = false,
                  bool force_hostile = false, bool permanent = false);

[10.343]

[7.7258]

bool summon_holy_warrior(int pow, god_type god = GOD_NO_GOD,
                         bool quiet = false);
bool summon_holy_being_type(monster_type mon, int pow,
                            god_type god = GOD_NO_GOD);

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

B:BD[4.606235] → [2.566:712]

static bool _summon_holy_being_wrapper(god_type god, monster_type mon, int dur,
                                       bool friendly, bool quiet)

[4.606235]

[11.275]

static bool _summon_holy_being_wrapper(int pow, god_type god, monster_type mon,
                                       int dur, bool friendly, bool quiet)

Insertion in crawl-ref/source/spells2.cc at line 1622 [4.569242]
[11.277]
[12.227]
```
    UNUSED(pow);
```

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

B:BD[12.490] → [13.275:313]

B:BD[13.313] → [2.915:1022]

// TSO sends an angel for a follower.
bool summon_angel(int pow, god_type god, bool quiet,
                  bool force_hostile, bool permanent)

[12.490]

[14.1944]

static bool _summon_holy_being_wrapper(int pow, god_type god,
                                       holy_being_class_type hbct,
                                       int dur, bool friendly, bool quiet)

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

B:BD[14.1946] → [2.1023:1091]

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

[14.1946]

[2.1091]

    monster_type mon = summon_any_holy_being(hbct);

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

B:BD[2.1092] → [2.1092:1214]

    return _summon_holy_being_wrapper(god, MONS_ANGEL, dur, !force_hostile,
                                      quiet);

[2.1092]

[14.2079]

    return _summon_holy_being_wrapper(pow, god, mon, dur, friendly, quiet);

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

B:BD[14.2082] → [14.2082:2119]

B:BD[14.2119] → [2.1215:1322]

// TSO sends a daeva for a follower.
bool summon_daeva(int pow, god_type god, bool quiet,
                  bool force_hostile, bool permanent)

[14.2082]

[14.2212]

bool summon_holy_warrior(int pow, god_type god, bool quiet)

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

B:BD[14.2214] → [2.1323:1391]

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

[14.2214]

[2.1391]

    return _summon_holy_being_wrapper(pow, god, HOLY_BEING_WARRIOR,
                                      std::min(2 + (random2(pow) / 4), 6),
                                      true, quiet);
}

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

B:BD[2.1392] → [2.1392:1514]

    return _summon_holy_being_wrapper(god, MONS_DAEVA, dur, !force_hostile,
                                      quiet);

[2.1392]

[4.611776]

bool summon_holy_being_type(monster_type mon, int pow, god_type god)
{
    return _summon_holy_being_wrapper(pow, god, mon,
                                      std::min(2 + (random2(pow) / 4), 6),
                                      true, false);

Replacement in crawl-ref/source/religion.cc at line 3539 [4.804403]
B:BD[15.341] → [2.3671:3708]
```
    // holy warriors/cleansing theme
```
[15.341]
[16.2509]
```
    // holy beings/cleansing theme
```
Replacement in crawl-ref/source/religion.cc at line 3546 [4.804403]
B:BD[16.2555] → [2.3709:3751]
```
    case 2: // summon holy warriors (3/7)
```
[16.2555]
[17.159]
```
    case 2: // summon holy beings (3/7)
```

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

B:BD[18.9397] → [2.3752:3780]

            if (coinflip())

[18.9397]

[19.2594]

            if (create_monster(
                    mgen_data::hostile_at(
                            summon_any_holy_being(HOLY_BEING_RANDOM),
                            you.pos(), 0, 0, true, god)) != -1)

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

B:BD[19.2608] → [2.3781:3879]

                if (summon_daeva(100, god, true, true, true))
                    success = true;

[19.2608]

[2.3879]

                success = true;

Deletion in crawl-ref/source/religion.cc at line 3560 [4.804403]

B:BD[2.3893] → [2.3893:4022]

∅:D[2.4022] → [19.2609:2623]

B:BD[15.796] → [19.2609:2623]

            else
            {
                if (summon_angel(100, god, true, true, true))
                    success = true;
            }

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

B:BD[18.9839] → [2.4023:4085]

                if (summon_angel(100, god, true, true, true))

[18.9839]

[20.2970]

                if (create_monster(
                        mgen_data::hostile_at(MONS_ANGEL,
                            you.pos(), 0, 0, true, god)) != -1)
                {

Insertion in crawl-ref/source/religion.cc at line 3655 [4.804403]
[20.3006]
[18.9965]
```
                }
```

Replacement in crawl-ref/source/monplace.h at line 79 [4.1638277]

B:BD[21.2659] → [2.4129:4192]

    HOLY_BEING_TSO,                    //    0: Daeva or Angel

[21.2659]

[21.2767]

    HOLY_BEING_WARRIOR,                //    0: Daeva or Angel

Replacement in crawl-ref/source/monplace.cc at line 2294 [4.1641732]
B:BD[21.3313] → [12.3410:3435]
```
    case HOLY_BEING_TSO:
```
[21.3244]
[2.4194]
```
    case HOLY_BEING_WARRIOR:
```

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

B:BD[13.4225] → [13.4225:4249]

B:BD[13.4249] → [3.2938:3013]

∅:D[3.3013] → [13.4327:4415]

B:BD[13.4327] → [13.4327:4415]

        if (coinflip())
            summon_angel(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);
        else
            summon_daeva(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);

[13.4225]

[4.4521340]

        summon_holy_warrior(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);

Add more holy being-related cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1513 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1517 [4.293070]

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