fiddlerwoaroof/crawl - Change HWARR4GI55BIEIJFDE57Y6QOBJ35QP64BJKGEN4T6LR7SKQCFOUQC

Consolidate the shadow- and vortex-summoning routines some more.

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

Created by dolorous on June 9, 2008

HWARR4GI55BIEIJFDE57Y6QOBJ35QP64BJKGEN4T6LR7SKQCFOUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 2372 [4.293070]
B:BD[3.8559] → [2.161:198]
```
            summon_spatial_vortex();
```
[3.8559]
[4.352784]
```
            summon_spatial_vortices(1);
```

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

B:BD[3.9366] → [3.9366:9415]

∅:D[3.9415] → [4.354943:354957]

B:BD[4.354943] → [4.354943:354957]

B:BD[4.354957] → [3.9416:9514]

∅:D[5.543] → [4.355721:355739]

∅:D[3.9514] → [4.355721:355739]

B:BD[4.355721] → [4.355721:355739]

B:BD[4.355739] → [6.1967:2130]

∅:D[7.895] → [4.355935:355953]

∅:D[6.2130] → [4.355935:355953]

B:BD[4.355935] → [4.355935:355953]

B:BD[4.356170] → [4.356170:356184]

            mpr("Space twists in upon itself!");
            {
                const int count = 2 + random2(3);
                for (int i = 0; i < count; ++i)
                {
                    create_monster(
                        mgen_data(MONS_SPATIAL_VORTEX, BEH_HOSTILE, 3,
                                  you.pos(), MHITYOU));
                }
            }

[3.9366]

[4.356184]

            summon_spatial_vortices(2 + random2(3));

Deletion in crawl-ref/source/spl-cast.cc at line 2408 [4.293070]
∅:D[3.9649] → [4.356250:356251]
B:BD[4.356250] → [4.356250:356251]
Deletion in crawl-ref/source/spl-cast.cc at line 2485 [4.293070]
∅:D[3.11861] → [4.358917:358918]
B:BD[4.358917] → [4.358917:358918]
Replacement in crawl-ref/source/spl-cast.cc at line 2486 [4.293070]
B:BD[3.11878] → [2.199:236]
```
            summon_spatial_vortex();
```
[3.11878]
[3.12058]
```
            summon_spatial_vortices(1);
```
Deletion in crawl-ref/source/spl-cast.cc at line 2488 [4.293070]
∅:D[3.12077] → [4.359164:359165]
B:BD[4.359164] → [4.359164:359165]

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

B:BD[3.12492] → [3.12492:12541]

∅:D[3.12541] → [4.359623:359637]

B:BD[4.359623] → [4.359623:359637]

B:BD[4.359637] → [3.12542:12640]

∅:D[5.632] → [4.359776:359794]

∅:D[3.12640] → [4.359776:359794]

B:BD[4.359776] → [4.359776:359794]

B:BD[4.359794] → [6.2441:2477]

B:BD[6.2477] → [8.288:343]

B:BD[8.343] → [9.273:345]

∅:D[9.345] → [4.359990:360008]

∅:D[7.1109] → [4.359990:360008]

∅:D[6.2639] → [4.359990:360008]

B:BD[4.359990] → [4.359990:360008]

B:BD[4.360008] → [3.12641:12655]

            mpr("Space twists in upon itself!");
            {
                const int count = 2 + random2(3);
                for (int i = 0; i < count; ++i)
                {
                    create_monster(
                        mgen_data(MONS_SPATIAL_VORTEX,
                                  BEH_HOSTILE, 3, you.pos(), MHITYOU));
                }
            }

[3.12492]

[3.12655]

            summon_spatial_vortices(2 + random2(3));

Replacement in crawl-ref/source/spl-cast.cc at line 2793 [4.293070]
B:BD[3.19983] → [3.19983:20036]
∅:D[10.903] → [3.20161:20162]
∅:D[9.1105] → [3.20161:20162]
∅:D[7.1862] → [3.20161:20162]
∅:D[6.4400] → [3.20161:20162]
B:BD[3.20161] → [3.20161:20162]
B:BD[3.20162] → [11.161:255]
∅:D[11.255] → [4.369196:369197]
∅:D[9.1207] → [4.369196:369197]
∅:D[6.4535] → [4.369196:369197]
∅:D[3.20338] → [4.369196:369197]
B:BD[4.369196] → [4.369196:369197]
```
            mpr("Flickering shadows surround you.");
            for (int i = random2(3); i >= 0; --i)
                summon_shadow(false, true);
```
[3.19983]
[3.20396]
```
            summon_shadows(random2(3) + 1, true);
```

Replacement in crawl-ref/source/spells3.h at line 116 [4.526814]

B:BD[12.561] → [11.261:332]

bool summon_shadow(bool god_gift = false, bool force_hostile = false);

[12.561]

[13.489]

bool summon_shadows(int how_many, bool god_gift = false,
                    bool force_hostile = false);

Replacement in crawl-ref/source/spells3.cc at line 416 [4.531613]

B:BD[11.337] → [11.337:391]

bool summon_shadow(bool god_gift, bool force_hostile)

[11.337]

[11.391]

bool summon_shadows(int how_many, bool god_gift,
                    bool force_hostile)

Replacement in crawl-ref/source/spells3.cc at line 419 [4.531613]

B:BD[11.393] → [11.393:459]

B:BD[11.459] → [2.243:484]

    return (create_monster(
               mgen_data(MONS_SHADOW,
                         !force_hostile ? BEH_FRIENDLY : BEH_HOSTILE,
                         2, you.pos(),
                         !force_hostile ? you.pet_target : MHITYOU,
                         (god_gift ? MG_GOD_GIFT : 0))) != -1);

[11.393]

[13.924]

    bool success = false;
    mpr(how_many > 1 ? "Flickering shadows surround you."
                     : "A nearby shadow flickers.");
    for (int i = 0; i < how_many; ++i)
    {
        int monster =
            create_monster(
                mgen_data(MONS_SHADOW,
                          !force_hostile ? BEH_FRIENDLY : BEH_HOSTILE,
                          2, you.pos(),
                          !force_hostile ? you.pet_target : MHITYOU,
                          (god_gift ? MG_GOD_GIFT : 0) | MG_FORCE_BEH));
        if (monster != -1)
        {
            success = true;
            player_angers_monster(&menv[monster]);
        }
    }
    return (success);

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

B:BD[4.567871] → [2.486:537]

bool summon_spatial_vortex(bool god_gift = false);

[4.567871]

[2.537]

bool summon_spatial_vortices(int how_many, bool god_gift = false);

Replacement in crawl-ref/source/spells2.cc at line 974 [4.569242]
B:BD[2.570] → [2.570:612]
```
bool summon_spatial_vortex(bool god_gift)
```
[2.570]
[2.612]
```
bool summon_spatial_vortices(int how_many, bool god_gift)
```
Insertion in crawl-ref/source/spells2.cc at line 976 [4.569242]
[2.614]
[2.614]
```
    bool success = false;
```

Replacement in crawl-ref/source/spells2.cc at line 980 [4.569242]

B:BD[4.599615] → [2.656:684]

    return (create_monster(

[4.599615]

[2.684]

    for (int i = 0; i < how_many; ++i)
    {
        if (create_monster(

Replacement in crawl-ref/source/spells2.cc at line 984 [4.569242]

B:BD[2.743] → [2.743:855]

                         3, you.pos(),
                         MHITYOU, (god_gift ? MG_GOD_GIFT : 0))) != -1);

[2.743]

[2.855]

                         3, you.pos(), MHITYOU,
                         (god_gift ? MG_GOD_GIFT : 0) | MG_FORCE_BEH)) != -1)
        {
            success = true;
        }
    }
    return (success);

Replacement in crawl-ref/source/it_use3.cc at line 228 [4.2870456]
B:BD[4.2876500] → [11.3321:3350]
```
            summon_shadow();
```
[4.2876500]
[11.3350]
```
            summon_shadows(1);
```

Consolidate the shadow- and vortex-summoning routines some more.

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/spells3.h at line 116 [4.526814]

Replacement in crawl-ref/source/spells3.cc at line 416 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 419 [4.531613]

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

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

Insertion in crawl-ref/source/spells2.cc at line 976 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 980 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 984 [4.569242]

Replacement in crawl-ref/source/it_use3.cc at line 228 [4.2870456]