fiddlerwoaroof/crawl - Change XEZ5PLCFGH7YHIQVUCB3VO5C35DXE7N4RSBC7M3AKXJW4OBDZWVQC

Add various holy being-related cleanups.

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

Created by dolorous on October 30, 2008

XEZ5PLCFGH7YHIQVUCB3VO5C35DXE7N4RSBC7M3AKXJW4OBDZWVQC

Dependencies

In channels

main

Change contents

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

B:BD[4.343] → [3.378:453]

∅:D[3.453] → [6.7182:7257]

B:BD[6.7182] → [6.7182:7257]

∅:D[4.450] → [5.567663:567664]

∅:D[7.473] → [5.567663:567664]

∅:D[8.1527] → [5.567663:567664]

∅:D[6.7257] → [5.567663:567664]

B:BD[5.567663] → [5.567663:567664]

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

[4.343]

[6.7258]

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);

Replacement in crawl-ref/source/spells2.cc at line 1617 [5.569242]

B:BD[5.606235] → [6.8483:8545]

∅:D[6.8545] → [8.1529:1598]

B:BD[4.870] → [8.1529:1598]

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

[5.606235]

[9.275]

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

Deletion in crawl-ref/source/spells2.cc at line 1620 [5.569242]
B:BD[9.277] → [9.277:334]
∅:D[9.334] → [10.892:893]
∅:D[4.995] → [10.892:893]
∅:D[11.1889] → [10.892:893]
B:BD[10.892] → [10.892:893]
```
    const int dur = std::min(2 + (random2(pow) / 4), 6);
```

Replacement in crawl-ref/source/spells2.cc at line 1634 [5.569242]

B:BD[11.2044] → [11.2044:2202]

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

[11.2044]

[10.1775]

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

Insertion in crawl-ref/source/spells2.cc at line 1639 [5.569242]
[10.1781]
[11.2203]

Replacement in crawl-ref/source/spells2.cc at line 1646 [5.569242]

B:BD[12.313] → [3.455:508]

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

[12.313]

[10.1944]

bool summon_angel(int pow, god_type god, bool quiet,
                  bool force_hostile, bool permanent)

Replacement in crawl-ref/source/spells2.cc at line 1649 [5.569242]

B:BD[10.1946] → [6.8742:8810]

    return _summon_holy_being_wrapper(pow, god, MONS_ANGEL, quiet);

[10.1946]

[10.2079]

    int dur = !permanent ? std::min(2 + (random2(pow) / 4), 6) : 0;
    return _summon_holy_being_wrapper(god, MONS_ANGEL, dur, !force_hostile,
                                      quiet);

Replacement in crawl-ref/source/spells2.cc at line 1656 [5.569242]

B:BD[10.2119] → [6.8811:8864]

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

[10.2119]

[10.2212]

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

Replacement in crawl-ref/source/spells2.cc at line 1659 [5.569242]

B:BD[10.2214] → [6.8865:8933]

    return _summon_holy_being_wrapper(pow, god, MONS_DAEVA, quiet);

[10.2214]

[5.611776]

    int dur = !permanent ? std::min(2 + (random2(pow) / 4), 6) : 0;
    return _summon_holy_being_wrapper(god, MONS_DAEVA, dur, !force_hostile,
                                      quiet);

Replacement in crawl-ref/source/religion.cc at line 3539 [5.804403]
B:BD[13.341] → [14.2509:2539]
```
    // daevas/cleansing theme
```
[13.341]
[15.2509]
```
    // holy warriors/cleansing theme
```
Replacement in crawl-ref/source/religion.cc at line 3546 [5.804403]
B:BD[15.2555] → [16.2509:2544]
```
    case 2: // summon daevas (3/7)
```
[15.2555]
[17.159]
```
    case 2: // summon holy warriors (3/7)
```

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

B:BD[18.9397] → [4.4095:4127]

B:BD[4.4127] → [12.2470:2550]

∅:D[12.2550] → [19.2741:2801]

B:BD[20.4252] → [19.2741:2801]

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

[18.9397]

[14.2594]

            if (coinflip())

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

∅:D[14.2608] → [13.764:796]

∅:D[21.7086] → [13.764:796]

B:BD[13.764] → [13.764:796]

                success = true;

[14.2608]

[14.2609]

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

Replacement in crawl-ref/source/religion.cc at line 3653 [5.804403]
B:BD[18.9839] → [4.4244:4280]
B:BD[4.4280] → [20.4325:4383]
B:BD[20.4383] → [19.2802:2866]
∅:D[22.2651] → [23.2952:2970]
∅:D[19.2866] → [23.2952:2970]
∅:D[4.4404] → [23.2952:2970]
∅:D[20.4451] → [23.2952:2970]
∅:D[24.4547] → [23.2952:2970]
∅:D[10.4820] → [23.2952:2970]
∅:D[18.9964] → [23.2952:2970]
∅:D[6.11840] → [23.2952:2970]
∅:D[25.12400] → [23.2952:2970]
B:BD[23.2952] → [23.2952:2970]
```
                if (create_monster(
                        mgen_data::hostile_at(MONS_ANGEL,
                            you.pos(), 0, 0, true, god)) != -1)
                {
```
[18.9839]
[23.2970]
```
                if (summon_angel(100, god, true, true, true))
```
Deletion in crawl-ref/source/religion.cc at line 3655 [5.804403]
B:BD[23.3006] → [23.3006:3024]
```
                }
```

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

B:BD[26.2659] → [27.3274:3382]

    HOLY_BEING_ZIN,                    //    0: Angel
    HOLY_BEING_TSO,                    //    1: Daeva

[26.2659]

[26.2767]

    HOLY_BEING_TSO,                    //    0: Daeva or Angel

Deletion in crawl-ref/source/monplace.cc at line 2294 [5.1641732]
B:BD[26.3244] → [27.3384:3409]
∅:D[27.3409] → [26.3271:3313]
B:BD[26.3271] → [26.3271:3313]
```
    case HOLY_BEING_ZIN:
        mon = MONS_ANGEL;
        break;
```
Replacement in crawl-ref/source/monplace.cc at line 2295 [5.1641732]
∅:D[27.3435] → [26.3340:3366]
B:BD[26.3340] → [26.3340:3366]
```
        mon = MONS_DAEVA;
```
[27.3435]
[26.3366]
```
        mon = coinflip() ? MONS_DAEVA : MONS_ANGEL;
```

Replacement in crawl-ref/source/mon-util.cc at line 4963 [5.1699344]

B:BD[28.12844] → [2.2574:2646]

    return ((type == MONS_DAEVA || type == MONS_ANGEL) ? hit_dice : 0);

[28.12844]

[29.2639]

    return (mons_is_holy(this) ? hit_dice : 0);

Add various holy being-related cleanups.

Dependencies

In channels

Change contents

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

Replacement in crawl-ref/source/spells2.cc at line 1617 [5.569242]

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

Replacement in crawl-ref/source/spells2.cc at line 1634 [5.569242]

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

Replacement in crawl-ref/source/spells2.cc at line 1646 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 1649 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 1656 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 1659 [5.569242]

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

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

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

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

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

Deletion in crawl-ref/source/religion.cc at line 3655 [5.804403]

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

Deletion in crawl-ref/source/monplace.cc at line 2294 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 2295 [5.1641732]

Replacement in crawl-ref/source/mon-util.cc at line 4963 [5.1699344]