fiddlerwoaroof/crawl - Change XHA6B4P5FAI5OTUQOA6J4VS2SBBR2MAFL2KMEBGD54O55WNSOGTQC

Clean up the routine for Lee's Rapid Deconstruction a bit, and allow

not-fully-petrified monsters to be exploded as well (taking the same amount of damage as an ice statue, as opposed to that of a stone golem, which is taken by fully petrified monsters).

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

Created by dolorous on October 3, 2008

XHA6B4P5FAI5OTUQOA6J4VS2SBBR2MAFL2KMEBGD54O55WNSOGTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1725 [6.436250]
B:BD[5.22091] → [5.22091:22129]
```
    const int mon = mgrd(spd.target);
```
[5.22091]
[6.502479]
```
    const int midx = mgrd(spd.target);
```
Replacement in crawl-ref/source/spells4.cc at line 1727 [6.436250]
B:BD[6.502480] → [6.502480:502508]
```
    if (mon != NON_MONSTER)
```
[6.502480]
[6.502508]
```
    if (midx != NON_MONSTER)
```
Insertion in crawl-ref/source/spells4.cc at line 1729 [6.436250]
[6.502514]
[2.575]
```
        monsters *mon = &menv[midx];
```

Replacement in crawl-ref/source/spells4.cc at line 1732 [6.436250]

B:BD[2.647] → [2.647:726]

        std::string explode_msg = menv[mon].name(DESC_CAP_THE) + " explodes!";

[2.647]

[6.502658]

        std::string explode_msg = mon->name(DESC_CAP_THE) + " explodes!";

Replacement in crawl-ref/source/spells4.cc at line 1734 [6.436250]
B:BD[6.502791] → [6.502791:502823]
```
        switch (menv[mon].type)
```
[6.502659]
[6.502823]
```
        switch (mon->type)
```

Replacement in crawl-ref/source/spells4.cc at line 1745 [6.436250]

B:BD[7.1204] → [7.1204:1270]

            if (player_hurt_monster(mon, roll_dice(beam.damage)))

[7.1204]

[7.1270]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

Replacement in crawl-ref/source/spells4.cc at line 1755 [6.436250]

B:BD[8.5378] → [8.5378:5458]

                 (menv[mon].type == MONS_FLYING_SKULL) ? "skull" : "skeleton");

[8.5378]

[6.503655]

                 (mon->type == MONS_FLYING_SKULL) ? "skull" : "skeleton");

Replacement in crawl-ref/source/spells4.cc at line 1763 [6.436250]

B:BD[6.503781] → [3.447:511]

                monster_die(&menv[mon], KILL_YOU, NON_MONSTER);

[6.503781]

[7.1426]

                monster_die(mon, KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/spells4.cc at line 1769 [6.436250]

B:BD[7.1501] → [7.1501:1571]

                if (player_hurt_monster(mon, roll_dice(beam.damage)))

[7.1501]

[7.1571]

                if (player_hurt_monster(midx, roll_dice(beam.damage)))

Replacement in crawl-ref/source/spells4.cc at line 1775 [6.436250]

B:BD[6.504206] → [6.504206:504278]

            simple_monster_message(&menv[mon], " shudders violently!");

[6.504177]

[6.504278]

            simple_monster_message(mon, " shudders violently!");

Replacement in crawl-ref/source/spells4.cc at line 1782 [6.436250]

B:BD[7.1756] → [7.1756:1818]

            player_hurt_monster(mon, roll_dice(beam.damage));

[7.1756]

[6.504600]

            player_hurt_monster(midx, roll_dice(beam.damage));

Replacement in crawl-ref/source/spells4.cc at line 1791 [6.436250]

B:BD[7.1982] → [7.1982:2048]

            if (player_hurt_monster(mon, roll_dice(beam.damage)))

[7.1982]

[7.2048]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

Replacement in crawl-ref/source/spells4.cc at line 1804 [6.436250]

B:BD[7.2283] → [7.2283:2349]

            if (player_hurt_monster(mon, roll_dice(beam.damage)))

[7.2283]

[7.2349]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

Replacement in crawl-ref/source/spells4.cc at line 1812 [6.436250]
∅:D[7.2454] → [9.144641:144695]
B:BD[9.144641] → [9.144641:144695]
```
            if (menv[mon].type == MONS_SILVER_STATUE)
```
[7.2454]
[9.144695]
```
            if (mon->type == MONS_SILVER_STATUE)
```

Replacement in crawl-ref/source/spells4.cc at line 1828 [6.436250]

B:BD[10.2174] → [10.2174:2232]

                    statue_damage = menv[mon].hit_points;

[10.2174]

[11.2171]

                    statue_damage = mon->hit_points;

Replacement in crawl-ref/source/spells4.cc at line 1830 [6.436250]

∅:D[11.2172] → [10.2249:2310]

B:BD[10.2249] → [10.2249:2310]

                if (player_hurt_monster(mon, statue_damage))

[11.2172]

[7.2812]

                if (player_hurt_monster(midx, statue_damage))

Replacement in crawl-ref/source/spells4.cc at line 1841 [6.436250]

B:BD[7.3051] → [7.3051:3117]

            if (player_hurt_monster(mon, roll_dice(beam.damage)))

[7.3051]

[7.3117]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

Deletion in crawl-ref/source/spells4.cc at line 1846 [6.436250]

B:BD[6.505826] → [4.308:406]

            // Petrified monsters can be exploded.
            if (mons_is_petrified(&menv[mon]))

Replacement in crawl-ref/source/spells4.cc at line 1847 [6.436250]

B:BD[4.420] → [4.420:784]

                explode         = true;
                beam.ex_size    = 2;
                beam.name       = "blast of petrified fragments";
                beam.colour     = menv[mon].colour;
                beam.damage.num = 3;
                if (player_hurt_monster(mon, roll_dice(beam.damage)))
                    beam.damage.num++;
                break;

[4.420]

[4.784]

                const bool petrifying = mons_is_petrifying(mon);
                const bool petrified = mons_is_petrified(mon);
                // Petrifying or petrified monsters can be exploded.
                if (petrifying || petrified)
                {
                    explode         = true;
                    beam.ex_size    = petrifying ? 1 : 2;
                    beam.name       = "blast of petrified fragments";
                    beam.colour     = mon->colour;
                    beam.damage.num = petrifying ? 2 : 3;
                    if (player_hurt_monster(midx, roll_dice(beam.damage)))
                        beam.damage.num++;
                    break;
                }

Deletion in crawl-ref/source/spells4.cc at line 1863 [6.436250]

B:BD[4.798] → [4.798:920]

            else
            {
                // Mark that a monster was targetted.
                beam.damage.num = 1;

Replacement in crawl-ref/source/spells4.cc at line 1864 [6.436250]

B:BD[6.505902] → [4.921:1151]

                // Yes, this spell does lousy damage if the monster
                // isn't susceptible. -- bwr
                player_hurt_monster(mon, roll_dice(1, 5 + pow / 25));
                goto do_terrain;
            }

[6.505902]

[6.506108]

            // Mark that a monster was targetted.
            beam.damage.num = 1;
            // Yes, this spell does lousy damage if the monster
            // isn't susceptible. -- bwr
            player_hurt_monster(midx, roll_dice(1, 5 + pow / 25));
            goto do_terrain;

Replacement in crawl-ref/source/spells4.cc at line 1917 [6.436250]
B:BD[5.22342] → [5.22342:22375]
```
             && one_chance_in(3)
```
[5.22342]
[5.22375]
```
                 && one_chance_in(3)
```
Replacement in crawl-ref/source/spells4.cc at line 1920 [6.436250]
B:BD[5.22508] → [5.22508:22544]
```
             && one_chance_in(10)))
```
[5.22508]
[6.507349]
```
                 && one_chance_in(10)))
```
Replacement in crawl-ref/source/spells4.cc at line 1924 [6.436250]
B:BD[7.3713] → [5.22545:22587]
```
            grd(spd.target) = DNGN_FLOOR;
```
[7.3713]
[7.3759]
```
            grd(spd.target)     = DNGN_FLOOR;
```
Replacement in crawl-ref/source/spells4.cc at line 1943 [6.436250]
B:BD[7.4029] → [5.22643:22685]
∅:D[7.4075] → [6.508130:508165]
∅:D[5.22685] → [6.508130:508165]
B:BD[6.508130] → [6.508130:508165]
```
            grd(spd.target) = DNGN_FLOOR;
            debris = DEBRIS_METAL;
```
[7.4029]
[6.508165]
```
            grd(spd.target)  = DNGN_FLOOR;
            debris           = DEBRIS_METAL;
```

Replacement in crawl-ref/source/spells4.cc at line 1962 [6.436250]

B:BD[6.508919] → [7.4295:4342]

            beam.ex_size = coinflip() ? 3 : 2;

[6.508919]

[5.22746]

            beam.ex_size    = coinflip() ? 3 : 2;

Replacement in crawl-ref/source/spells4.cc at line 1964 [6.436250]
∅:D[7.4388] → [6.509015:509052]
∅:D[5.22788] → [6.509015:509052]
B:BD[6.509015] → [6.509015:509052]
```
            debris = DEBRIS_CRYSTAL;
```
[5.22788]
[6.509052]
```
            debris          = DEBRIS_CRYSTAL;
```

Clean up the routine for Lee's Rapid Deconstruction a bit, and allow

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1725 [6.436250]

Replacement in crawl-ref/source/spells4.cc at line 1727 [6.436250]

Insertion in crawl-ref/source/spells4.cc at line 1729 [6.436250]