fiddlerwoaroof/crawl - Change 5AZ6MLZVJXRGXNJYLWDQB5RS3A3GKIYS52RA4SOST3PR2FTFNNNQC

Consolidate the shadow-summoning routines.

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

Created by dolorous on June 9, 2008

5AZ6MLZVJXRGXNJYLWDQB5RS3A3GKIYS52RA4SOST3PR2FTFNNNQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 2821 [6.293070]

B:BD[5.20036] → [5.20036:20037]

B:BD[5.20037] → [7.4278:4306]

B:BD[7.4306] → [4.1012:1105]


            create_monster(
                mgen_data::alert_hostile_at(MONS_SHADOW,
                    you.pos(), 2));

Replacement in crawl-ref/source/spl-cast.cc at line 2822 [6.293070]

B:BD[5.20162] → [5.20162:20190]

B:BD[5.20190] → [7.4401:4433]

B:BD[7.4433] → [4.1106:1207]

            if (coinflip())
                create_monster(
                    mgen_data::alert_hostile_at(MONS_SHADOW,
                        you.pos(), 2));

[5.20162]

[6.369196]

            for (int i = random2(3); i >= 0; --i)
                summon_shadow(false, true);

Deletion in crawl-ref/source/spl-cast.cc at line 2825 [6.293070]

B:BD[6.369197] → [5.20339:20367]

B:BD[5.20367] → [4.1208:1222]

∅:D[4.1222] → [7.4536:4568]

B:BD[5.20367] → [7.4536:4568]

B:BD[7.4568] → [4.1223:1338]

            if (coinflip())
            {
                create_monster(
                    mgen_data::alert_hostile_at(MONS_SHADOW,
                        you.pos(), 2));
            }

Insertion in crawl-ref/source/spells3.h at line 116 [6.526814]
[8.561]
[2.489]
```
bool summon_shadow(bool god_gift = false, bool force_hostile = false);
```

Insertion in crawl-ref/source/spells3.cc at line 414 [6.531613]

[2.924]

}
bool summon_shadow(bool god_gift, bool force_hostile)
{
    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);

Replacement in crawl-ref/source/it_use3.cc at line 195 [6.2870456]

B:BD[6.2875345] → [9.763567:763673]

            torment( TORMENT_SPWLD, you.x_pos, you.y_pos );
            did_god_conduct( DID_UNHOLY, 1 );

[6.2875345]

[6.2875432]

            torment(TORMENT_SPWLD, you.x_pos, you.y_pos);
            did_god_conduct(DID_UNHOLY, 1);

Replacement in crawl-ref/source/it_use3.cc at line 204 [6.2870456]
∅:D[10.2961] → [9.763674:763724]
∅:D[3.13949] → [9.763674:763724]
B:BD[6.2875624] → [9.763674:763724]
```
            did_god_conduct( DID_NECROMANCY, 1 );
```
[3.13949]
[6.2875670]
```
            did_god_conduct(DID_NECROMANCY, 1);
```

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

B:BD[6.2876500] → [9.763725:763775]

B:BD[9.763775] → [7.44484:44623]

            did_god_conduct( DID_NECROMANCY, 1 );
            create_monster(
                mgen_data(MONS_SHADOW, BEH_FRIENDLY,
                          2, you.pos(), you.pet_target));

[6.2876500]

[6.2876687]

            summon_shadow();
            did_god_conduct(DID_NECROMANCY, 1);