fiddlerwoaroof/crawl - Change M6MBPHNAERUXYJ7KHK5FE2B44CLBY4M5MR5KY74HVDFNHVLOEQIAC

BR 1972213: Move "Corpse x no longer valid!" into #DEBUG_DIAGNOSTICS

        and print &quot;The corpse you are butchering rises to attack you.&quot;
        where that is the case.

BR 1945387: Don't allow summoning earth elementals from walls near the edge of the map (that can't get destroyed that way). Just seems more consistent. There's an error message, but it doesn't cost a turn.

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

Created by j-p-e-g on June 6, 2008

M6MBPHNAERUXYJ7KHK5FE2B44CLBY4M5MR5KY74HVDFNHVLOEQIAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells2.cc at line 355 [5.569242]
[4.2229]
[4.2229]
```
    bool was_butchered = false;
```
Insertion in crawl-ref/source/spells2.cc at line 368 [5.569242]
[6.3641]
[6.3641]
```
                // Only one of a stack will be raised.
```

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

[5.576511]

[6.3818]

                        if (is_being_butchered(mitm[objl], false))
                            was_butchered = true;

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

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

[6.4283]

[5.577053]


    if (was_butchered)
        mpr("The corpse you are butchering rises to attack!");

Replacement in crawl-ref/source/spells2.cc at line 404 [5.569242]
∅:D[6.4312] → [5.577512:577566]
B:BD[5.577512] → [5.577512:577566]
```
}                               // end animate_dead()
```
[6.4312]
[5.577566]
```
}
```

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

[7.7440]

[8.460]

                if (was_butchering)
                    mpr("The corpse you are butchering rises to attack!");

Replacement in crawl-ref/source/spells2.cc at line 439 [5.569242]
∅:D[9.769] → [5.578140:578198]
B:BD[5.578140] → [5.578140:578198]
```
}                               // end animate_a_corpse()
```
[9.769]
[5.578198]
```
}
```
Insertion in crawl-ref/source/spells2.cc at line 1290 [5.569242]
[10.618]
[5.599006]
```
    bool any_elemental = (restricted_type == 0);
```

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

[5.599575]

[11.4282]

        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;
            }
        }

Replacement in crawl-ref/source/spells2.cc at line 1340 [5.569242]
B:BD[5.599615] → [12.5949:6000]
B:BD[12.6000] → [13.169:233]
∅:D[13.233] → [5.599665:599743]
∅:D[12.6061] → [5.599665:599743]
B:BD[5.599665] → [5.599665:599743]
```
    if ((grd[ targ_x ][ targ_y ] == DNGN_ROCK_WALL
            || grd[ targ_x ][ targ_y ] == DNGN_CLEAR_ROCK_WALL)
        && (restricted_type == 0 || restricted_type == MONS_EARTH_ELEMENTAL))
```
[5.599615]
[5.599743]
```
    if (mon == MONS_EARTH_ELEMENTAL)
```

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

B:BD[5.599749] → [3.2267:2303]

∅:D[3.2303] → [5.599795:599914]

B:BD[5.599795] → [5.599795:599914]

        mon = MONS_EARTH_ELEMENTAL;
        if (targ_x > 6 && targ_x < 74 && targ_y > 6 && targ_y < 64)
            grd[ targ_x ][ targ_y ] = DNGN_FLOOR;

[5.599749]

[5.599914]

        grd[ targ_x ][ targ_y ] = DNGN_FLOOR;

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

B:BD[5.599920] → [5.599920:599979]

B:BD[5.599979] → [14.4343:4419]

B:BD[14.4419] → [13.234:315]

    else if ((env.cgrid[ targ_x ][ targ_y ] != EMPTY_CLOUD
            && env.cloud[env.cgrid[ targ_x ][ targ_y ]].type == CLOUD_FIRE)
            && (restricted_type == 0 || restricted_type == MONS_FIRE_ELEMENTAL))

[5.599920]

[5.600214]

    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))

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

B:BD[5.600326] → [5.600326:600378]

B:BD[5.600378] → [13.316:397]

    else if ((grd[ targ_x ][ targ_y ] == DNGN_LAVA)
            && (restricted_type == 0 || restricted_type == MONS_FIRE_ELEMENTAL))

[5.600326]

[5.600455]

    else if (grd[ targ_x ][ targ_y ] == DNGN_LAVA
             && (any_elemental || restricted_type == MONS_FIRE_ELEMENTAL))

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

B:BD[13.529] → [13.529:610]

           && (restricted_type == 0 || restricted_type == MONS_WATER_ELEMENTAL))

[13.529]

[5.600770]

             && (any_elemental || restricted_type == MONS_WATER_ELEMENTAL))

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

B:BD[5.600828] → [5.600828:600880]

B:BD[5.600880] → [13.611:754]

    else if ((grd[ targ_x ][ targ_y ] >= DNGN_FLOOR
             && env.cgrid[ targ_x ][ targ_y ] == EMPTY_CLOUD)
             && (restricted_type == 0 || restricted_type == MONS_AIR_ELEMENTAL))

[5.600828]

[5.601017]

    else if (grd[ targ_x ][ targ_y ] >= DNGN_FLOOR
             && env.cgrid[ targ_x ][ targ_y ] == EMPTY_CLOUD
             && (any_elemental || restricted_type == MONS_AIR_ELEMENTAL))

Replacement in crawl-ref/source/spells2.cc at line 1370 [5.569242]
B:BD[5.601074] → [5.601074:601107]
```
    // found something to summon
```
[5.601074]
[3.2448]
```
    // Found something to summon?
```

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

B:BD[5.601372] → [5.601372:601662]

    // - 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)

[5.601372]

[3.2482]

    // - 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).

Deletion in crawl-ref/source/monstuff.cc at line 1733 [5.1396662]
B:BD[5.1429262] → [12.8311:8312]

Replacement in crawl-ref/source/monstuff.cc at line 1738 [5.1396662]

B:BD[12.8494] → [12.8494:8556]

    // Is the monster on the other side of a tranparent wall?

[12.8494]

[12.8556]

    // Is the monster on the other side of a transparent wall?

Replacement in crawl-ref/source/monstuff.cc at line 1750 [5.1396662]
∅:D[15.6560] → [12.8991:9011]
B:BD[12.8991] → [12.8991:9011]
```
    int  tries = 0;
```
[15.6560]
[12.9011]
```
    int tries = 0;
```
Replacement in crawl-ref/source/monstuff.cc at line 1760 [5.1396662]
B:BD[5.1429366] → [5.1429366:1429398]
```
        // origin is not 'near'
```
[5.1429366]
[5.1429398]
```
        // Origin is not 'near'.
```

Replacement in crawl-ref/source/monstuff.cc at line 1789 [5.1396662]

B:BD[12.10081] → [12.10081:10149]

        // away from the player, since in the absence of tranlucent

[12.10081]

[12.10149]

        // away from the player, since in the absence of translucent

Replacement in crawl-ref/source/delay.h at line 81 [5.3962990]

B:BD[16.992970] → [17.312:359]

bool is_being_butchered(const item_def &item);

[16.992970]

[18.13741]

bool is_being_butchered(const item_def &item, bool just_first = true);

Deletion in crawl-ref/source/delay.cc at line 545 [5.3963459]
B:BD[5.3967492] → [5.3967492:3967521]
```
/**************************/
```
Deletion in crawl-ref/source/delay.cc at line 550 [5.3963459]
∅:D[19.1731] → [5.3967598:3967631]
B:BD[5.3967598] → [5.3967598:3967631]
```
/******************************/
```
Replacement in crawl-ref/source/delay.cc at line 560 [5.3963459]
B:BD[17.363] → [17.363:409]
```
bool is_being_butchered(const item_def &item)
```
[17.363]
[17.409]
```
bool is_being_butchered(const item_def &item, bool just_first)
```

Replacement in crawl-ref/source/delay.cc at line 565 [5.3963459]

B:BD[16.997001] → [17.464:525]

B:BD[17.525] → [20.5883:5956]

    const delay_queue_item &delay = you.delay_queue.front();
    if (delay.type == DELAY_BUTCHER || delay.type == DELAY_BOTTLE_BLOOD)

[16.997001]

[17.562]

    for (unsigned int i = 0; i < you.delay_queue.size(); i++)

Replacement in crawl-ref/source/delay.cc at line 567 [5.3963459]

B:BD[17.568] → [17.568:657]

        const item_def &corpse = mitm[ delay.parm1 ];
        return (&corpse == &item);

[17.568]

[17.657]

        if (you.delay_queue[i].type == DELAY_BUTCHER
            || you.delay_queue[i].type == DELAY_BOTTLE_BLOOD
            || you.delay_queue[i].type == DELAY_OFFER_CORPSE)
        {
            const item_def &corpse = mitm[ you.delay_queue[i].parm1 ];
            if (&corpse == &item)
                return (true);
            if (just_first)
                break;
        }
        else
            break;

Replacement in crawl-ref/source/delay.cc at line 594 [5.3963459]

∅:D[18.15065] → [21.6910:6980]

B:BD[21.6910] → [21.6910:6980]

B:BD[21.6980] → [22.5002:5152]

// check whether there are monsters who might be influenced by Recite
// return 0, if no monsters found
// return 1, if eligible audience found
// return -1, if entire audience already affected or too dumb to understand

[18.15065]

[22.5152]

// Check whether there are monsters who might be influenced by Recite
// returns 0, if no monsters found
// returns 1, if eligible audience found
// returns -1, if entire audience already affected or too dumb to understand.

Replacement in crawl-ref/source/delay.cc at line 618 [5.3963459]

B:BD[21.7376] → [21.7376:7427]

            // can not be affected in these states

[21.7376]

[21.7427]

            // Can not be affected in these states.

Replacement in crawl-ref/source/delay.cc at line 632 [5.3963459]

B:BD[21.7616] → [22.5490:5549]

   // no use preaching to the choir, nor to common animals

[21.7616]

[22.5549]

   // No use preaching to the choir, nor to common animals.

Insertion in crawl-ref/source/delay.cc at line 806 [5.3963459]
[23.14707]
[23.14707]
```
#ifdef DEBUG_DIAGNOSTICS
```

Replacement in crawl-ref/source/delay.cc at line 808 [5.3963459]

B:BD[23.14768] → [23.14768:14822]

            // don't attempt to offer an invalid item

[23.14768]

[23.14822]

#endif
            // Don't attempt to offer an invalid item.

Replacement in crawl-ref/source/delay.cc at line 818 [5.3963459]

B:BD[16.998603] → [2.2727:2798]

            // corpse is no longer valid!  End the butchering normally

[16.998603]

[2.2798]

            // Corpse is no longer valid!  End the butchering normally

BR 1972213: Move "Corpse x no longer valid!" into #DEBUG_DIAGNOSTICS

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Deletion in crawl-ref/source/monstuff.cc at line 1733 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1738 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1750 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1760 [5.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1789 [5.1396662]

Replacement in crawl-ref/source/delay.h at line 81 [5.3962990]

Deletion in crawl-ref/source/delay.cc at line 545 [5.3963459]

Deletion in crawl-ref/source/delay.cc at line 550 [5.3963459]

Replacement in crawl-ref/source/delay.cc at line 560 [5.3963459]