fiddlerwoaroof/crawl - Change ABQY3PFFBHPOGF4TRKNIV5KOTKZ2IYLAJR362XIKHJMQSYS7TKHQC

Don't mark spatial vortices as god gifts anymore, as (a) they're just

phenomena that the game happens to treat as monsters (as opposed to actual creatures), and (b) there's no easy way to mark fire vortices as code for when god gifts, either, since they're only placed in the beam routine for "Fire Storm".

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

Created by dolorous on June 9, 2008

ABQY3PFFBHPOGF4TRKNIV5KOTKZ2IYLAJR362XIKHJMQSYS7TKHQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 2319 [4.293070]
B:BD[3.7123] → [2.1476:1532]
```
    const bool god_gift = crawl_state.is_god_acting();
```

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

B:BD[3.8559] → [2.1533:1583]

            summon_spatial_vortices(0, god_gift);

[3.8559]

[4.352784]

            if (create_monster(
                    mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3)) != -1)
            {
                mpr("Space twists in upon itself!");
            }
            else
                canned_msg(MSG_NOTHING_HAPPENS);

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

B:BD[3.9366] → [5.161:205]

B:BD[5.205] → [2.1584:1650]

            // Summon 2-4 spatial vortices.
            summon_spatial_vortices(75 + random2(151), god_gift);

[3.9366]

[4.356184]

        {
            bool success = false;
            for (int i = 1 + random2(3); i >= 0; --i)
            {
                if (create_monster(
                    mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3)) != -1)
                {
                    success = true;
                }
            }
            if (success)
                mpr("Space twists in upon itself!");
            else
                canned_msg(MSG_NOTHING_HAPPENS);

Insertion in crawl-ref/source/spl-cast.cc at line 2425 [4.293070]
[4.356203]
[3.9515]
```
        }
```

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

B:BD[3.11878] → [2.1765:1815]

            summon_spatial_vortices(0, god_gift);

[3.11878]

[3.12058]

            if (create_monster(
                    mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3)) != -1)
            {
                mpr("Space twists in upon itself!");
            }
            else
                canned_msg(MSG_NOTHING_HAPPENS);

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

B:BD[3.12492] → [5.206:250]

B:BD[5.250] → [2.1870:1936]

            // Summon 2-4 spatial vortices.
            summon_spatial_vortices(75 + random2(151), god_gift);

[3.12492]

[3.12655]

        {
            bool success = false;
            for (int i = 1 + random2(3); i >= 0; --i)
            {
                if (create_monster(
                    mgen_data::alert_hostile_at(MONS_SPATIAL_VORTEX,
                        you.pos(), 3)) != -1)
                {
                    success = true;
                }
            }
            if (success)
                mpr("Space twists in upon itself!");
            else
                canned_msg(MSG_NOTHING_HAPPENS);

Insertion in crawl-ref/source/spl-cast.cc at line 2559 [4.293070]
[3.12674]
[3.12674]
```
        }
```
Deletion in crawl-ref/source/spells2.h at line 155 [4.562867]
B:BD[4.567871] → [6.762:824]
```
bool summon_spatial_vortices(int pow, bool god_gift = false);
```
Deletion in crawl-ref/source/spells2.cc at line 973 [4.569242]
B:BD[7.561] → [8.569:570]
B:BD[8.570] → [6.826:879]
∅:D[6.879] → [8.612:614]
∅:D[9.1417] → [8.612:614]
B:BD[8.612] → [8.612:614]
B:BD[8.614] → [9.1418:1445]
∅:D[9.1445] → [8.614:655]
B:BD[8.614] → [8.614:655]
∅:D[7.561] → [4.599614:599615]
∅:D[8.655] → [4.599614:599615]
B:BD[4.599614] → [4.599614:599615]
B:BD[4.599615] → [5.398:440]
∅:D[5.440] → [6.909:950]
B:BD[6.909] → [6.909:950]
```
bool summon_spatial_vortices(int pow, bool god_gift)
{
    bool success = false;
    mpr("Space twists in upon itself!");
    // Maximum power is 300 (5 vortices).
    const int how_many = (pow / 75 + 1);
```

Deletion in crawl-ref/source/spells2.cc at line 974 [4.569242]

∅:D[6.951] → [9.1446:1519]

B:BD[4.599615] → [9.1446:1519]

∅:D[9.1519] → [8.684:743]

B:BD[8.684] → [8.684:743]

B:BD[8.743] → [9.1520:1723]

∅:D[9.1723] → [8.855:858]

B:BD[8.855] → [8.855:858]

    for (int i = 0; i < how_many; ++i)
    {
        if (create_monster(
               mgen_data(MONS_SPATIAL_VORTEX, BEH_HOSTILE,
                         3, you.pos(), MHITYOU,
                         (god_gift ? MG_GOD_GIFT : 0) | MG_FORCE_BEH)) != -1)
        {
            success = true;
        }
    }
    return (success);
}

Don't mark spatial vortices as god gifts anymore, as (a) they're just

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 2319 [4.293070]

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

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

Insertion in crawl-ref/source/spl-cast.cc at line 2425 [4.293070]

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

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

Insertion in crawl-ref/source/spl-cast.cc at line 2559 [4.293070]

Deletion in crawl-ref/source/spells2.h at line 155 [4.562867]

Deletion in crawl-ref/source/spells2.cc at line 973 [4.569242]

Deletion in crawl-ref/source/spells2.cc at line 974 [4.569242]