fiddlerwoaroof/crawl - Change KT3JMGSH5VTNRV2H5POWZLYNXSIRE5CT2XW3ZID7FNZTXYOZG22QC

Some cleanup of evoke_wielded(), more to come.

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

Created by haranp on November 8, 2007

KT3JMGSH5VTNRV2H5POWZLYNXSIRE5CT2XW3ZID7FNZTXYOZG22QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 896 [5.293070]
B:BD[3.786] → [3.786:812]
```
        bool needs_path =
```
[3.786]
[3.812]
```
        const bool needs_path =
```

Insertion in crawl-ref/source/it_use3.cc at line 328 [5.2870456]

[5.2880188]


static bool evoke_horn_of_geryon()
{
    // Note: This assumes that the Vestibule has not been changed.
    bool rc = false;
    if (player_in_branch( BRANCH_VESTIBULE_OF_HELL ))
    {
        mpr("You produce a weird and mournful sound.");
        for (int count_x = 0; count_x < GXM; count_x++)
        {
            for (int count_y = 0; count_y < GYM; count_y++)
            {
                if (grd[count_x][count_y] == DNGN_STONE_ARCH)
                {
                    rc = true;
                    map_marker *marker =
                        env.markers.find(coord_def(count_x, count_y),
                                         MAT_FEATURE);
                    if (marker)
                    {
                        map_feature_marker *featm =
                            dynamic_cast<map_feature_marker*>(marker);
                        grd[count_x][count_y] = featm->feat;
                        env.markers.remove(marker);
                    }
                }
            }
        }
        if (rc)
            mpr("Your way has been unbarred.");
    }
    else
    {
        mpr("You produce a hideous howling noise!");
        create_monster( MONS_BEAST, 4, BEH_HOSTILE, you.x_pos, you.y_pos,
                        MHITYOU, 250, false, false, false, true );
    }
    return rc;
}
static bool evoke_sceptre_of_asmodeus()
{
    bool rc = true;
    if ( one_chance_in(21) )
        rc = false;
    else if (one_chance_in(2))
    {
        // summon devils, maybe a Fiend
        const monster_type mtype = (one_chance_in(4) ? MONS_FIEND :
                                    summon_any_demon(DEMON_COMMON));
        const bool good_summon = (create_monster( mtype, 6, BEH_HOSTILE,
                                                  you.x_pos, you.y_pos, 
                                                  MHITYOU, 250) != -1);
        if (good_summon)
        {
            if (mtype == MONS_FIEND)
                mpr("\"Your arrogance condemns you, mortal!\"");
            else
                mpr("The Sceptre summons one of its servants.");
        }
        else
            mpr("The air shimmers briefly.");
    }
    else
    {
        // Cast a destructive spell
        const spell_type spl = static_cast<spell_type>(
            random_choose_weighted( 114, SPELL_BOLT_OF_FIRE,
                                    57,  SPELL_LIGHTNING_BOLT,
                                    57,  SPELL_BOLT_OF_DRAINING,
                                    12,  SPELL_HELLFIRE,
                                    0 ));
        your_spells( spl, you.skills[SK_EVOCATIONS] * 8, false );
    }
    return true;
}

Replacement in crawl-ref/source/it_use3.cc at line 412 [5.2870456]
B:BD[5.2880234] → [5.2880234:2880261]
```
bool evoke_wielded( void )
```
[5.2880234]
[5.2880261]
```
bool evoke_wielded()
```
Deletion in crawl-ref/source/it_use3.cc at line 414 [5.2870456]
B:BD[5.2880263] → [4.1919:1941]
∅:D[4.1941] → [5.2880362:2880429]
B:BD[5.2880362] → [5.2880362:2880429]
```
    int spell_casted;
    int temp_rand = 0;      // for probability determination {dlb}
```

Deletion in crawl-ref/source/it_use3.cc at line 479 [5.2870456]

B:BD[5.2882031] → [5.2882031:2882219]

            // let me count the number of ways spell_casted is
            // used here ... one .. two .. three ... >CRUNCH<
            // three licks to get to the center of a ... {dlb}

Replacement in crawl-ref/source/it_use3.cc at line 480 [5.2870456]

B:BD[5.2882263] → [5.2882263:2882518]

                spell_casted = random2(21);
                if (spell_casted == 0)
                    break;
                make_hungry( 200, false );
                pract = 1;
                if (spell_casted < 2)   // summon devils, maybe a Fiend

[5.2882263]

[5.2882518]

                if ( evoke_sceptre_of_asmodeus() )

Replacement in crawl-ref/source/it_use3.cc at line 482 [5.2870456]

B:BD[5.2882536] → [5.2882536:2882755]

B:BD[5.2882755] → [6.29695:29755]

∅:D[6.29755] → [5.2882825:2883280]

B:BD[5.2882825] → [5.2882825:2883280]


                    spell_casted = (one_chance_in(4) ? MONS_FIEND
                                                 : MONS_HELLION + random2(10));
                    bool good_summon = (create_monster( spell_casted, 
                                            6, BEH_HOSTILE,
                                            you.x_pos, you.y_pos, 
                                            MHITYOU, 250) != -1);
                    if (good_summon)
                    {
                        if (spell_casted == MONS_FIEND)
                            mpr("\"Your arrogance condemns you, mortal!\"");
                        else
                            mpr("The Sceptre summons one of its servants.");
                    }

[5.2882536]

[5.2883280]

                    make_hungry(200, false);

Replacement in crawl-ref/source/it_use3.cc at line 484 [5.2870456]
B:BD[5.2883317] → [5.2883317:2883344]
```
                    break;
```
[5.2883317]
[5.2883344]
```
                    pract = 1;
```

Deletion in crawl-ref/source/it_use3.cc at line 486 [5.2870456]

B:BD[5.2883362] → [5.2883362:2883898]

B:BD[5.2883898] → [7.50255:50368]

∅:D[7.50368] → [5.2883957:2883990]

B:BD[5.2883957] → [5.2883957:2883990]


                temp_rand = random2(240);
                if (temp_rand > 125)
                    spell_casted = SPELL_BOLT_OF_FIRE;      // 114 in 240
                else if (temp_rand > 68)
                    spell_casted = SPELL_LIGHTNING_BOLT;    //  57 in 240
                else if (temp_rand > 11)
                    spell_casted = SPELL_BOLT_OF_DRAINING;  //  57 in 240
                else
                    spell_casted = SPELL_HELLFIRE;          //  12 in 240
                power = you.skills[SK_EVOCATIONS] * 8;
                your_spells( static_cast<spell_type>(spell_casted),
                             power, false );
                did_work = true;

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

B:BD[5.2888130] → [5.2888130:2888281]

B:BD[5.2888281] → [4.2419:2457]

∅:D[4.2457] → [5.2888281:2888346]

B:BD[5.2888281] → [5.2888281:2888346]

B:BD[5.2888346] → [4.2458:2522]

∅:D[4.2522] → [5.2888406:2888424]

B:BD[5.2888406] → [5.2888406:2888424]

B:BD[5.2888424] → [4.2523:2591]

∅:D[4.2591] → [5.2888488:2888650]

B:BD[5.2888488] → [5.2888488:2888650]

B:BD[5.2888650] → [8.764345:764346]

B:BD[8.764346] → [9.16025:16074]

B:BD[9.16074] → [2.4402:4543]

∅:D[2.4543] → [5.2888650:2888651]

∅:D[9.16213] → [5.2888650:2888651]

∅:D[8.764600] → [5.2888650:2888651]

B:BD[5.2888650] → [5.2888650:2888651]

B:BD[5.2888651] → [9.16214:16254]

∅:D[9.16254] → [5.2888788:2888818]

∅:D[8.765405] → [5.2888788:2888818]

B:BD[5.2888788] → [5.2888788:2888818]

B:BD[5.2888818] → [9.16255:16463]

B:BD[9.16463] → [2.4544:4604]

∅:D[2.4604] → [5.2889463:2889823]

∅:D[9.16522] → [5.2889463:2889823]

∅:D[10.28203] → [5.2889463:2889823]

B:BD[5.2889463] → [5.2889463:2889823]

B:BD[5.2889823] → [6.29756:29814]

∅:D[6.29814] → [8.765474:765814]

B:BD[8.765474] → [8.765474:765814]

∅:D[8.765814] → [5.2890016:2890030]

B:BD[5.2890016] → [5.2890016:2890030]

            // Note: This assumes that the Vestibule has not been changed.
            if (player_in_branch( BRANCH_VESTIBULE_OF_HELL ))
            {
                int opened_gates = 0;
                mpr("You produce a weird and mournful sound.");
                for (int count_x = 0; count_x < GXM; count_x++)
                {
                    for (int count_y = 0; count_y < GYM; count_y++)
                    {
                        if (grd[count_x][count_y] == DNGN_STONE_ARCH)
                        {
                            opened_gates++;
                            map_marker *marker =
                                env.markers.find(coord_def(count_x, count_y),
                                                 MAT_FEATURE);
                            if (marker)
                            {
                                map_feature_marker *featm =
                                    dynamic_cast<map_feature_marker*>(marker);
                                grd[count_x][count_y] = featm->feat;
                                env.markers.remove(marker);
                            }
                        }
                    }
                }
                if (opened_gates)
                {
                    mpr("Your way has been unbarred.");
                    pract = 1;
                }
            }
            else
            {
                mpr("You produce a hideous howling noise!");
                int midx = create_monster( MONS_BEAST, 4,
                                           BEH_HOSTILE, you.x_pos, you.y_pos,
                                           MHITYOU, 250 );
                // avoid scumming; also prevents it from showing up on notes
                if ( midx != -1 )
                    menv[midx].flags |= MF_CREATED_FRIENDLY;
                // no practice
            }

[5.2888130]

[5.2890517]

            if ( evoke_horn_of_geryon() )
                pract = 1;