fiddlerwoaroof/crawl - Change RDLF4VIJMMHHL2OCQEXOK6HNCS5QX3FZF3S4IHPY3OZUKC2FZ24AC

Clean up "Summon Elemental".

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

Created by dolorous on June 8, 2008

RDLF4VIJMMHHL2OCQEXOK6HNCS5QX3FZF3S4IHPY3OZUKC2FZ24AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 1454 [7.293070]
B:BD[5.132065] → [6.7404:7438]
∅:D[6.7438] → [7.327733:327782]
∅:D[5.132090] → [7.327733:327782]
B:BD[7.327733] → [7.327733:327782]
B:BD[7.327782] → [8.161:204]
```
            return (SPRET_ABORT);
        break;
    case SPELL_SUMMON_ELEMENTAL:
        if (!summon_elemental(powc, 0, 2))
```

Insertion in crawl-ref/source/spl-cast.cc at line 1490 [7.293070]

[9.255]

[10.161]

    case SPELL_SUMMON_ELEMENTAL:
        if (!summon_elemental(powc))
            return (SPRET_ABORT);
        break;

Replacement in crawl-ref/source/spells2.h at line 62 [7.562867]

B:BD[7.564727] → [8.451:552]

bool summon_elemental(int pow, int restricted_type,
                      unsigned char unfriendly);

[7.564727]

[7.564816]

bool summon_elemental(int pow, bool god_gift = false,
                      monster_type restricted_type = MONS_PROGRAM_BUG,
                      int unfriendly = 2);

Deletion in crawl-ref/source/spells2.cc at line 1424 [7.569242]

B:BD[7.598389] → [7.598389:598601]

B:BD[7.598601] → [8.554:654]

∅:D[8.654] → [7.598709:598711]

B:BD[7.598709] → [7.598709:598711]

B:BD[7.598711] → [11.2155:2196]

∅:D[12.188] → [7.598810:598896]

∅:D[11.2196] → [7.598810:598896]

∅:D[13.7014] → [7.598810:598896]

B:BD[7.598810] → [7.598810:598896]

B:BD[7.598947] → [7.598947:598948]

B:BD[7.598948] → [14.565:618]

B:BD[14.618] → [15.586:635]

∅:D[14.618] → [7.599006:599007]

∅:D[15.635] → [7.599006:599007]

∅:D[16.4222] → [7.599006:599007]

B:BD[7.599006] → [7.599006:599007]

B:BD[7.599007] → [17.11198:11215]

∅:D[17.11215] → [7.599021:599099]

B:BD[7.599021] → [7.599021:599099]

B:BD[7.599099] → [18.715:762]

∅:D[18.762] → [7.599136:599175]

∅:D[5.152347] → [7.599136:599175]

B:BD[7.599136] → [7.599136:599175]

B:BD[7.599175] → [5.152348:152380]

B:BD[5.152380] → [2.169:197]

∅:D[2.197] → [7.599245:599436]

B:BD[7.599245] → [7.599245:599436]

B:BD[7.599436] → [19.158:168]

B:BD[19.168] → [11.2197:2266]

∅:D[11.2266] → [19.239:444]

B:BD[19.239] → [19.239:444]

∅:D[19.444] → [7.599467:599575]

B:BD[7.599467] → [7.599467:599575]

B:BD[7.599575] → [15.636:1199]

∅:D[15.1199] → [20.4282:4295]

B:BD[7.599575] → [20.4282:4295]

∅:D[20.4295] → [7.599589:599614]

B:BD[7.599589] → [7.599589:599614]


// 'unfriendly' is percentage chance summoned elemental goes
//              postal on the caster (after taking into account
//              chance of that happening to unskilled casters
//              anyway)
bool summon_elemental(int pow, int restricted_type,
                      unsigned char unfriendly)
{
    monster_type mon = MONS_PROGRAM_BUG;
    struct dist smove;
    int dir_x;
    int dir_y;
    int targ_x;
    int targ_y;
    int numsc = std::min(2 + (random2(pow) / 5), 6);
    bool any_elemental = (restricted_type == 0);
    while (true)
    {
        mpr("Summon from material in which direction?", MSGCH_PROMPT);
        direction( smove, DIR_DIR, TARG_ANY );
        if (!smove.isValid)
        {
            canned_msg(MSG_OK);
            return (false);
        }
        dir_x  = smove.dx;
        dir_y  = smove.dy;
        targ_x = you.x_pos + dir_x;
        targ_y = you.y_pos + dir_y;
        if (mgrd[ targ_x ][ targ_y ] != NON_MONSTER)
        {
            if (player_monster_visible(&menv[mgrd[targ_x][targ_y]]))
                mpr("There's something there already!");
            else
            {
                mpr("Something seems to disrupt your summoning.");
                return 0;
            }
        }
        else if (dir_x == 0 && dir_y == 0)
            mpr("You can't summon an elemental from yourself!");
        else if ((any_elemental || restricted_type == MONS_EARTH_ELEMENTAL)
                 && (grd[ targ_x ][ targ_y ] == DNGN_ROCK_WALL
                     || grd[ targ_x ][ targ_y ] == DNGN_CLEAR_ROCK_WALL))
        {
            if (targ_x <= 6 || targ_x >= 74 || targ_y <= 6 || targ_y >= 64)
            {
                mpr("That wall won't yield to your beckoning.");
                // XXX: Should this cost a turn?
            }
            else
            {
                mon = MONS_EARTH_ELEMENTAL;
                break;
            }
        }
        else
            break;
    }

Deletion in crawl-ref/source/spells2.cc at line 1425 [7.569242]

B:BD[7.599615] → [15.1200:1237]

∅:D[15.1237] → [7.599743:599749]

B:BD[7.599743] → [7.599743:599749]

B:BD[7.599749] → [15.1238:1284]

∅:D[15.1284] → [7.599914:599920]

B:BD[7.599914] → [7.599914:599920]

B:BD[7.599920] → [15.1285:1494]

∅:D[21.315] → [7.600214:600220]

∅:D[15.1494] → [7.600214:600220]

B:BD[7.600214] → [7.600214:600220]

B:BD[7.600220] → [11.2304:2339]

∅:D[11.2339] → [7.600265:600326]

B:BD[7.600265] → [7.600265:600326]

B:BD[7.600326] → [15.1495:1620]

∅:D[21.397] → [7.600455:600461]

∅:D[15.1620] → [7.600455:600461]

B:BD[7.600455] → [7.600455:600461]

B:BD[7.600461] → [11.2340:2375]

∅:D[11.2375] → [7.600506:600569]

B:BD[7.600506] → [7.600506:600569]

B:BD[7.600569] → [21.398:529]

B:BD[21.529] → [15.1621:1697]

∅:D[21.610] → [7.600770:600776]

∅:D[15.1697] → [7.600770:600776]

B:BD[7.600770] → [7.600770:600776]

B:BD[7.600776] → [11.2376:2412]

∅:D[11.2412] → [7.600822:600828]

B:BD[7.600822] → [7.600822:600828]

B:BD[7.600828] → [15.1698:1884]

∅:D[21.754] → [7.601017:601023]

∅:D[15.1884] → [7.601017:601023]

B:BD[7.601017] → [7.601017:601023]

B:BD[7.601023] → [11.2413:2447]

∅:D[11.2447] → [7.601067:601074]

B:BD[7.601067] → [7.601067:601074]

B:BD[7.601074] → [15.1885:1919]

∅:D[15.1919] → [11.2448:2481]

B:BD[7.601107] → [11.2448:2481]

∅:D[11.2481] → [7.601150:601197]

B:BD[7.601150] → [7.601150:601197]

B:BD[7.601197] → [8.655:679]

∅:D[8.679] → [7.601218:601372]

∅:D[5.152401] → [7.601218:601372]

B:BD[7.601218] → [7.601218:601372]

B:BD[7.601372] → [15.1920:2214]

B:BD[15.2214] → [3.169:296]

∅:D[22.296] → [7.601765:601766]

∅:D[23.296] → [7.601765:601766]

∅:D[3.296] → [7.601765:601766]

B:BD[7.601765] → [7.601765:601766]

B:BD[7.601766] → [3.297:492]

∅:D[3.492] → [7.601933:601934]

∅:D[23.500] → [7.601933:601934]

∅:D[21.951] → [7.601933:601934]

B:BD[7.601933] → [7.601933:601934]

B:BD[7.601934] → [3.493:618]

∅:D[22.576] → [7.602038:602039]

∅:D[3.618] → [7.602038:602039]

∅:D[23.636] → [7.602038:602039]

∅:D[21.1081] → [7.602038:602039]

B:BD[7.602038] → [7.602038:602039]

B:BD[7.602039] → [3.619:748]

∅:D[22.716] → [7.602147:602148]

∅:D[3.748] → [7.602147:602148]

∅:D[23.776] → [7.602147:602148]

∅:D[21.1215] → [7.602147:602148]

B:BD[7.602147] → [7.602147:602148]

B:BD[7.602148] → [3.749:805]

∅:D[22.773] → [7.602337:602338]

∅:D[3.805] → [7.602337:602338]

∅:D[23.833] → [7.602337:602338]

∅:D[24.991] → [7.602337:602338]

∅:D[21.1269] → [7.602337:602338]

B:BD[7.602337] → [7.602337:602338]

B:BD[7.602338] → [13.7015:7039]

B:BD[13.7039] → [11.2692:2836]

B:BD[11.2836] → [25.452:519]

∅:D[25.519] → [8.991:1027]

∅:D[11.2904] → [8.991:1027]

∅:D[13.7289] → [8.991:1027]

B:BD[8.991] → [8.991:1027]

∅:D[8.1027] → [23.1205:1206]

B:BD[23.1205] → [23.1205:1206]

B:BD[23.1206] → [8.1028:1047]

∅:D[8.1047] → [23.1246:1321]

B:BD[23.1246] → [23.1246:1321]

∅:D[23.1321] → [7.602628:602629]

B:BD[7.602628] → [7.602628:602629]

B:BD[7.602629] → [8.1048:1067]

∅:D[8.1067] → [7.602661:602719]

B:BD[7.602661] → [7.602661:602719]

B:BD[7.603261] → [7.603261:603262]

    if (mon == MONS_EARTH_ELEMENTAL)
    {
        grd[ targ_x ][ targ_y ] = DNGN_FLOOR;
    }
    else if (env.cgrid[ targ_x ][ targ_y ] != EMPTY_CLOUD
             && env.cloud[env.cgrid[ targ_x ][ targ_y ]].type == CLOUD_FIRE
             && (any_elemental || restricted_type == MONS_FIRE_ELEMENTAL))
    {
        mon = MONS_FIRE_ELEMENTAL;
        delete_cloud( env.cgrid[ targ_x ][ targ_y ] );
    }
    else if (grd[ targ_x ][ targ_y ] == DNGN_LAVA
             && (any_elemental || restricted_type == MONS_FIRE_ELEMENTAL))
    {
        mon = MONS_FIRE_ELEMENTAL;
    }
    else if ((grd[ targ_x ][ targ_y ] == DNGN_DEEP_WATER
                || grd[ targ_x ][ targ_y ] == DNGN_SHALLOW_WATER
                || grd[ targ_x ][ targ_y ] == DNGN_FOUNTAIN_BLUE)
             && (any_elemental || restricted_type == MONS_WATER_ELEMENTAL))
    {
        mon = MONS_WATER_ELEMENTAL;
    }
    else if (grd[ targ_x ][ targ_y ] >= DNGN_FLOOR
             && env.cgrid[ targ_x ][ targ_y ] == EMPTY_CLOUD
             && (any_elemental || restricted_type == MONS_AIR_ELEMENTAL))
    {
        mon = MONS_AIR_ELEMENTAL;
    }
    // Found something to summon?
    if (mon == MONS_PROGRAM_BUG)
    {
        canned_msg(MSG_NOTHING_HAPPENS);
        return (false);
    }
    // silly - ice for water? 15jan2000 {dlb}
    // little change here to help with the above... and differentiate
    // elements a bit... {bwr}
    // - Water elementals are now harder to be made reliably friendly.
    // - Air elementals are harder because they're more dynamic/dangerous.
    // - Earth elementals are more static and easy to tame (as before).
    // - Fire elementals fall in between the two (10 is still fairly easy).
    const bool friendly = ((mon != MONS_FIRE_ELEMENTAL
                            || random2(10) < you.skills[SK_FIRE_MAGIC])
                        && (mon != MONS_WATER_ELEMENTAL
                            || random2((you.species == SP_MERFOLK) ? 5 : 15)
                                  < you.skills[SK_ICE_MAGIC])
                        && (mon != MONS_AIR_ELEMENTAL
                            || random2(15) < you.skills[SK_AIR_MAGIC])
                        && (mon != MONS_EARTH_ELEMENTAL
                            || random2(5)  < you.skills[SK_EARTH_MAGIC])
                        && random2(100) >= unfriendly);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      numsc, coord_def(targ_x, targ_y),
                      friendly ? you.pet_target : MHITYOU)) != -1)
    {
        return (false);
    }
    if (!friendly)
        mpr( "The elemental doesn't seem to appreciate being summoned." );
    return (true);
}                               // end summon_elemental()

Insertion in crawl-ref/source/spells2.cc at line 1753 [7.569242]

[26.536]

[4.423]

// 'unfriendly' is percentage chance summoned elemental goes
//              postal on the caster (after taking into account
//              chance of that happening to unskilled casters
//              anyway).
bool summon_elemental(int pow, bool god_gift,
                      monster_type restricted_type,
                      int unfriendly)
{
    monster_type mon = MONS_PROGRAM_BUG;
    struct dist smove;
    int dir_x;
    int dir_y;
    int targ_x;
    int targ_y;
    const int dur = std::min(2 + (random2(pow) / 5), 6);
    const bool any_elemental = (restricted_type == MONS_PROGRAM_BUG);
    while (true)
    {
        mpr("Summon from material in which direction?", MSGCH_PROMPT);
        direction(smove, DIR_DIR, TARG_ANY);
        if (!smove.isValid)
        {
            canned_msg(MSG_OK);
            return (false);
        }
        dir_x  = smove.dx;
        dir_y  = smove.dy;
        targ_x = you.x_pos + dir_x;
        targ_y = you.y_pos + dir_y;
        if (mgrd[targ_x][targ_y] != NON_MONSTER)
        {
            if (player_monster_visible(&menv[mgrd[targ_x][targ_y]]))
                mpr("There's something there already!");
            else
            {
                mpr("Something seems to disrupt your summoning.");
                return (false);
            }
        }
        else if (dir_x == 0 && dir_y == 0)
            mpr("You can't summon an elemental from yourself!");
        else if ((any_elemental || restricted_type == MONS_EARTH_ELEMENTAL)
                 && (grd[ targ_x ][ targ_y ] == DNGN_ROCK_WALL
                     || grd[ targ_x ][ targ_y ] == DNGN_CLEAR_ROCK_WALL))
        {
            if (targ_x <= 6 || targ_x >= 74 || targ_y <= 6 || targ_y >= 64)
            {
                mpr("That wall won't yield to your beckoning.");
                // XXX: Should this cost a turn?
            }
            else
            {
                mon = MONS_EARTH_ELEMENTAL;
                break;
            }
        }
        else
            break;
    }
    if (mon == MONS_EARTH_ELEMENTAL)
    {
        grd[targ_x][targ_y] = DNGN_FLOOR;
    }
    else if (env.cgrid[targ_x][targ_y] != EMPTY_CLOUD
             && env.cloud[env.cgrid[targ_x][targ_y]].type == CLOUD_FIRE
             && (any_elemental || restricted_type == MONS_FIRE_ELEMENTAL))
    {
        mon = MONS_FIRE_ELEMENTAL;
        delete_cloud(env.cgrid[targ_x][targ_y]);
    }
    else if (grd[targ_x][targ_y] == DNGN_LAVA
             && (any_elemental || restricted_type == MONS_FIRE_ELEMENTAL))
    {
        mon = MONS_FIRE_ELEMENTAL;
    }
    else if ((grd[targ_x][targ_y] == DNGN_DEEP_WATER
                || grd[targ_x][targ_y] == DNGN_SHALLOW_WATER
                || grd[targ_x][targ_y] == DNGN_FOUNTAIN_BLUE)
             && (any_elemental || restricted_type == MONS_WATER_ELEMENTAL))
    {
        mon = MONS_WATER_ELEMENTAL;
    }
    else if (grd[targ_x][targ_y] >= DNGN_FLOOR
             && env.cgrid[targ_x][targ_y] == EMPTY_CLOUD
             && (any_elemental || restricted_type == MONS_AIR_ELEMENTAL))
    {
        mon = MONS_AIR_ELEMENTAL;
    }
    // Found something to summon?
    if (mon == MONS_PROGRAM_BUG)
    {
        canned_msg(MSG_NOTHING_HAPPENS);
        return (false);
    }
    // silly - ice for water? 15jan2000 {dlb}
    // little change here to help with the above... and differentiate
    // elements a bit... {bwr}
    // - Water elementals are now harder to be made reliably friendly.
    // - Air elementals are harder because they're more dynamic/dangerous.
    // - Earth elementals are more static and easy to tame (as before).
    // - Fire elementals fall in between the two (10 is still fairly easy).
    const bool friendly = ((mon != MONS_FIRE_ELEMENTAL
                            || random2(10) < you.skills[SK_FIRE_MAGIC])
                        && (mon != MONS_WATER_ELEMENTAL
                            || random2((you.species == SP_MERFOLK) ? 5 : 15)
                                  < you.skills[SK_ICE_MAGIC])
                        && (mon != MONS_AIR_ELEMENTAL
                            || random2(15) < you.skills[SK_AIR_MAGIC])
                        && (mon != MONS_EARTH_ELEMENTAL
                            || random2(5)  < you.skills[SK_EARTH_MAGIC])
                        && random2(100) >= unfriendly);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, coord_def(targ_x, targ_y),
                      friendly ? you.pet_target : MHITYOU)) != -1)
    {
        canned_msg(MSG_NOTHING_HAPPENS);
        return (false);
    }
    mpr("An elemental appears!");
    if (!friendly)
        mpr("It doesn't seem to appreciate being summoned.");
    return (true);
}

Replacement in crawl-ref/source/it_use3.cc at line 623 [7.2870456]

B:BD[7.2887296] → [7.2887296:2887358]

                summon_elemental(100, MONS_AIR_ELEMENTAL, 4);

[7.2887296]

[7.2887358]

                summon_elemental(100, false, MONS_AIR_ELEMENTAL, 4);

Replacement in crawl-ref/source/it_use3.cc at line 633 [7.2870456]

B:BD[7.2887614] → [7.2887614:2887677]

                summon_elemental(100, MONS_FIRE_ELEMENTAL, 4);

[7.2887614]

[7.2887677]

                summon_elemental(100, false, MONS_FIRE_ELEMENTAL, 4);

Replacement in crawl-ref/source/it_use3.cc at line 643 [7.2870456]

B:BD[7.2887946] → [7.2887946:2888010]

                summon_elemental(100, MONS_EARTH_ELEMENTAL, 4);

[7.2887946]

[7.2888010]

                summon_elemental(100, false, MONS_EARTH_ELEMENTAL, 4);