fiddlerwoaroof/crawl - Change TXF4NRVICF3RMD3VQARDJKGOGBGIJNO6FKOV5POTF73XQHNB6WVAC

Clean up the summoning spell code some more.

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

Created by dolorous on April 19, 2008

TXF4NRVICF3RMD3VQARDJKGOGBGIJNO6FKOV5POTF73XQHNB6WVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1325 [5.569242]

B:BD[5.601662] → [5.601662:601765]

    if ((type_summoned == MONS_FIRE_ELEMENTAL
            && random2(10) >= you.skills[SK_FIRE_MAGIC])

[5.601662]

[5.601765]

    bool friendly = ((type_summoned == MONS_FIRE_ELEMENTAL
                        && random2(10) < you.skills[SK_FIRE_MAGIC])

Replacement in crawl-ref/source/spells2.cc at line 1328 [5.569242]

B:BD[5.601766] → [5.601766:601933]

        || (type_summoned == MONS_WATER_ELEMENTAL
            && random2((you.species == SP_MERFOLK) ? 5 : 15)
                           >= you.skills[SK_ICE_MAGIC])

[5.601766]

[5.601933]

                        || (type_summoned == MONS_WATER_ELEMENTAL
                            && random2((you.species == SP_MERFOLK) ? 5 : 15)
                                < you.skills[SK_ICE_MAGIC])

Replacement in crawl-ref/source/spells2.cc at line 1332 [5.569242]

B:BD[5.601934] → [5.601934:602038]

        || (type_summoned == MONS_AIR_ELEMENTAL
            && random2(15) >= you.skills[SK_AIR_MAGIC])

[5.601934]

[5.602038]

                        || (type_summoned == MONS_AIR_ELEMENTAL
                            && random2(15) < you.skills[SK_AIR_MAGIC])

Replacement in crawl-ref/source/spells2.cc at line 1335 [5.569242]

B:BD[5.602039] → [5.602039:602147]

        || (type_summoned == MONS_EARTH_ELEMENTAL
            && random2(5)  >= you.skills[SK_EARTH_MAGIC])

[5.602039]

[5.602147]

                        || (type_summoned == MONS_EARTH_ELEMENTAL
                            && random2(5)  < you.skills[SK_EARTH_MAGIC])

Replacement in crawl-ref/source/spells2.cc at line 1338 [5.569242]

B:BD[5.602148] → [5.602148:602266]

B:BD[5.602266] → [6.2906:3027]

∅:D[6.3027] → [7.924:991]

B:BD[7.924] → [7.924:991]

        || random2(100) < unfriendly)
    {
        summ_success = create_monster( type_summoned, numsc, BEH_HOSTILE,
                                       targ_x, targ_y, MHITYOU,
                                       MONS_PROGRAM_BUG,
                                       false, false, false, true);

[5.602148]

[5.602337]

                        || random2(100) >= unfriendly);

Replacement in crawl-ref/source/spells2.cc at line 1340 [5.569242]

B:BD[5.602338] → [5.602338:602369]

∅:D[8.324] → [5.602369:602448]

B:BD[5.602369] → [5.602369:602448]

∅:D[8.335] → [5.602448:602544]

B:BD[5.602448] → [5.602448:602544]

B:BD[5.602544] → [6.3028:3156]

∅:D[6.3156] → [7.1068:1135]

B:BD[7.1068] → [7.1068:1135]

∅:D[7.1135] → [5.602622:602628]

B:BD[5.602622] → [5.602622:602628]

        if (summ_success >= 0)
            mpr( "The elemental doesn't seem to appreciate being summoned." );
    }
    else
    {
        summ_success = create_monster( type_summoned, numsc, BEH_FRIENDLY,
                                       targ_x, targ_y, you.pet_target,
                                       MONS_PROGRAM_BUG,
                                       false, false, false, true);
    }

[5.602338]

[5.602628]

    summ_success = create_monster( type_summoned, numsc,
                                   friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                                   targ_x, targ_y,
                                   friendly ? you.pet_target : MHITYOU,
                                   MONS_PROGRAM_BUG, false, false,
                                   false, true );
    if (summ_success >= 0 && !friendly)
        mpr( "The elemental doesn't seem to appreciate being summoned." );

Insertion in crawl-ref/source/spells2.cc at line 1438 [5.569242]
[9.1497]
[9.1497]
```
        bool friendly = (random2(pow) > 4);
```

Replacement in crawl-ref/source/spells2.cc at line 1441 [5.569242]

B:BD[9.1498] → [9.1498:1600]

B:BD[9.1600] → [6.3290:3423]

∅:D[7.1376] → [9.1666:1736]

∅:D[6.3423] → [9.1666:1736]

B:BD[9.1666] → [9.1666:1736]

B:BD[9.1736] → [6.3424:3564]

        if ( random2(pow) < 5 ) // unfriendly
            create_monster( mon_chosen, 4, BEH_HOSTILE,
                            you.x_pos, you.y_pos, MHITYOU,
                            MONS_PROGRAM_BUG, false, false, false, true);
        else
            create_monster( mon_chosen, 4, BEH_FRIENDLY,
                            you.x_pos, you.y_pos, you.pet_target,
                            MONS_PROGRAM_BUG, false, false, false, true);

[9.1498]

[9.1809]

        create_monster( mon_chosen, 4,
                        friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                        you.x_pos, you.y_pos,
                        friendly ? you.pet_target : MHITYOU,
                        MONS_PROGRAM_BUG, false, false, false, true);

Replacement in crawl-ref/source/spells2.cc at line 1457 [5.569242]

B:BD[5.604422] → [5.604422:604463]

B:BD[5.604463] → [4.169:232]

∅:D[4.232] → [6.3565:3628]

B:BD[8.430] → [6.3565:3628]

B:BD[6.3628] → [4.233:363]

∅:D[4.363] → [5.604627:604699]

∅:D[8.581] → [5.604627:604699]

B:BD[5.604627] → [5.604627:604699]

B:BD[5.604699] → [4.364:378]

∅:D[4.378] → [5.604713:604736]

B:BD[5.604713] → [5.604713:604736]

        if (random2(pow) <= 3)
        {
            if (create_monster( MONS_SCORPION, 3, BEH_HOSTILE,
                                you.x_pos, you.y_pos, MHITYOU,
                                MONS_PROGRAM_BUG, false, false,
                                false, true) != -1)
            {
                mpr("A scorpion appears. It doesn't look very happy.");
            }
        }
        else

[5.604422]

[5.604736]

        bool friendly = (random2(pow) > 3);
        if (create_monster( MONS_SCORPION, 3,
                            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/spells2.cc at line 1466 [5.569242]

B:BD[5.604746] → [10.4343:4407]

B:BD[10.4407] → [4.379:565]

∅:D[4.565] → [5.604937:604951]

∅:D[7.1759] → [5.604937:604951]

B:BD[5.604937] → [5.604937:604951]

            if (create_monster( MONS_SCORPION, 3, BEH_FRIENDLY,
                                you.x_pos, you.y_pos, you.pet_target,
                                MONS_PROGRAM_BUG, false, false,
                                false, true) != -1)
            {

[5.604746]

[5.604951]

            if (friendly)

Replacement in crawl-ref/source/spells2.cc at line 1468 [5.569242]

B:BD[5.604995] → [5.604995:605009]

[5.604995]

[5.605009]

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

Insertion in crawl-ref/source/spells2.cc at line 1478 [5.569242]
[11.561]
[11.561]

Replacement in crawl-ref/source/spells2.cc at line 1480 [5.569242]

B:BD[11.614] → [4.566:641]

    const char *prefix = (ugly == MONS_VERY_UGLY_THING) ? " very " : "n ";

[11.614]

[11.683]


    bool friendly = (random2(pow) > 3);

Replacement in crawl-ref/source/spells2.cc at line 1483 [5.569242]

B:BD[11.684] → [4.642:668]

    if (random2(pow) < 4)

[11.684]

[4.668]

    if (create_monster(ugly, numsc,
                       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/spells2.cc at line 1490 [5.569242]

B:BD[4.674] → [4.674:901]

        if (create_monster(ugly, numsc, BEH_HOSTILE,
                           you.x_pos, you.y_pos, MHITYOU,
                           MONS_PROGRAM_BUG, false, false,
                           false, true) != -1)
        {

[4.674]

[4.901]

        const char *prefix = (ugly == MONS_VERY_UGLY_THING) ? " very " : "n ";
        if (friendly)
            mprf("A%sugly thing appears.", prefix);
        else

Deletion in crawl-ref/source/spells2.cc at line 1496 [5.569242]

B:BD[4.981] → [4.981:1309]

        }
    }
    else
    {
        if (create_monster(ugly, numsc, BEH_FRIENDLY,
                           you.x_pos, you.y_pos, you.pet_target,
                           MONS_PROGRAM_BUG, false, false,
                           false, true) != -1)
        {
            mprf("A%sugly thing appears.", prefix);
        }

Insertion in crawl-ref/source/spells2.cc at line 1503 [5.569242]
[12.702]
[5.605268]
```
    int hitting = you.pet_target;
```

Replacement in crawl-ref/source/spells2.cc at line 1532 [5.569242]

B:BD[5.605910] → [5.605910:605973]

        mpr("A demon appears!");
        if (random2(pow) < 4)

[5.605910]

[5.605973]

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

Insertion in crawl-ref/source/spells2.cc at line 1536 [5.569242]
[5.605983]
[5.605983]
```
            mpr("A demon appears! It doesn't look very happy.");
```
Replacement in crawl-ref/source/spells2.cc at line 1538 [5.569242]
B:BD[5.606015] → [5.606015:606063]
```
            mpr("It doesn't look very happy.");
```
[5.606015]
[5.606063]
```
            hitting = MHITYOU;
```

Replacement in crawl-ref/source/spells2.cc at line 1545 [5.569242]

B:BD[3.221] → [3.221:286]

                                  you.x_pos, you.y_pos, MHITYOU,

[3.221]

[3.286]

                                  you.x_pos, you.y_pos, hitting,

Replacement in crawl-ref/source/spells2.cc at line 1710 [5.569242]

B:BD[2.407] → [2.407:487]

                            MONS_PROGRAM_BUG, false, false, false, true) != -1)

[2.407]

[5.608925]

                            MONS_PROGRAM_BUG, false, false,
                            false, true ) != -1)

Replacement in crawl-ref/source/spells2.cc at line 1738 [5.569242]

B:BD[5.609670] → [5.609670:609700]

        if (random2(pow) < 6)

[5.609670]

[5.609700]

        bool friendly = (random2(pow) > 5);
        if (create_monster( thing_called, 5,
                            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/spells2.cc at line 1747 [5.569242]

B:BD[5.609710] → [10.4519:4581]

B:BD[10.4581] → [6.4105:4218]

∅:D[6.4218] → [7.2072:2139]

B:BD[7.2072] → [7.2072:2139]

∅:D[7.2139] → [5.609857:609871]

B:BD[5.609857] → [5.609857:609871]

            if (create_monster( thing_called, 5, BEH_HOSTILE,
                                you.x_pos, you.y_pos, MHITYOU,
                                MONS_PROGRAM_BUG,
                                false, false, false, true ) != -1)
            {

[5.609710]

[5.609871]

            if (friendly)
                mpr("An insubstantial figure forms in the air.");
            else

Deletion in crawl-ref/source/spells2.cc at line 1751 [5.569242]

B:BD[5.609925] → [5.609925:609972]

B:BD[5.609972] → [10.4582:4645]

B:BD[10.4645] → [6.4219:4339]

∅:D[6.4339] → [7.2215:2282]

B:BD[7.2215] → [7.2215:2282]

∅:D[7.2282] → [5.610127:610221]

B:BD[5.610127] → [5.610127:610221]

            }
        }
        else
        {
            if (create_monster( thing_called, 5, BEH_FRIENDLY,
                                you.x_pos, you.y_pos, you.pet_target,
                                MONS_PROGRAM_BUG,
                                false, false, false, true ) != -1)
            {
                mpr("An insubstantial figure forms in the air.");
            }

Replacement in crawl-ref/source/spells2.cc at line 1796 [5.569242]

B:BD[5.611215] → [10.4646:4705]

∅:D[10.4705] → [13.319:361]

B:BD[13.319] → [13.319:361]

            create_monster( MONS_TENTACLED_MONSTROSITY, 6,
                            BEH_FRIENDLY,

[5.611215]

[6.4340]

            create_monster( MONS_TENTACLED_MONSTROSITY, 6, BEH_FRIENDLY,