fiddlerwoaroof/crawl - Change K3HAD5I366XYS5PVG5QSNNNJI5EIUCHD4JZWSXL3KKIVFHHAA4YAC

Properly handle the gods of monsters created by monster spells. If the

monster that created them is a priest, assume they're from priestly abilities, and if the monster that created them is neither a priest nor a wizard, assume they're from intrinsic abilities; in both cases, they'll have the same god as the monster. The latter should cover cases such as god-summoned shadow imps' casting Animate Dead; if the imp abandons you due to your abandoning its god, its zombies will abandon you too.

Also, mark skeletal warriors as no longer being wizards, so that their casting Animate Dead is an intrinsic ability, and the above rule will apply when the skeletal warrior is a gift of Yredelemnul; if the skeletal warrior abandons you due to your abandoning Yredelemnul, its zombies will abandon you too.

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

Created by dolorous on February 7, 2009

K3HAD5I366XYS5PVG5QSNNNJI5EIUCHD4JZWSXL3KKIVFHHAA4YAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 179 [5.1340842]

[4.6629]

[5.1352357]

    // If the monster's a priest, assume summons come from priestly
    // abilities, in which case they'll have the same god.  If the
    // monster is neither a priest nor a wizard, assume summons come
    // from intrinsic abilities, in which case they'll also have the
    // same god.
    const bool priest = mons_class_flag(monster->type, M_PRIEST);
    const bool wizard = mons_class_flag(monster->type, M_ACTUAL_SPELLS);
    god_type god = (priest || !(priest || wizard)) ? monster->god : GOD_NO_GOD;

Replacement in crawl-ref/source/mstuff2.cc at line 229 [5.1340842]

B:BD[6.3013] → [2.8472:8545]

                          5, spell_cast, monster->pos(), monster->foe));

[6.3013]

[7.3049]

                          5, spell_cast, monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 243 [5.1340842]

B:BD[8.4124] → [8.4124:4197]

                          5, spell_cast, monster->pos(), monster->foe));

[8.4124]

[5.1353886]

                          5, spell_cast, monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 256 [5.1340842]

B:BD[3.6274] → [3.6274:6419]

                mgen_data(MONS_WATER_ELEMENTAL, SAME_ATTITUDE(monster), 3,
                          spell_cast, monster->pos(), monster->foe));

[3.6274]

[3.6419]

                mgen_data(MONS_WATER_ELEMENTAL, SAME_ATTITUDE(monster),
                          3, spell_cast, monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 268 [5.1340842]

B:BD[8.4268] → [2.8546:8619]

                          3, spell_cast, monster->pos(), monster->foe));

[8.4268]

[5.1354250]

                          3, spell_cast, monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 284 [5.1340842]

∅:D[2.8692] → [9.2846:2904]

B:BD[10.3631] → [9.2846:2904]

                          monster->pos(), monster->foe));

[2.8692]

[11.3205]

                          monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 303 [5.1340842]

B:BD[8.4385] → [2.8693:8773]

                          duration, spell_cast, monster->pos(), monster->foe));

[8.4385]

[5.1355017]

                          duration, spell_cast, monster->pos(), monster->foe, 0,
                          god));

Replacement in crawl-ref/source/mstuff2.cc at line 311 [5.1340842]

B:BD[12.2747] → [9.2964:3000]

                     monster->foe);

[12.2747]

[5.1355215]

                     monster->foe, god);

Replacement in crawl-ref/source/mstuff2.cc at line 323 [5.1340842]

B:BD[8.4504] → [2.8774:8854]

                          duration, spell_cast, monster->pos(), monster->foe));

[8.4504]

[5.1355756]

                          duration, spell_cast, monster->pos(), monster->foe, 0,
                          god));

Replacement in crawl-ref/source/mstuff2.cc at line 339 [5.1340842]

B:BD[8.4638] → [2.8855:8935]

                          duration, spell_cast, monster->pos(), monster->foe));

[8.4638]

[13.3049]

                          duration, spell_cast, monster->pos(), monster->foe, 0,
                          god));

Replacement in crawl-ref/source/mstuff2.cc at line 353 [5.1340842]

B:BD[8.4772] → [2.8936:9016]

                          duration, spell_cast, monster->pos(), monster->foe));

[8.4772]

[5.1356239]

                          duration, spell_cast, monster->pos(), monster->foe, 0,
                          god));

Replacement in crawl-ref/source/mstuff2.cc at line 361 [5.1340842]

B:BD[8.4899] → [2.9017:9086]

                      4, spell_cast, monster->pos(), monster->foe));

[8.4899]

[5.1356450]

                      4, spell_cast, monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 367 [5.1340842]

B:BD[8.5019] → [2.9087:9156]

                      5, spell_cast, monster->pos(), monster->foe));

[8.5019]

[14.17009]

                      5, spell_cast, monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 381 [5.1340842]

B:BD[11.3657] → [2.9157:9237]

                          duration, spell_cast, monster->pos(), monster->foe));

[11.3657]

[15.2571]

                          duration, spell_cast, monster->pos(), monster->foe, 0,
                          god));

Replacement in crawl-ref/source/mstuff2.cc at line 403 [5.1340842]

B:BD[8.5176] → [2.9517:9590]

                          2, spell_cast, monster->pos(), monster->foe));

[8.5176]

[16.4378]

                          2, spell_cast, monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 434 [5.1340842]

B:BD[8.5288] → [2.9709:9789]

                          duration, spell_cast, monster->pos(), monster->foe));

[8.5288]

[5.1358310]

                          duration, spell_cast, monster->pos(), monster->foe,
                          0, god));

Replacement in crawl-ref/source/mstuff2.cc at line 470 [5.1340842]

B:BD[2.9842] → [2.9842:9904]

                              monster->pos(), monster->foe));

[2.9842]

[17.820]

                              monster->pos(), monster->foe, 0, god));

Replacement in crawl-ref/source/mon-data.h at line 1618 [5.1826214]
B:BD[18.46164] → [18.46164:46222]
```
    M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_EVIL,
```
[18.46164]
[18.46222]
```
    M_FIGHTER | M_SPELLCASTER | M_EVIL,
```