fiddlerwoaroof/crawl - Change Q72IOCEGVWNC34LLHA4SEVNMCVKWHEIY5HA4FYGFFNC3WNRQDQ2QC

Consolidate "Call Canine Familiar" into summon_general_creature().

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

Created by dolorous on June 7, 2008

Q72IOCEGVWNC34LLHA4SEVNMCVKWHEIY5HA4FYGFFNC3WNRQDQ2QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1495 [6.293070]
[5.191]
[6.328091]
```
    case SPELL_CALL_CANINE_FAMILIAR:
```

Replacement in crawl-ref/source/spl-cast.cc at line 1501 [6.293070]

B:BD[7.346] → [3.161:219]

        bool quiet = (spell == SPELL_SUMMON_BUTTERFLIES);

[7.346]

[3.219]

        bool quiet = (spell == SPELL_SUMMON_BUTTERFLIES
                || spell == SPELL_CALL_CANINE_FAMILIAR);

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

B:BD[8.162] → [8.162:260]

B:BD[8.260] → [3.221:337]

∅:D[3.337] → [8.317:376]

B:BD[8.317] → [8.317:376]

        int unfriendly =
            (spell == SPELL_SUMMON_DEMON || spell == SPELL_DEMONIC_HORDE
                || spell == SPELL_SUMMON_UGLY_THING) ? 3 :
            (spell == SPELL_SUMMON_DRAGON)           ? 5
                                                     : -1;

[8.162]

[3.338]

        int unfriendly = (spell == SPELL_SUMMON_DEMON
                || spell == SPELL_DEMONIC_HORDE
                || spell == SPELL_CALL_CANINE_FAMILIAR
                || spell == SPELL_SUMMON_UGLY_THING)   ? 3 :
            (spell == SPELL_SUMMON_DRAGON)             ? 5
                                                       : -1;

Replacement in crawl-ref/source/spl-cast.cc at line 1514 [6.293070]

B:BD[9.252] → [8.377:434]

B:BD[8.434] → [3.340:399]

            (spell == SPELL_SUMMON_BUTTERFLIES)      ? 3
                                                     : -1;

[9.252]

[3.399]

            (spell == SPELL_SUMMON_BUTTERFLIES)        ? 3
                                                       : -1;

Replacement in crawl-ref/source/spl-cast.cc at line 1518 [6.293070]

B:BD[9.417] → [8.528:763]

            (spell == SPELL_SUMMON_BUTTERFLIES)      ? std::max(15, 4 + random2(3) + random2(powc) / 10) :
            (spell == SPELL_DEMONIC_HORDE)           ? 7 + random2(5)
                                                     : 1;

[9.417]

[7.391]

            (spell == SPELL_SUMMON_BUTTERFLIES)        ? std::max(15, 4 + random2(3) + random2(powc) / 10) :
            (spell == SPELL_DEMONIC_HORDE)             ? 7 + random2(5)
                                                       : 1;

Insertion in crawl-ref/source/spl-cast.cc at line 1545 [6.293070]

[7.654]

[5.1038]

                case SPELL_CALL_CANINE_FAMILIAR:
                {
                    const int chance = random2(powc);
                    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;
                        }
                    }
                }

Deletion in crawl-ref/source/spl-cast.cc at line 1952 [6.293070]
B:BD[6.338371] → [4.300:337]
∅:D[4.337] → [6.338407:338463]
B:BD[6.338407] → [6.338407:338463]
```
    case SPELL_CALL_CANINE_FAMILIAR:
        cast_summon_large_mammal(powc);
        break;
```
Deletion in crawl-ref/source/spells4.h at line 53 [6.434549]
B:BD[6.435920] → [6.435920:435960]
```
void cast_summon_large_mammal(int pow);
```

Deletion in crawl-ref/source/spells4.cc at line 416 [6.436250]

B:BD[6.452258] → [6.452258:452259]

B:BD[6.452453] → [6.452453:452494]

B:BD[6.452494] → [10.3405:3467]

∅:D[10.3467] → [6.452541:452720]

B:BD[6.452541] → [6.452541:452720]

B:BD[6.452720] → [2.165:232]

∅:D[2.232] → [6.452784:453133]

B:BD[6.452784] → [6.452784:453133]


void cast_summon_large_mammal(int pow)
{
    monster_type mon;
    const int temp_rand = random2(pow);
    if (temp_rand < 10)
        mon = MONS_JACKAL;
    else if (temp_rand < 15)
        mon = MONS_HOUND;
    else
    {
        switch (temp_rand % 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;
        }
    }

Deletion in crawl-ref/source/spells4.cc at line 417 [6.436250]
B:BD[6.453134] → [11.5092:5202]
∅:D[12.362] → [6.453253:453256]
∅:D[13.510] → [6.453253:453256]
∅:D[11.5202] → [6.453253:453256]
B:BD[6.453253] → [6.453253:453256]
```
    create_monster(
        mgen_data( mon, BEH_FRIENDLY, 3,
                   you.pos(), you.pet_target ));
}
```

Insertion in crawl-ref/source/spells2.cc at line 1566 [6.569242]

[9.1645]

[14.760]

        break;
    case MONS_JACKAL:
    case MONS_HOUND:
    case MONS_WARG:
    case MONS_WOLF:
    case MONS_WAR_DOG:
        msg = "A canine appears!";