fiddlerwoaroof/crawl - Change 6EMXRBTQJU5JJP77EBZMYM5Z2CTCW22YRESUTVBQ2HJAS36QDVTQC

Do the same for "Summon Scorpions".

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

Created by dolorous on June 7, 2008

6EMXRBTQJU5JJP77EBZMYM5Z2CTCW22YRESUTVBQ2HJAS36QDVTQC

Dependencies

In channels

main

Change contents

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

B:BD[3.346] → [2.199:255]

        bool quiet = (spell == SPELL_SUMMON_BUTTERFLIES

[3.346]

[2.255]

        bool quiet =
            (spell == SPELL_SUMMON_BUTTERFLIES

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

B:BD[5.162] → [2.313:367]

        int unfriendly = (spell == SPELL_SUMMON_DEMON

[5.162]

[2.367]

        int unfriendly =
            (spell == SPELL_SUMMON_SCORPIONS
                || spell == SPELL_SUMMON_DEMON

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

B:BD[6.252] → [2.652:772]

            (spell == SPELL_SUMMON_BUTTERFLIES)        ? 3
                                                       : -1;

[6.252]

[7.399]

            (spell == SPELL_SUMMON_BUTTERFLIES
                || spell == SPELL_SUMMON_SCORPIONS) ? 3
                                                    : -1;

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

B:BD[6.417] → [2.773:1014]

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

[6.417]

[3.391]

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

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

[6.758]

[8.408]

                case SPELL_SUMMON_SCORPIONS:
                    mon = MONS_SCORPION;
                    break;

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

B:BD[3.1243] → [7.511:591]

∅:D[7.591] → [5.837:888]

B:BD[5.837] → [5.837:888]

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

[3.1243]

[3.1287]

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

Deletion in crawl-ref/source/spells2.h at line 144 [4.562867]
B:BD[4.567871] → [4.567871:567903]
B:BD[4.567903] → [9.361:362]
```
void summon_scorpions(int pow);
```

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

B:BD[10.1817] → [10.1817:1818]

∅:D[10.1818] → [4.604190:604365]

B:BD[4.604190] → [4.604190:604365]

B:BD[4.604365] → [11.3790:3841]

∅:D[11.3841] → [4.604416:604422]

B:BD[4.604416] → [4.604416:604422]

B:BD[4.604422] → [12.1648:1693]

B:BD[12.1693] → [13.7648:7676]

B:BD[13.7676] → [14.246:287]

∅:D[14.287] → [13.7718:7783]

B:BD[13.7718] → [13.7718:7783]

B:BD[13.7783] → [11.3842:3882]

∅:D[11.3882] → [13.7849:7920]

B:BD[13.7849] → [13.7849:7920]

∅:D[12.2029] → [4.604736:604746]

∅:D[13.7920] → [4.604736:604746]

B:BD[4.604736] → [4.604736:604746]

B:BD[4.604746] → [15.1682:1789]

∅:D[15.1789] → [4.605009:605083]

∅:D[12.2146] → [4.605009:605083]

B:BD[4.605009] → [4.605009:605083]


void summon_scorpions(int pow)
{
    int numsc = 1 + random2(pow) / 10 + random2(pow) / 10;
    numsc = stepdown_value(numsc, 2, 2, 6, 8);  //see stuff.cc - 12jan2000 {dlb}
    for (int scount = 0; scount < numsc; ++scount)
    {
        bool friendly = (random2(pow) > 3);
        if (create_monster(
                mgen_data(MONS_SCORPION,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                          3, you.pos(),
                          friendly ? you.pet_target : MHITYOU)) != -1)
        {
            mprf("A scorpion appears.%s",
                friendly ? "" : " It doesn't look very happy.");
        }
    }
}                               // end summon_scorpions()

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

[6.1408]

[16.557]

    case MONS_SCORPION:
        msg = "A scorpion appears.";
        break;

Replacement in crawl-ref/source/spells2.cc at line 1610 [4.569242]
B:BD[17.581] → [7.1448:1469]
```
    else if (!quiet)
```
[17.581]
[5.1296]
```
    else
```