fiddlerwoaroof/crawl - Change 5T56ZXHVBN4LBEOHZPRV65UNS2HJ7RX6AMU7GHNAJRAQ7QKECP5AC

Consolidate "Summon Dragon" into summon_general_creature() as well.

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

Created by dolorous on June 6, 2008

5T56ZXHVBN4LBEOHZPRV65UNS2HJ7RX6AMU7GHNAJRAQ7QKECP5AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1500 [4.293070]
[3.346]
[3.346]
```
        bool quiet = (spell == SPELL_SUMMON_BUTTERFLIES);
```

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

B:BD[2.260] → [2.260:317]

                || spell == SPELL_SUMMON_UGLY_THING) ? 3

[2.260]

[2.317]

                || spell == SPELL_SUMMON_UGLY_THING) ? 3 :
            (spell == SPELL_SUMMON_DRAGON)           ? 5

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

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

B:BD[2.434] → [2.434:527]

                                                     : std::min(2 + (random2(powc) / 4), 6);

[2.434]

[5.394]

                                                     : -1;

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

[5.911]

                case SPELL_SUMMON_DRAGON:
                    mon = MONS_DRAGON;
                    break;

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

B:BD[3.1243] → [2.764:837]

            summon_general_creature(powc, mon, BEH_FRIENDLY, unfriendly,

[3.1243]

[2.837]

            summon_general_creature(powc, quiet, mon, BEH_FRIENDLY, unfriendly,

Deletion in crawl-ref/source/spl-cast.cc at line 1921 [4.293070]
B:BD[4.338463] → [4.338463:338543]
```
    case SPELL_SUMMON_DRAGON:
        cast_summon_dragon(powc);
        break;
```
Deletion in crawl-ref/source/spells4.h at line 51 [4.434549]
B:BD[4.435843] → [4.435843:435877]
```
void cast_summon_dragon(int pow);
```

Deletion in crawl-ref/source/spells4.cc at line 572 [4.436250]

B:BD[4.456913] → [4.456913:456949]

B:BD[4.456965] → [4.456965:457301]

B:BD[4.457301] → [6.1253:1299]

∅:D[6.1299] → [4.457333:457334]

∅:D[7.4116] → [4.457333:457334]

B:BD[4.457333] → [4.457333:457334]

B:BD[4.457334] → [8.5513:5537]

B:BD[8.5537] → [9.350:386]

∅:D[9.386] → [8.5574:5742]

B:BD[8.5574] → [8.5574:5742]

∅:D[10.727] → [4.457515:457521]

∅:D[6.1571] → [4.457515:457521]

∅:D[8.5742] → [4.457515:457521]

B:BD[4.457515] → [4.457515:457521]

B:BD[4.457521] → [7.4117:4153]

B:BD[7.4153] → [6.1572:1633]

∅:D[6.1633] → [4.457643:457658]

∅:D[7.4212] → [4.457643:457658]

B:BD[4.457643] → [4.457643:457658]

B:BD[4.457658] → [6.1634:1677]

∅:D[6.1677] → [4.457716:457776]

∅:D[7.4247] → [4.457716:457776]

B:BD[4.457716] → [4.457716:457776]


void cast_summon_dragon(int pow)
{
    // Removed the chance of multiple dragons... one should be more
    // than enough, and if it isn't, the player can cast again...
    // especially since these aren't on the Abjuration plan... they'll
    // last until they die (maybe that should be changed, but this is
    // a very high level spell so it might be okay).  -- bwr
    const bool friendly = (random2(pow) > 5);
    if (create_monster(
            mgen_data( MONS_DRAGON,
                       friendly ? BEH_FRIENDLY : BEH_HOSTILE, 3,
                       you.pos(),
                       friendly ? you.pet_target : MHITYOU )) != -1)
    {
        mprf("A dragon appears.%s",
            friendly ? "" : " It doesn't look very happy.");
    }
    else
        canned_msg( MSG_NOTHING_HAPPENS );
}                               // end cast_summon_dragon()

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

B:BD[4.567617] → [3.1644:1715]

B:BD[3.1715] → [2.896:1015]

bool summon_general_creature(int pow, monster_type mon, beh_type beha,
                             int unfriendly = -1, int numsc = -1,
                             bool god_gift = false);

[4.567617]

[4.567662]

bool summon_general_creature(int pow, bool quiet, monster_type mon,
                             beh_type beha, int unfriendly = -1,
                             int numsc = -1, bool god_gift = false);

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

B:BD[4.605084] → [3.1762:1833]

B:BD[3.1833] → [2.1017:1088]

bool summon_general_creature(int pow, monster_type mon, beh_type beha,
                             int unfriendly, int numsc, bool god_gift)

[4.605084]

[11.429]

bool summon_general_creature(int pow, bool quiet, monster_type mon,
                             beh_type beha, int unfriendly,
                             int numsc, bool god_gift)

Insertion in crawl-ref/source/spells2.cc at line 1545 [4.569242]
[12.4114]
[12.4114]
Insertion in crawl-ref/source/spells2.cc at line 1553 [4.569242]
[5.1392]
[5.1392]
```
        msg = "A butterfly appears.";
```

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

[5.1694]

[4.605364]

        break;
    case MONS_UGLY_THING:
        msg = "An ugly thing appears.";
        break;
    case MONS_VERY_UGLY_THING:
        msg = "A very ugly thing appears.";

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

[4.605380]

[13.885]

    case MONS_DRAGON:
        msg = "A dragon appears.";
        break;

Deletion in crawl-ref/source/spells2.cc at line 1592 [4.569242]
B:BD[3.1894] → [3.1894:1951]
```
    case MONS_UGLY_THING:
    case MONS_VERY_UGLY_THING:
```

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

B:BD[6.1907] → [5.1820:2034]

∅:D[14.706] → [6.1951:1952]

∅:D[5.2034] → [6.1951:1952]

B:BD[6.1951] → [6.1951:1952]

B:BD[6.1952] → [2.1253:1286]

∅:D[2.1286] → [5.2080:2131]

B:BD[4.605983] → [5.2080:2131]

        msg = (mon == MONS_VERY_UGLY_THING) ? "A very ugly thing appears." :
              (mon == MONS_UGLY_THING)      ? "An ugly thing appears."
                                            : "A demon appears!";
        if (beha == BEH_HOSTILE)
            msg += " It doesn't look very happy.";

[6.1907]

[4.606073]

        msg = "A demon appears!";

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

[4.606096]

[8.8237]

    if (beha == BEH_HOSTILE)
        msg += " It doesn't look very happy.";

Insertion in crawl-ref/source/spells2.cc at line 1610 [4.569242]
[15.430]
[12.4295]
```
        if (!quiet)
            mprf("%s", msg.c_str());
```
Deletion in crawl-ref/source/spells2.cc at line 1615 [4.569242]
B:BD[12.4320] → [5.2133:2194]
```
        if (msg != "")
            mprf("%s", msg.c_str());
```
Replacement in crawl-ref/source/spells2.cc at line 1620 [4.569242]
B:BD[15.581] → [2.1287:1296]
```
    else
```
[15.581]
[2.1296]
```
    else if (!quiet)
```

Replacement in crawl-ref/source/abl-show.cc at line 1280 [4.4494389]

B:BD[4.4516177] → [3.4983:5041]

        summon_general_creature(you.experience_level * 4,

[4.4516177]

[3.5041]

        summon_general_creature(you.experience_level * 4, false,

Replacement in crawl-ref/source/abl-show.cc at line 1286 [4.4494389]

B:BD[16.1283118] → [3.5160:5218]

        summon_general_creature(you.experience_level * 4,

[16.1283118]

[3.5218]

        summon_general_creature(you.experience_level * 4, false,

Replacement in crawl-ref/source/abl-show.cc at line 1441 [4.4494389]

B:BD[4.4521266] → [3.5337:5401]

        summon_general_creature(you.skills[SK_INVOCATIONS] * 4,

[4.4521266]

[3.5401]

        summon_general_creature(you.skills[SK_INVOCATIONS] * 4, false,

Replacement in crawl-ref/source/abl-show.cc at line 1464 [4.4494389]

B:BD[4.4521858] → [3.5467:5536]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3,

[4.4521858]

[3.5536]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false,

Replacement in crawl-ref/source/abl-show.cc at line 1545 [4.4494389]

B:BD[4.4524574] → [3.5603:5672]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3,

[4.4524574]

[3.5672]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false,

Replacement in crawl-ref/source/abl-show.cc at line 1606 [4.4494389]

B:BD[4.4526722] → [3.5849:5918]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3,

[4.4526722]

[3.5918]

        summon_general_creature(20 + you.skills[SK_INVOCATIONS] * 3, false,

Consolidate "Summon Dragon" into summon_general_creature() as well.

Dependencies

In channels

Change contents

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

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

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

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

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

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

Deletion in crawl-ref/source/spl-cast.cc at line 1921 [4.293070]

Deletion in crawl-ref/source/spells4.h at line 51 [4.434549]

Deletion in crawl-ref/source/spells4.cc at line 572 [4.436250]

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

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

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

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