fiddlerwoaroof/crawl - Change SO6OPFUUGKUK24KOXKAPNXR334J7NG76F3Y7ZGC6H3XYSGWTWXWAC

Clean up some more.

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

Created by dolorous on June 7, 2008

SO6OPFUUGKUK24KOXKAPNXR334J7NG76F3Y7ZGC6H3XYSGWTWXWAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 691 [3.224557]

B:BD[3.232189] → [3.232189:232265]

// usage: summon_swarm() summon_undead() summon_scorpions() summon_things()

[3.232189]

[3.232265]

// usage: cast_summon_swarm() summon_undead() summon_scorpions() summon_things()

Replacement in crawl-ref/source/spl-cast.cc at line 1487 [3.293070]

B:BD[2.299] → [2.299:327]

        summon_swarm(powc);

[2.299]

[2.327]

        cast_summon_swarm(powc);
        break;
    case SPELL_CALL_IMP:
        cast_call_imp(powc);

Deletion in crawl-ref/source/spl-cast.cc at line 1495 [3.293070]
∅:D[4.194] → [5.219:244]
∅:D[6.196] → [5.219:244]
∅:D[2.401] → [5.219:244]
B:BD[5.219] → [5.219:244]
```
    case SPELL_CALL_IMP:
```

Replacement in crawl-ref/source/spells3.h at line 85 [3.526814]

B:BD[3.529251] → [2.438:516]

bool dancing_weapon(int pow, bool force_hostile = false, bool quiet = false);

[3.529251]

[3.529301]

bool dancing_weapon(int pow, bool force_hostile = false,
                    bool quiet_fail = false);

Replacement in crawl-ref/source/spells3.cc at line 475 [3.531613]

B:BD[3.543441] → [2.518:579]

bool dancing_weapon(int pow, bool force_hostile, bool quiet)

[3.543441]

[3.543490]

bool dancing_weapon(int pow, bool force_hostile,
                    bool quiet_fail)

Replacement in crawl-ref/source/spells3.cc at line 520 [3.531613]
B:BD[7.628] → [2.1225:1245]
```
        if (!quiet)
```
[7.628]
[7.649]
```
        if (!quiet_fail)
```

Insertion in crawl-ref/source/spells2.h at line 138 [3.562867]

[2.1722]


// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - religion - spell
 * *********************************************************************** */
bool cast_summon_swarm(int pow, bool god_gift = false,
                       bool force_hostile = false, bool quiet = false);
// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - spell
 * *********************************************************************** */
bool cast_call_imp(int pow, bool god_gift = false);

Deletion in crawl-ref/source/spells2.h at line 174 [3.562867]

∅:D[8.208] → [3.568149:568378]

∅:D[2.1784] → [3.568149:568378]

∅:D[9.2026] → [3.568149:568378]

∅:D[10.4370] → [3.568149:568378]

B:BD[3.568149] → [3.568149:568378]

B:BD[3.568378] → [2.1785:1902]


// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - religion - spell
 * *********************************************************************** */
bool summon_swarm(int pow, bool god_gift = false, bool force_hostile = false,
                  bool quiet = false);

Replacement in crawl-ref/source/spells2.cc at line 1717 [3.569242]

B:BD[2.3301] → [2.3301:3393]

bool summon_swarm(int pow, bool god_gift, bool force_hostile,
                  bool quiet)

[2.3301]

[2.3393]

bool cast_summon_swarm(int pow, bool god_gift, bool force_hostile,
                       bool quiet)

Replacement in crawl-ref/source/spells2.cc at line 1791 [3.569242]
B:BD[2.5973] → [2.5973:6010]
```
            if (!god_gift && !quiet)
```
[2.5973]
[2.6010]
```
            if (!quiet)
```

Replacement in crawl-ref/source/spells2.cc at line 1799 [3.569242]

B:BD[2.6180] → [2.6180:6221]

    if (!god_gift && !quiet && !success)

[2.6180]

[2.6221]

    if (!quiet && !success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
bool cast_call_imp(int pow, bool god_gift)
{
    bool success = false;
    monster_type mon = (one_chance_in(3)) ? MONS_WHITE_IMP :
                       (one_chance_in(7)) ? MONS_SHADOW_IMP
                                          : MONS_IMP;
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    if (create_monster(
            mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                      you.pet_target,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)
    {
        success = true;
        mpr((mon == MONS_WHITE_IMP)  ? "A beastly little devil appears in a puff of frigid air." :
            (mon == MONS_SHADOW_IMP) ? "A shadowy apparition takes form in the air."
                                     : "A beastly little devil appears in a puff of flame.");
    }
    if (!success)

Deletion in crawl-ref/source/spells2.cc at line 2000 [3.569242]

B:BD[3.605292] → [6.1367:1392]

B:BD[6.1392] → [11.989:1027]

∅:D[11.1027] → [6.1392:1408]

B:BD[6.1392] → [6.1392:1408]

B:BD[6.1408] → [12.1110:1187]

∅:D[12.1187] → [13.557:576]

∅:D[6.1408] → [13.557:576]

B:BD[3.605292] → [13.557:576]

B:BD[13.576] → [6.1409:1493]

∅:D[6.1493] → [13.576:601]

B:BD[13.576] → [13.576:601]

B:BD[13.601] → [6.1494:1583]

∅:D[6.1583] → [14.169:195]

B:BD[13.601] → [14.169:195]

B:BD[14.195] → [6.1584:1645]

B:BD[6.1645] → [15.2181:2197]

    case MONS_BUTTERFLY:
        msg = "A butterfly appears.";
        break;
    case MONS_SCORPION:
        msg = "A scorpion appears.";
        break;
    case MONS_IMP:
        msg = "A beastly little devil appears in a puff of flame.";
        break;
    case MONS_WHITE_IMP:
        msg = "A beastly little devil appears in a puff of frigid air.";
        break;
    case MONS_SHADOW_IMP:
        msg = "A shadowy apparition takes form in the air.";
        break;

Replacement in crawl-ref/source/religion.cc at line 3135 [3.804403]

B:BD[16.3333] → [9.10251:10318]

B:BD[9.10318] → [2.9394:9453]

            bool success = summon_swarm(you.experience_level * 20,
                                        true, true, true);

[16.3333]

[16.3507]

            bool success = cast_summon_swarm(you.experience_level * 20,
                                             true, true, true);