fiddlerwoaroof/crawl - Change RDXVYNDERZPFQYVM6TAPCKWLDM7SB4JLYX6PYDVEQBX4SEVQOAHQC

Add more summoning spell cleanups.

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

Created by dolorous on April 19, 2008

RDXVYNDERZPFQYVM6TAPCKWLDM7SB4JLYX6PYDVEQBX4SEVQOAHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 473 [6.436250]

B:BD[4.2488] → [5.2342:2415]

∅:D[5.2415] → [7.218:271]

B:BD[7.218] → [7.218:271]

                        you.x_pos, you.y_pos, MHITYOU, MONS_PROGRAM_BUG,
                        false, false, false, true );

[4.2488]

[6.452444]

                        you.x_pos, you.y_pos, you.pet_target,
                        MONS_PROGRAM_BUG, false, false,
                        false, true );

Replacement in crawl-ref/source/spells4.cc at line 512 [6.436250]

B:BD[6.453134] → [2.254:318]

∅:D[2.318] → [5.2416:2470]

B:BD[4.2554] → [5.2416:2470]

∅:D[5.2470] → [7.313:362]

B:BD[7.313] → [7.313:362]

    create_monster( mon, 3, BEH_FRIENDLY, you.x_pos, you.y_pos,
                    you.pet_target, MONS_PROGRAM_BUG,
                    false, false, false, true );

[6.453134]

[6.453253]

    create_monster( mon, 3, BEH_FRIENDLY,
                    you.x_pos, you.y_pos, you.pet_target,
                    MONS_PROGRAM_BUG, false, false,
                    false, true );

Replacement in crawl-ref/source/spells4.cc at line 533 [6.436250]

B:BD[6.453710] → [8.948:1050]

    const beh_type behaviour = item_cursed( you.inv[ weapon ] )
        ? BEH_HOSTILE : BEH_FRIENDLY;

[6.453710]

[6.453838]

    const beh_type beha = item_cursed( you.inv[ weapon ] ) ? BEH_HOSTILE :
                                                             BEH_FRIENDLY;
    const int hitting = (beha == BEH_HOSTILE) ? MHITYOU :
                                                you.pet_target;

Replacement in crawl-ref/source/spells4.cc at line 557 [6.436250]

B:BD[6.454298] → [2.319:394]

∅:D[2.394] → [5.2471:2530]

B:BD[6.454374] → [5.2471:2530]

∅:D[5.2530] → [7.409:476]

B:BD[7.409] → [7.409:476]

            if (create_monster( mon, dur, behaviour, you.x_pos, you.y_pos,
                                MHITYOU, MONS_PROGRAM_BUG,
                                false, false, false, true ) != -1)

[6.454298]

[6.454428]

            if (create_monster( mon, dur, beha,
                                you.x_pos, you.y_pos, hitting,
                                MONS_PROGRAM_BUG, false, false,
                                false, true ) != -1)

Deletion in crawl-ref/source/spells4.cc at line 581 [6.436250]
B:BD[6.455189] → [6.455189:455212]
```
        how_many = 1;
```

Replacement in crawl-ref/source/spells4.cc at line 603 [6.436250]

B:BD[6.455977] → [5.2531:2675]

        create_monster(mon, dur, behaviour, you.x_pos, you.y_pos, MHITYOU,
                       MONS_PROGRAM_BUG, false, false, false, true);

[6.455977]

[6.456058]

        if (create_monster(mon, dur, beha,
                       you.x_pos, you.y_pos, hitting,
                       MONS_PROGRAM_BUG, false, false,
                       false, true) != -1)
        {
            how_many++;
        }

Deletion in crawl-ref/source/spells4.cc at line 632 [6.436250]
B:BD[6.456964] → [6.456964:456965]
Replacement in crawl-ref/source/spells4.cc at line 637 [6.436250]
B:BD[6.457301] → [9.4073:4116]
```
    const bool happy = (random2(pow) > 5);
```
[6.457301]
[6.457333]
```
    const bool friendly = (random2(pow) > 5);
```

Replacement in crawl-ref/source/spells4.cc at line 640 [6.436250]

∅:D[4.2645] → [6.457385:457447]

B:BD[6.457385] → [6.457385:457447]

B:BD[6.457447] → [5.2676:2749]

∅:D[5.2749] → [7.669:727]

B:BD[7.669] → [7.669:727]

                        (happy ? BEH_FRIENDLY : BEH_HOSTILE),
                        you.x_pos, you.y_pos, MHITYOU, MONS_PROGRAM_BUG,
                        false, false, false, true) != -1)

[4.2645]

[6.457515]

                        friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                        you.x_pos, you.y_pos,
                        friendly ? you.pet_target : MHITYOU,
                        MONS_PROGRAM_BUG, false, false,
                        false, true ) != -1)

Replacement in crawl-ref/source/spells4.cc at line 647 [6.436250]

B:BD[9.4153] → [9.4153:4212]

             happy ? "" : " It doesn't look very happy.");

[9.4153]

[6.457643]

            friendly ? "" : " It doesn't look very happy.");

Replacement in crawl-ref/source/spells4.cc at line 650 [6.436250]
B:BD[6.457658] → [9.4213:4247]
```
        mprf("Nothing happens.");
```
[6.457658]
[6.457716]
```
        canned_msg( MSG_NOTHING_HAPPENS );
```

Replacement in crawl-ref/source/spells2.cc at line 1466 [6.569242]

B:BD[6.604746] → [3.2030:2056]

∅:D[3.2056] → [6.604951:604995]

B:BD[6.604951] → [6.604951:604995]

B:BD[6.604995] → [3.2057:2146]

            if (friendly)
                mpr("A scorpion appears.");
            else
                mpr("A scorpion appears. It doesn't look very happy.");

[6.604746]

[6.605009]

            mprf("A scorpion appears.%s",
                friendly ? "" : " It doesn't look very happy.");

Replacement in crawl-ref/source/spells2.cc at line 1490 [6.569242]

B:BD[3.2573] → [3.2573:2660]

∅:D[3.2660] → [10.901:981]

B:BD[10.901] → [10.901:981]

        if (friendly)
            mprf("A%sugly thing appears.", prefix);
        else
            mprf("A%sugly thing appears. It doesn't look very happy.", prefix);

[3.2573]

[10.1309]

        mprf("A%sugly thing appears.%s", prefix,
            friendly ? "" : " It doesn't look very happy.");

Replacement in crawl-ref/source/spells2.cc at line 1528 [6.569242]

B:BD[6.605910] → [3.2696:2776]

        if (random2(pow) > 3)
            mpr("A demon appears!");
        else

[6.605910]

[6.605973]

    {
        bool friendly = (random2(pow) > 3);
        mprf("A demon appears!%s",
            friendly ? "" : " It doesn't look very happy.");
        if (!friendly)

Deletion in crawl-ref/source/spells2.cc at line 1536 [6.569242]
B:BD[6.605983] → [3.2777:2842]
```
            mpr("A demon appears! It doesn't look very happy.");
```
Replacement in crawl-ref/source/spells2.cc at line 1540 [6.569242]
B:BD[6.606088] → [6.606088:606089]
[6.606088]
[6.606089]
```
    }
```