fiddlerwoaroof/crawl - Change V3D5CG4IQU2RUM64BMLOXVYZBK3OTU7AYENTD3HTARQR2U4AZPUAC

Rework angels somewhat. To synchronize with daevas, angels are now

agents of TSO rather than Zin, get the same draining protection, and get the same melee attacks. To differentiate from them, they always get a mace or great mace of holy wrath. TSO's "Summon Daeva" is now "Summon Divine Warrior", and has a 50% chance of summoning either an angel or a daeva.

Note that Zin's angel retribution is not changed yet.

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

Created by dolorous on October 19, 2008

V3D5CG4IQU2RUM64BMLOXVYZBK3OTU7AYENTD3HTARQR2U4AZPUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1643 [8.569242]
∅:D[6.737] → [7.1807:1845]
B:BD[7.1807] → [7.1807:1845]
```
// Zin sends an angel for a follower.
```
[6.490]
[9.8685]
```
// TSO sends an angel for a follower.
```

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

B:BD[10.4127] → [11.4198:4252]

                    mgen_data::hostile_at(MONS_DAEVA,

[10.4127]

[4.2741]

                    mgen_data::hostile_at(coinflip() ? MONS_ANGEL : MONS_DAEVA,

Insertion in crawl-ref/source/mon-util.cc at line 1336 [8.1699344]
[12.3746]
[12.3746]
```
        || mon->type == MONS_ANGEL
```

Replacement in crawl-ref/source/mon-data.h at line 1638 [8.1826214]

B:BD[13.495781] → [14.2043:2108]

    { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },

[13.495781]

[15.102]

    { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK,
       AT_NO_ATK },

Replacement in crawl-ref/source/mon-data.h at line 1650 [8.1826214]

B:BD[16.48293] → [17.3248:3326]

    { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 10}, {AT_HIT, AF_PLAIN, 10},

[16.48293]

[17.3326]

    { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK,

Insertion in crawl-ref/source/makeitem.cc at line 3441 [18.927]

[5.2714]

[18.117197]


        item.sub_type  = (one_chance_in(4) ? WPN_GREAT_MACE
                                           : WPN_MACE);

Replacement in crawl-ref/source/makeitem.cc at line 3446 [18.927]

∅:D[5.2761] → [18.117246:117286]

B:BD[18.117246] → [18.117246:117286]

B:BD[18.117286] → [5.2762:2952]

∅:D[5.2952] → [18.117432:117455]

B:BD[18.117432] → [18.117432:117455]

B:BD[18.117465] → [18.117465:117509]

B:BD[18.117519] → [18.117519:117520]

        if (one_chance_in(3))
        {
            item.sub_type = (one_chance_in(3) ? WPN_GREAT_MACE
                                              : WPN_MACE);
            set_item_ego_type(item, OBJ_WEAPONS, SPWPN_HOLY_WRATH);
        }
        else
            item.sub_type = WPN_LONG_SWORD;

[5.2761]

[19.6589]

        set_item_ego_type(item, OBJ_WEAPONS, SPWPN_HOLY_WRATH);

Replacement in crawl-ref/source/enum.h at line 61 [8.3287960]
B:BD[13.903331] → [20.10224:10276]
```
    ABIL_TSO_SUMMON_DAEVA,                  //  122
```
[13.903331]
[8.3290877]
```
    ABIL_TSO_SUMMON_DIVINE_WARRIOR,         //  122
```

Replacement in crawl-ref/source/dat/descript/monsters.txt at line 17 [21.17579]

B:BD[5.3192] → [5.3192:3305]

A divine agent of Zin, it is a towering winged figure of unnatural beauty with an aura of brilliant white light.

[5.3192]

[21.26779]

A divine agent of the Shining One, it is a towering winged figure of unnatural beauty with an aura of brilliant white light.

Replacement in crawl-ref/source/dat/descript/gods.txt at line 79 [24.575]

B:BD[22.5575] → [23.3173:3613]

Followers will gain use of a divine shield to protect them in battle. Later, they can hurl blasts of cleansing flame that are particularly effective against unholy creatures, and, eventually, they can ask the Shining One to send them help in the form of a Daeva, a powerful divine being. The Shining One may occasionally directly intervene to save a follower's life. With growing piety the Shining One will protect a follower's life force.

[22.5575]

[22.5940]

Followers will gain use of a divine shield to protect them in battle. Later, they can hurl blasts of cleansing flame that are particularly effective against unholy creatures, and, eventually, they can ask the Shining One to send them help in the form of an Angel or Daeva, both powerful divine beings. The Shining One may occasionally directly intervene to save a follower's life. With growing piety the Shining One will protect a follower's life force.

Replacement in crawl-ref/source/dat/descript/ability.txt at line 173 [25.3323]
B:BD[25.7038] → [25.7038:7051]
```
Summon Daeva
```
[25.7038]
[25.7051]
```
Summon Divine Warrior
```

Replacement in crawl-ref/source/dat/descript/ability.txt at line 175 [25.3323]

B:BD[25.7052] → [3.5188:5331]

Summoned Daevas are powerful warriors against evil. They might be blessed by the Shining One to stay longer or even permanently in this world.

[25.7052]

[25.7196]

Summoned Angels and Daevas are powerful warriors against evil. They might be blessed by the Shining One to stay longer or even permanently in this world.

Replacement in crawl-ref/source/abl-show.cc at line 105 [8.4494389]
∅:D[26.2872] → [27.9175:9232]
∅:D[28.3419] → [27.9175:9232]
∅:D[29.5595] → [27.9175:9232]
B:BD[27.9175] → [27.9175:9232]
```
      ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DAEVA },
```
[26.2872]
[27.9232]
```
      ABIL_TSO_CLEANSING_FLAME, ABIL_TSO_SUMMON_DIVINE_WARRIOR },
```

Replacement in crawl-ref/source/abl-show.cc at line 229 [8.4494389]

∅:D[13.1282692] → [8.4500824:4500898]

B:BD[8.4500824] → [8.4500824:4500898]

    { ABIL_TSO_SUMMON_DAEVA, "Summon Daeva", 8, 0, 150, 4, ABFLAG_NONE },

[13.1282692]

[8.4500898]

    { ABIL_TSO_SUMMON_DIVINE_WARRIOR, "Summon Divine Warrior", 8, 0, 150, 4, ABFLAG_NONE },

Replacement in crawl-ref/source/abl-show.cc at line 707 [8.4494389]
∅:D[30.20078] → [31.12479:12511]
B:BD[31.12479] → [31.12479:12511]
```
    case ABIL_TSO_SUMMON_DAEVA:
```
[30.20078]
[31.12511]
```
    case ABIL_TSO_SUMMON_DIVINE_WARRIOR:
```

Replacement in crawl-ref/source/abl-show.cc at line 1470 [8.4494389]

B:BD[8.4521234] → [8.4521234:4521266]

B:BD[8.4521266] → [2.2901:2972]

    case ABIL_TSO_SUMMON_DAEVA:
        summon_daeva(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);

[8.4521234]

[8.4521340]

    case ABIL_TSO_SUMMON_DIVINE_WARRIOR:
        if (coinflip())
            summon_guardian(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);
        else
            summon_daeva(you.skills[SK_INVOCATIONS] * 4, GOD_SHINING_ONE);