fiddlerwoaroof/crawl - Change ARUYZ6FYS52BELXCRNAU3EREQHTFTIGZWHZPL4OLKQRL6MFNMCHAC

Clean up again.

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

Created by dolorous on June 7, 2008

ARUYZ6FYS52BELXCRNAU3EREQHTFTIGZWHZPL4OLKQRL6MFNMCHAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1506 [3.293070]

[2.261]

    case SPELL_SUMMON_ICE_BEAST:
        cast_summon_ice_beast(powc);
        break;

Deletion in crawl-ref/source/spl-cast.cc at line 1511 [3.293070]
∅:D[4.190] → [3.328091:328124]
∅:D[5.191] → [3.328091:328124]
∅:D[6.198] → [3.328091:328124]
∅:D[7.244] → [3.328091:328124]
∅:D[2.319] → [3.328091:328124]
B:BD[3.328091] → [3.328091:328124]
```
    case SPELL_SUMMON_ICE_BEAST:
```
Insertion in crawl-ref/source/spells2.h at line 151 [3.562867]
[8.1197]
[2.327]
```
bool cast_call_canine_familiar(int pow, bool god_gift = false);
```

Replacement in crawl-ref/source/spells2.h at line 158 [3.562867]

B:BD[9.264] → [9.264:328]

bool cast_call_canine_familiar(int pow, bool god_gift = false);

[9.264]

[10.1722]

bool cast_summon_ice_beast(int pow, bool god_gift = false);

Insertion in crawl-ref/source/spells2.cc at line 1825 [3.569242]

[8.2214]

[2.444]

    }
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
bool cast_call_canine_familiar(int pow, bool god_gift)
{
    bool success = false;
    monster_type mon = MONS_PROGRAM_BUG;
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    const int chance = random2(pow);
    if (chance < 10)
        mon = MONS_JACKAL;
    else if (chance < 15)
        mon = MONS_HOUND;
    else
    {
        switch (chance % 7)
        {
        case 0:
            if (one_chance_in(you.species == SP_HILL_ORC ? 3 : 6))
                mon = MONS_WARG;
            else
                mon = MONS_WOLF;
            break;
        case 1:
        case 2:
            mon = MONS_WAR_DOG;
            break;
        case 3:
        case 4:
            mon = MONS_HOUND;
            break;
        default:
            mon = MONS_JACKAL;
            break;
        }
    }
    bool friendly = (random2(pow) > 3);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)
    {
        success = true;
        mprf("A canine appears!%s",
             friendly ? "" : " It doesn't look very happy.");

Replacement in crawl-ref/source/spells2.cc at line 1951 [3.569242]
∅:D[2.1903] → [9.331:386]
B:BD[9.331] → [9.331:386]
```
bool cast_call_canine_familiar(int pow, bool god_gift)
```
[2.1903]
[9.386]
```
bool cast_summon_ice_beast(int pow, bool god_gift)
```
Replacement in crawl-ref/source/spells2.cc at line 1955 [3.569242]
B:BD[9.415] → [9.415:456]
```
    monster_type mon = MONS_PROGRAM_BUG;
```
[9.415]
[9.456]
```
    monster_type mon = MONS_ICE_BEAST;
```

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

B:BD[9.514] → [9.514:891]


    const int chance = random2(pow);
    if (chance < 10)
        mon = MONS_JACKAL;
    else if (chance < 15)
        mon = MONS_HOUND;
    else
    {
        switch (chance % 7)
        {
        case 0:
            if (one_chance_in(you.species == SP_HILL_ORC ? 3 : 6))
                mon = MONS_WARG;
            else
                mon = MONS_WOLF;
            break;

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

B:BD[9.892] → [9.892:1057]

∅:D[9.1057] → [10.6287:6288]

B:BD[10.6287] → [10.6287:6288]

B:BD[10.6288] → [9.1058:1183]

        case 1:
        case 2:
            mon = MONS_WAR_DOG;
            break;
        case 3:
        case 4:
            mon = MONS_HOUND;
            break;
        default:
            mon = MONS_JACKAL;
            break;
        }
    }
    bool friendly = (random2(pow) > 3);

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

B:BD[9.1207] → [9.1207:1392]

            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, you.pos(),
                      friendly ? you.pet_target : MHITYOU,

[9.1207]

[9.1392]

            mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                      you.pet_target,

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

B:BD[9.1481] → [9.1481:1579]

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

[9.1481]

[9.1579]

        mpr("A chill wind blows around you.");

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

B:BD[11.4141] → [11.4141:4244]

            case SPELL_SUMMON_ICE_BEAST:
                mon = MONS_ICE_BEAST;
                break;

Deletion in crawl-ref/source/spells2.cc at line 2084 [3.569242]
∅:D[12.884] → [3.605292:605317]
B:BD[3.605292] → [3.605292:605317]
B:BD[3.605317] → [13.1646:1694]
B:BD[13.1694] → [14.1028:1044]
```
    case MONS_ICE_BEAST:
        msg = "A chill wind blows around you.";
        break;
```