fiddlerwoaroof/crawl - Change PACHJJO52BZM5BCXAWPQGJKLIRFSKAY6SIXZQFTHJ2HQWFQS2MCAC

Clean up summon_general_creature() some more.

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

Created by dolorous on June 6, 2008

PACHJJO52BZM5BCXAWPQGJKLIRFSKAY6SIXZQFTHJ2HQWFQS2MCAC

Dependencies

In channels

main

Change contents

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

[3.391]

[2.232]


        int unfriendly =
            (spell == SPELL_SUMMON_DEMON || spell == SPELL_DEMONIC_HORDE
                || spell == SPELL_SUMMON_UGLY_THING) ? 3
                                                     : -1;

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

B:BD[2.252] → [2.252:394]

            (spell == SPELL_SUMMON_BUTTERFLIES)  ? 3
                                                 : std::min(2 + (random2(powc) / 4), 6);

[2.252]

[2.394]

            (spell == SPELL_SUMMON_BUTTERFLIES)      ? 3
                                                     : std::min(2 + (random2(powc) / 4), 6);

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

B:BD[2.417] → [2.417:640]

            (spell == SPELL_SUMMON_BUTTERFLIES)  ? std::max(15, 4 + random2(3) + random2(powc) / 10) :
            (spell == SPELL_DEMONIC_HORDE)       ? 7 + random2(5)
                                                 : 1;

[2.417]

[3.391]

            (spell == SPELL_SUMMON_BUTTERFLIES)      ? std::max(15, 4 + random2(3) + random2(powc) / 10) :
            (spell == SPELL_DEMONIC_HORDE)           ? 7 + random2(5)
                                                     : 1;

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

B:BD[3.1243] → [2.1128:1204]

            summon_general_creature(powc, mon, BEH_FRIENDLY, numsc, false);

[3.1243]

[3.1287]

            summon_general_creature(powc, mon, BEH_FRIENDLY, unfriendly,
                                    numsc, false);

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

B:BD[3.1715] → [2.1212:1281]

                             int numsc = -1, bool god_gift = false);

[3.1715]

[4.567662]

                             int unfriendly = -1, int numsc = -1,
                             bool god_gift = false);

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

B:BD[3.1833] → [2.1283:1338]

                             int numsc, bool god_gift)

[3.1833]

[5.429]

                             int unfriendly, int numsc, bool god_gift)

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

[5.431]

[6.4034]

    if (beha == BEH_FRIENDLY && random2(pow) > unfriendly)
        beha = BEH_HOSTILE;
    if (numsc == -1)
        numsc = std::min(2 + (random2(pow) / 4), 6);

Replacement in crawl-ref/source/spells2.cc at line 1585 [4.569242]
B:BD[7.1952] → [2.2035:2079]
∅:D[2.2079] → [7.2048:2072]
B:BD[7.2048] → [7.2048:2072]
∅:D[7.2072] → [4.605973:605983]
∅:D[8.2776] → [4.605973:605983]
B:BD[4.605973] → [4.605973:605983]
```
        bool friendly = (random2(pow) > 3);
        if (!friendly)
        {
```
[7.1952]
[2.2080]
```
        if (beha == BEH_HOSTILE)
```
Deletion in crawl-ref/source/spells2.cc at line 1587 [4.569242]
B:BD[2.2131] → [2.2131:2132]
∅:D[2.2132] → [4.605983:606015]
∅:D[8.2842] → [4.605983:606015]
B:BD[4.605983] → [4.605983:606015]
B:BD[4.606015] → [8.2843:2874]
∅:D[8.2874] → [4.606063:606073]
B:BD[4.606063] → [4.606063:606073]
```
            beha = BEH_HOSTILE;
            hitting = MHITYOU;
        }
```
Insertion in crawl-ref/source/spells2.cc at line 1609 [4.569242]
[9.581]
[6.4448]
```
    else
        canned_msg(MSG_NOTHING_HAPPENS);
```