fiddlerwoaroof/crawl - Change BYURAML2EPTULHH22Q5RPXYGDEYAJYESR6C72UMNPPYHTCJZUPFAC

Giant spores and lightning balls exploding is now handled immediately inside

of monster_die(), removing the need to ever check for "monster is dead but still present because it's about to explode". It also lets you get the credit (and blame) for any monsters the explosion hits if you attacking it triggered the explosion. While I was at it I made the death-cause display show if death from spore/ball explosion was due to an explosion triggered by the player or one of the player's pets.

Also made it so that when similacrums and fire vortices are banished or wizard-command-genocided that they don't leave behind a freezing/burning cloud.

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

Created by zelgadis on November 27, 2008

BYURAML2EPTULHH22Q5RPXYGDEYAJYESR6C72UMNPPYHTCJZUPFAC

Dependencies

In channels

main

Change contents

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

B:BD[5.11281] → [5.11281:11512]

    // A dead but not-yet-exploded giant spore or ball lightning *might*
    // be the target of a miscast effect.
    ASSERT(target->alive() || target->id() ==  MONS_GIANT_SPORE
           || target->id() == MONS_BALL_LIGHTNING);

[5.11281]

[5.11512]

    ASSERT(target->alive());

Deletion in crawl-ref/source/mstuff2.h at line 33 [6.1336995]
B:BD[6.1340428] → [7.4369:4409]
```
void spore_goes_pop(monsters *monster);
```
Deletion in crawl-ref/source/mstuff2.cc at line 1239 [6.1340842]
∅:D[8.1606] → [6.1374338:1374339]
B:BD[6.1374338] → [6.1374338:1374339]
B:BD[6.1374339] → [9.4586:4660]
B:BD[9.4660] → [10.2566:2605]
∅:D[10.2605] → [6.1374453:1374455]
B:BD[6.1374453] → [6.1374453:1374455]
B:BD[6.1374455] → [11.197:248]
∅:D[11.248] → [6.1374507:1374550]
B:BD[6.1374507] → [6.1374507:1374550]
B:BD[6.1374550] → [12.5667:5698]
∅:D[12.5698] → [13.404621:404651]
B:BD[13.404621] → [13.404621:404651]
B:BD[13.404651] → [12.5699:5803]
B:BD[12.5803] → [14.42594:42634]
∅:D[14.42634] → [12.5875:5940]
B:BD[12.5875] → [12.5875:5940]
∅:D[12.5940] → [13.404652:404681]
B:BD[6.1374775] → [13.404652:404681]
```
// XXX: Should really do something about mons_hit, but can't be bothered.
void spore_goes_pop(monsters *monster)
{
    bolt beam;
    const int type = monster->type;
    if (monster == NULL)
        return;
    beam.is_tracer    = false;
    beam.is_explosion = true;
    beam.beam_source  = monster_index(monster);
    beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
    beam.target       = monster->pos();
    beam.thrower      = KILL_MON;    // someone else's explosion
    beam.aux_source.clear();
```
Deletion in crawl-ref/source/mstuff2.cc at line 1240 [6.1340842]
B:BD[6.1374804] → [15.4494:4562]
∅:D[15.4562] → [6.1374804:1374879]
∅:D[16.17718] → [6.1374804:1374879]
B:BD[6.1374804] → [6.1374804:1374879]
B:BD[6.1374879] → [12.5941:6063]
∅:D[12.6063] → [6.1375008:1375034]
B:BD[6.1375008] → [6.1375008:1375034]
B:BD[6.1375034] → [16.17719:17762]
B:BD[16.17762] → [15.4563:4644]
∅:D[15.4644] → [6.1375087:1375093]
∅:D[16.17762] → [6.1375087:1375093]
B:BD[6.1375087] → [6.1375087:1375093]
B:BD[6.1375093] → [11.278:320]
∅:D[11.320] → [6.1375102:1375149]
B:BD[6.1375102] → [6.1375102:1375149]
B:BD[6.1375149] → [12.6064:6185]
∅:D[12.6185] → [6.1375277:1375320]
B:BD[6.1375277] → [6.1375277:1375320]
B:BD[6.1375320] → [16.17763:17809]
B:BD[16.17809] → [15.4645:4752]
∅:D[15.4752] → [6.1375376:1375382]
∅:D[16.17809] → [6.1375376:1375382]
B:BD[6.1375376] → [6.1375376:1375382]
B:BD[6.1375382] → [11.321:544]
∅:D[11.544] → [6.1375382:1375383]
B:BD[6.1375382] → [6.1375382:1375383]
B:BD[6.1375383] → [15.4753:4783]
∅:D[17.2660] → [6.1375411:1375417]
∅:D[15.4783] → [6.1375411:1375417]
B:BD[6.1375411] → [6.1375411:1375417]
B:BD[6.1375417] → [17.2661:2694]
B:BD[17.2694] → [18.20919:20961]
∅:D[18.20961] → [15.4834:4908]
B:BD[15.4834] → [15.4834:4908]
∅:D[15.4908] → [6.1375468:1375475]
∅:D[19.15347] → [6.1375468:1375475]
∅:D[16.17828] → [6.1375468:1375475]
B:BD[6.1375468] → [6.1375468:1375475]
B:BD[6.1375475] → [18.20962:21000]
∅:D[18.21000] → [15.4955:5039]
B:BD[15.4955] → [15.4955:5039]
∅:D[15.5039] → [17.2750:2752]
B:BD[17.2750] → [17.2750:2752]
∅:D[17.2752] → [6.1375552:1375553]
B:BD[6.1375552] → [6.1375552:1375553]
```
    const char* msg       = NULL;
    const char* sanct_msg = NULL;
    if (type == MONS_GIANT_SPORE)
    {
        beam.flavour = BEAM_SPORE;
        beam.name    = "explosion of spores";
        beam.colour  = LIGHTGREY;
        beam.damage  = dice_def( 3, 15 );
        beam.ex_size = 2;
        msg = "The giant spore explodes!";
        sanct_msg = "By Zin's power, the giant spore's explosion is contained.";
    }
    else if (type == MONS_BALL_LIGHTNING)
    {
        beam.flavour = BEAM_ELECTRICITY;
        beam.name    = "blast of lightning";
        beam.colour  = LIGHTCYAN;
        beam.damage  = dice_def( 3, 20 );
        beam.ex_size = coinflip() ? 3 : 2;
        msg = "The ball lightning explodes!";
        sanct_msg = "By Zin's power, the ball lightning's explosion "
                    "is contained.";
    }
    else
    {
        msg::streams(MSGCH_DIAGNOSTICS) << "Unknown spore type: "
                                        << static_cast<int>(type)
                                        << std::endl;
        return;
    }
    if (you.can_see(monster))
    {
        viewwindow(true, false);
        if (is_sanctuary(monster->pos()))
            mpr(sanct_msg, MSGCH_GOD);
        else
            mpr(msg);
    }
    if (is_sanctuary(monster->pos()))
        return;
    explosion(beam, false, false, true, true, mons_near(monster));
}
```

Insertion in crawl-ref/source/monstuff.cc at line 784 [6.1396662]

[5.74902]

    }
}
static void _spore_goes_pop(monsters *monster, killer_type killer,
                            int killer_index, bool pet_kill, bool wizard)
{
    if (monster->hit_points > 0 || monster->hit_points <= -15 || wizard
        || killer == KILL_RESET || killer == KILL_DISMISSED)
    {
        return;
    }
    if (killer == KILL_MISC)
        killer = KILL_MON;
    bolt beam;
    const int type = monster->type;
    beam.is_tracer    = false;
    beam.is_explosion = true;
    beam.beam_source  = monster_index(monster);
    beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
    beam.pos          = monster->pos();
    beam.source       = monster->pos();
    beam.target       = monster->pos();
    beam.thrower      = killer;
    beam.aux_source.clear();
    if (YOU_KILL(killer))
        beam.aux_source = "set off by themselves";
    else if (pet_kill)
        beam.aux_source = "set off by their pet";
    const char* msg       = NULL;
    const char* sanct_msg = NULL;
    if (type == MONS_GIANT_SPORE)
    {
        beam.flavour = BEAM_SPORE;
        beam.name    = "explosion of spores";
        beam.colour  = LIGHTGREY;
        beam.damage  = dice_def( 3, 15 );
        beam.ex_size = 2;
        msg = "The giant spore explodes!";
        sanct_msg = "By Zin's power, the giant spore's explosion is contained.";
    }
    else if (type == MONS_BALL_LIGHTNING)
    {
        beam.flavour = BEAM_ELECTRICITY;
        beam.name    = "blast of lightning";
        beam.colour  = LIGHTCYAN;
        beam.damage  = dice_def( 3, 20 );
        beam.ex_size = coinflip() ? 3 : 2;
        msg = "The ball lightning explodes!";
        sanct_msg = "By Zin's power, the ball lightning's explosion "
                    "is contained.";
    }
    else
    {
        msg::streams(MSGCH_DIAGNOSTICS) << "Unknown spore type: "
                                        << static_cast<int>(type)
                                        << std::endl;
        return;
    }
    if (you.can_see(monster))
    {
        viewwindow(true, false);
        if (is_sanctuary(monster->pos()))
            mpr(sanct_msg, MSGCH_GOD);
        else
            mpr(msg);

Insertion in crawl-ref/source/monstuff.cc at line 856 [6.1396662]

[5.74908]


    if (is_sanctuary(monster->pos()))
        return;
    // Detach monster from the grid first, so it doesn't get hit by
    // its own explosion. (GDL)
    mgrd(monster->pos()) = NON_MONSTER;
    explosion(beam, false, false, true, true, mons_near(monster));
    mgrd(monster->pos()) = monster_index(monster);

Replacement in crawl-ref/source/monstuff.cc at line 962 [6.1396662]

B:BD[6.1406935] → [6.1406935:1407021]

        if (monster->hit_points < 1 && monster->hit_points > -15)
            return;

[6.1406935]

[6.1407021]

        _spore_goes_pop(monster, killer, killer_index, pet_kill, wizard);

Replacement in crawl-ref/source/monstuff.cc at line 967 [6.1396662]
B:BD[6.1407134] → [20.388:409]
```
        if (!silent)
```
[6.1407134]
[21.2568]
```
        if (!silent && killer != KILL_RESET)
```

Replacement in crawl-ref/source/monstuff.cc at line 974 [6.1396662]

B:BD[6.1407517] → [6.1407517:1407564]

        if (monster->type == MONS_FIRE_VORTEX)

[6.1407517]

[22.2567]

        if (monster->type == MONS_FIRE_VORTEX && !wizard
            && killer != KILL_RESET)

Replacement in crawl-ref/source/monstuff.cc at line 987 [6.1396662]
B:BD[6.1407765] → [20.542:563]
```
        if (!silent)
```
[6.1407765]
[21.2625]
```
        if (!silent && killer != KILL_RESET)
```

Replacement in crawl-ref/source/monstuff.cc at line 994 [6.1396662]

B:BD[6.1407889] → [18.22074:22138]

∅:D[18.22138] → [23.5333:5381]

B:BD[23.5333] → [23.5333:5381]

        place_cloud(CLOUD_COLD, monster->pos(), 2 + random2(4),
                    monster->kill_alignment());

[6.1407889]

[24.2568]

        if (!wizard && killer != KILL_RESET)
            place_cloud(CLOUD_COLD, monster->pos(), 2 + random2(4),
                        monster->kill_alignment());

Replacement in crawl-ref/source/monstuff.cc at line 5944 [6.1396662]

B:BD[25.3946] → [25.3946:4001]

         if (monster->speed_increment == old_energy) \

[25.3946]

[25.4001]

    if (monster->speed_increment == old_energy && monster->alive()) \

Deletion in crawl-ref/source/monstuff.cc at line 6365 [6.1396662]

∅:D[13.436946] → [6.1516046:1516047]

B:BD[6.1516046] → [6.1516046:1516047]

B:BD[6.1516047] → [26.8138:8324]

B:BD[6.1516104] → [27.9758:9890]

B:BD[27.9890] → [14.51337:51393]


                if ((monster->type == MONS_GIANT_SPORE
                        || monster->type == MONS_BALL_LIGHTNING)
                    && monster->hit_points < 1)
                {
                    // Detach monster from the grid first, so it
                    // doesn't get hit by its own explosion. (GDL)
                    mgrd(monster->pos()) = NON_MONSTER;

Deletion in crawl-ref/source/monstuff.cc at line 6366 [6.1396662]
B:BD[6.1516338] → [26.8521:8660]
∅:D[26.8660] → [6.1516481:1516482]
∅:D[13.437425] → [6.1516481:1516482]
B:BD[6.1516481] → [6.1516481:1516482]
```
                    spore_goes_pop(monster);
                    monster_cleanup(monster);
                    continue;
                }
```
Deletion in crawl-ref/source/monstuff.cc at line 6395 [6.1396662]
∅:D[28.2193] → [13.438069:438075]
∅:D[2.2625] → [13.438069:438075]
∅:D[29.2697] → [13.438069:438075]
∅:D[25.5932] → [13.438069:438075]
B:BD[13.438069] → [13.438069:438075]
B:BD[13.438075] → [28.2194:2293]
∅:D[28.2293] → [13.438478:438488]
B:BD[13.438478] → [13.438478:438488]
B:BD[13.438488] → [27.9891:10007]
B:BD[27.10007] → [14.51394:51442]
∅:D[14.51442] → [30.9515:9516]
B:BD[28.2465] → [30.9515:9516]
B:BD[30.9516] → [31.2569:2644]
∅:D[31.2644] → [28.2545:2588]
B:BD[28.2545] → [28.2545:2588]
```
    {
        if (monster->type == MONS_GIANT_SPORE
            || monster->type == MONS_BALL_LIGHTNING)
        {
            // Detach monster from the grid first, so it
            // doesn't get hit by its own explosion. (GDL)
            mgrd(monster->pos()) = NON_MONSTER;
            spore_goes_pop(monster);
            monster_cleanup(monster);
            return;
        }
        else
```
Deletion in crawl-ref/source/monstuff.cc at line 6396 [6.1396662]
∅:D[31.2693] → [25.6575:6581]
∅:D[4.3412] → [25.6575:6581]
B:BD[13.438548] → [25.6575:6581]
```
    }
```

Replacement in crawl-ref/source/hiscores.cc at line 765 [6.2987663]

B:BD[13.821175] → [32.20495:20569]

B:BD[32.20569] → [3.4979:5028]

    if ((death_type == KILLED_BY_MONSTER || death_type == KILLED_BY_BEAM)
        && !invalid_monster_index(death_source))

[13.821175]

[13.821312]

    if ((death_type == KILLED_BY_MONSTER || death_type == KILLED_BY_BEAM
         || death_type == KILLED_BY_SPORE)
        && !invalid_monster_index(death_source)
        && menv[death_source].type != -1)

Replacement in crawl-ref/source/hiscores.cc at line 811 [6.2987663]

B:BD[33.2737] → [3.6572:6636]

        death_source_name = monster->name(DESC_NOCAP_A, death);

[33.2737]

[3.6636]

        const description_level_type desc =
            death_type == KILLED_BY_SPORE ? DESC_PLAIN : DESC_NOCAP_A;
        death_source_name = monster->name(desc, death);

Replacement in crawl-ref/source/hiscores.cc at line 817 [6.2987663]

B:BD[3.6707] → [3.6707:6771]

                ", " + monster->base_name(DESC_NOCAP_A, death);

[3.6707]

[3.6771]

                ", " + monster->base_name(desc, death);

Replacement in crawl-ref/source/hiscores.cc at line 1644 [6.2987663]

B:BD[13.844078] → [13.844078:844143]

        desc += terse? "spore" : "Killed by an exploding spore";

[13.844078]

[13.844143]

        if (terse)
        {
            if (death_source_name.empty())
                desc += "spore";
            else
                desc += get_monster_data(death_source)->name;
        }
        else
        {
            desc += "Killed by an exploding ";
            if (death_source_name.empty())
                desc += "spore";
            else
                desc += death_source_name;
        }

Insertion in crawl-ref/source/hiscores.cc at line 1873 [6.2987663]

[13.848624]

    if (death_type == KILLED_BY_SPORE && !terse && !auxkilldata.empty())
    {
        desc += "... ";
        desc += auxkilldata;
        desc += "\n";
        desc += "             ";
    }

Insertion in crawl-ref/source/beam.cc at line 3222 [6.4128068]

[6.4222053]

    monsters *monst = NULL;
    if (!invalid_monster_index(beam.beam_source)
        && menv[beam.beam_source].type != -1)
    {
        monst = &menv[beam.beam_source];
    }

Replacement in crawl-ref/source/beam.cc at line 3230 [6.4128068]

B:BD[6.4222092] → [10.3425:3484]

    if (YOU_KILL(beam.thrower) && beam.aux_source.empty())

[6.4222092]

[3.8305]

    if (monst && (monst->type == MONS_GIANT_SPORE
                  || monst->type == MONS_BALL_LIGHTNING))
    {
        ouch(dam, beam.beam_source, KILLED_BY_SPORE,
             beam.aux_source.c_str());
    }
    else if (YOU_KILL(beam.thrower) && beam.aux_source.empty())

Replacement in crawl-ref/source/beam.cc at line 3240 [6.4128068]

B:BD[6.4222249] → [6.4222249:4222289]

B:BD[6.4222289] → [10.3568:3626]

∅:D[10.3626] → [6.4222349:4222362]

B:BD[6.4222349] → [6.4222349:4222362]

B:BD[6.4222362] → [34.4184:4194]

B:BD[34.4194] → [10.3627:3726]

∅:D[10.3726] → [34.4195:4205]

B:BD[13.1241356] → [34.4195:4205]

        if (beam.flavour == BEAM_SPORE)
            ouch(dam, beam.beam_source, KILLED_BY_SPORE);
        else
        {
            ouch(dam, beam.beam_source, KILLED_BY_BEAM,
                 beam.aux_source.c_str());
        }

[6.4222249]

[6.4222438]

        ouch(dam, beam.beam_source, KILLED_BY_BEAM,
             beam.aux_source.c_str());