fiddlerwoaroof/crawl - Change SJXOZ6J66G3S5VYGIZ3YHEUCKUF5554YEFUYLVBH7X4ALYSXKTGQC

Summon Animal ('The Herd') and Summon Any ('summoning') implemented.

They need balancing, of course. Only the Spade, dancing weapon, and Blade to go, I think…

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

Created by haranp on June 26, 2007

SJXOZ6J66G3S5VYGIZ3YHEUCKUF5554YEFUYLVBH7X4ALYSXKTGQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells2.h at line 146 [5.562867]
[5.567903]
[5.567903]
```
void summon_animals(int pow);
```

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

B:BD[5.602825] → [5.602825:602896]

    int thing_called = MONS_PROGRAM_BUG;        // error trapping{dlb}

[5.602825]

[5.602896]

    monster_type thing_called = MONS_PROGRAM_BUG; // error trapping{dlb}

Replacement in crawl-ref/source/spells2.cc at line 1276 [5.569242]
B:BD[5.603299] → [5.603299:603350]
```
        case 75:
        case 74:
        case 38:
```
[5.603299]
[5.603350]
```
        case 75: case 74: case 38:
```

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

B:BD[5.603414] → [5.603414:603516]

        case 65:
        case 64:
        case 63:
        case 27:
        case 26:
        case 25:

[5.603414]

[5.603516]

        case 65: case 64: case 63: case 27: case 26: case 25:

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

B:BD[5.603579] → [5.603579:603783]

        case 57:
        case 56:
        case 55:
        case 54:
        case 53:
        case 52:
        case 20:
        case 18:
        case 16:
        case 14:
        case 12:
        case 10:

[5.603579]

[5.603783]

        case 57: case 56: case 55: case 54: case 53: case 52:
        case 20: case 18: case 16: case 14: case 12: case 10:

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

[5.604190]

void summon_animals(int pow)
{
    // maybe we should just generate a Lair monster instead? (and
    // guarantee that it is mobile)
    const monster_type animals[] = {
        MONS_BUMBLEBEE, MONS_WAR_DOG, MONS_SHEEP, MONS_YAK,
        MONS_HOG, MONS_SOLDIER_ANT, MONS_WOLF,
        MONS_GRIZZLY_BEAR, MONS_POLAR_BEAR, MONS_BLACK_BEAR, 
        MONS_GIANT_SNAIL, MONS_BORING_BEETLE, MONS_GILA_MONSTER,
        MONS_KOMODO_DRAGON, MONS_SPINY_FROG, MONS_HOUND
    };
    int num_so_far = 0;
    int power_left = pow + 1;
    while ( power_left >= 0 && num_so_far < 8 )
    {
        // pick a random monster and subtract its cost
        monster_type mon_chosen = animals[random2(ARRAYSIZE(animals))];
        const int power_cost = mons_power(mon_chosen) * 3;
        // allow a certain degree of overuse, but not too much
        if ( power_cost >= power_left * 2 &&
             num_so_far > 0 ) // at least one monster, in any case
            break;
        power_left -= power_cost;
        num_so_far++;
        if ( random2(pow) < 5 ) // unfriendly
            create_monster( mon_chosen, 4, BEH_HOSTILE,
                            you.x_pos, you.y_pos, MHITYOU, 250 );
        else
            create_monster( mon_chosen, 4, BEH_FRIENDLY,
                            you.x_pos, you.y_pos, you.pet_target, 250 );
    }
}

Insertion in crawl-ref/source/decks.cc at line 966 [5.3987460]

[2.428]

[6.7369]

}
static void summon_any_monster(int power, deck_rarity_type rarity)
{
    const int power_level = get_power_level(power, rarity);
    monster_type mon_chosen = NUM_MONSTERS;
    int chosen_x, chosen_y;
    int num_tries;
    if ( power_level == 0 )
        num_tries = 1;
    else if ( power_level == 1 )
        num_tries = 4;
    else
        num_tries = 18;
    for ( int i = 0; i < num_tries; ++i ) {
        int dx, dy;
        do {
            dx = random2(3) - 1;
            dy = random2(3) - 1;
        } while ( dx == 0 && dy == 0 );
        monster_type cur_try;
        do {
            cur_try = random_monster_at_grid(you.x_pos + dx, you.y_pos + dy);
        } while ( mons_is_unique(cur_try) );
        if ( mon_chosen == NUM_MONSTERS ||
             mons_power(mon_chosen) < mons_power(cur_try) )
        {
            mon_chosen = cur_try;
            chosen_x = you.x_pos;
            chosen_y = you.y_pos;
        }
    }
    if ( mon_chosen == NUM_MONSTERS ) // should never happen
        return;
    
    if ( power_level == 0 && one_chance_in(4) )
        create_monster( mon_chosen, 3, BEH_HOSTILE,
                        chosen_x, chosen_y, MHITYOU, 250 );
    else
        create_monster( mon_chosen, 3, BEH_FRIENDLY,
                        chosen_x, chosen_y, you.pet_target, 250 );

Insertion in crawl-ref/source/decks.cc at line 1079 [5.3987460]

[6.7512]

[3.998]

    case CARD_SUMMON_ANIMAL:    summon_animals(random2(power/3)); break;
    case CARD_SUMMON_ANY:       summon_any_monster(power, rarity); break;

Insertion in crawl-ref/source/decks.cc at line 1084 [5.3987460]
[7.4440]
[8.29625]
```
    case CARD_SUMMON_WEAPON:
        // XXX not yet implemented
```

Deletion in crawl-ref/source/decks.cc at line 1109 [5.3987460]

B:BD[5.4008069] → [4.1949:2123]

    case CARD_SUMMON_ANIMAL: break; // not yet implemented
    case CARD_SUMMON_WEAPON: break; // not yet implemented
    case CARD_SUMMON_ANY: break; // not yet implemented