fiddlerwoaroof/crawl - Change 67WUNL6XO77CNOMQEZ6BMV4LL2VTCMUBG57DQMCHNEMPCGYXLO3QC

After some more thought, remove the god gift exceptions for

natural-phenomenon-type monsters. Fire vortices still need to be dealt with properly, though.

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

Created by dolorous on June 10, 2008

67WUNL6XO77CNOMQEZ6BMV4LL2VTCMUBG57DQMCHNEMPCGYXLO3QC

Dependencies

In channels

main

Change contents

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

B:BD[4.360] → [3.431:566]

∅:D[3.566] → [4.360:403]

B:BD[4.360] → [4.360:403]

        // God gift exception: Ball lightning is a natural phenomenon
        // treated as a monster, so don't mark it as a god gift.
        cast_conjure_ball_lightning(powc);

[4.360]

[4.403]

        cast_conjure_ball_lightning(powc, god_gift);

Insertion in crawl-ref/source/spl-cast.cc at line 2341 [5.293070]

[6.7123]

    const bool god_gift = crawl_state.is_god_acting();
    const unsigned flags = (god_gift) ? MG_GOD_GIFT : 0;

Deletion in crawl-ref/source/spl-cast.cc at line 2398 [5.293070]

B:BD[6.8559] → [3.567:727]

            // God gift exception: A spatial vortex is a natural
            // phenomenon treated as a monster, so don't mark it as a
            // god gift.

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

B:BD[7.262] → [7.262:308]

                        you.pos(), 3)) != -1)

[7.262]

[7.308]

                        you.pos(), 3, flags)) != -1)

Deletion in crawl-ref/source/spl-cast.cc at line 2435 [5.293070]

B:BD[7.501] → [3.728:888]

            // God gift exception: A spatial vortex is a natural
            // phenomenon treated as a monster, so don't mark it as a
            // god gift.

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

B:BD[2.234] → [2.234:284]

                            you.pos(), 3)) != -1)

[2.234]

[7.720]

                            you.pos(), 3, flags)) != -1)

Deletion in crawl-ref/source/spl-cast.cc at line 2539 [5.293070]

B:BD[6.11878] → [3.889:1049]

            // God gift exception: A spatial vortex is a natural
            // phenomenon treated as a monster, so don't mark it as a
            // god gift.

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

B:BD[7.1064] → [7.1064:1110]

                        you.pos(), 3)) != -1)

[7.1064]

[7.1110]

                        you.pos(), 3, flags)) != -1)

Deletion in crawl-ref/source/spl-cast.cc at line 2570 [5.293070]

B:BD[7.1303] → [3.1050:1210]

            // God gift exception: A spatial vortex is a natural
            // phenomenon treated as a monster, so don't mark it as a
            // god gift.

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

B:BD[2.464] → [2.464:514]

                            you.pos(), 3)) != -1)

[2.464]

[7.1522]

                            you.pos(), 3, flags)) != -1)

Replacement in crawl-ref/source/spells2.h at line 160 [5.562867]
B:BD[4.1066] → [4.1066:1109]
```
bool cast_conjure_ball_lightning(int pow);
```
[4.1066]
[5.567904]
```
bool cast_conjure_ball_lightning(int pow, bool god_gift = false);
```

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

B:BD[4.3245] → [3.1749:1868]

∅:D[3.1868] → [4.3245:3287]

B:BD[4.3245] → [4.3245:3287]

// God gift exception: Ball lightning is a natural phenomenon treated as
// a monster, so don't mark it as a god gift.
bool cast_conjure_ball_lightning(int pow)

[4.3245]

[4.3287]

bool cast_conjure_ball_lightning(int pow, bool god_gift)

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

B:BD[4.4121] → [4.4121:4177]

                          coord_def(tx, ty), MHITNOT));

[4.4121]

[4.4177]

                          coord_def(tx, ty), MHITNOT,
                          god_gift ? MG_GOD_GIFT : 0));

Replacement in crawl-ref/source/mon-data.h at line 3728 [5.1826214]

B:BD[8.115410] → [8.115410:115490]

    M_FLIES | M_CONFUSED | M_SPELLCASTER | M_SPECIAL_ABILITY | M_INSUBSTANTIAL,

[8.115410]

[8.115490]

    M_FLIES | M_CONFUSED | M_SPELLCASTER | M_SPECIAL_ABILITY
        | M_INSUBSTANTIAL,