fiddlerwoaroof/crawl - Change B4YYKEZVHLGRFAHEP5ATEV4MYRPGXQPWTUXGGG7ITZH3ZGV3VMBQC

Make the tests for icy and skeletal monsters in Lee's Rapid

Deconstruction more generic.

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

Created by dolorous on December 30, 2008

B4YYKEZVHLGRFAHEP5ATEV4MYRPGXQPWTUXGGG7ITZH3ZGV3VMBQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells4.cc at line 1712 [3.436250]

B:BD[3.502833] → [4.165:260]

∅:D[4.260] → [3.502888:502960]

B:BD[3.502888] → [3.502888:502960]

B:BD[3.502960] → [5.1015:1204]

B:BD[5.1204] → [6.859:922]

∅:D[7.548] → [5.1270:1305]

∅:D[6.922] → [5.1270:1305]

B:BD[5.1270] → [5.1270:1305]

∅:D[5.1305] → [3.503252:503272]

B:BD[3.503252] → [3.503252:503272]

B:BD[3.503272] → [4.261:318]

∅:D[4.318] → [3.503304:503338]

B:BD[3.503304] → [3.503304:503338]

B:BD[3.503338] → [4.319:424]

B:BD[3.503424] → [8.5312:5378]

B:BD[8.5378] → [7.549:624]

∅:D[7.624] → [3.503655:503656]

∅:D[9.144408] → [3.503655:503656]

B:BD[3.503655] → [3.503655:503656]

B:BD[3.503656] → [5.1306:1425]

∅:D[5.1425] → [3.503694:503695]

B:BD[3.503694] → [3.503694:503695]

B:BD[3.503695] → [10.1324:1399]

∅:D[10.1399] → [3.503767:503781]

B:BD[3.503767] → [3.503767:503781]

B:BD[3.503781] → [7.625:682]

∅:D[11.511] → [5.1426:1463]

∅:D[7.682] → [5.1426:1463]

B:BD[3.503835] → [5.1426:1463]

∅:D[5.1463] → [3.503874:503919]

∅:D[12.1954] → [3.503874:503919]

B:BD[3.503874] → [3.503874:503919]

B:BD[3.503919] → [5.1464:1501]

B:BD[5.1501] → [6.923:990]

∅:D[7.754] → [5.1571:1613]

∅:D[6.990] → [5.1571:1613]

B:BD[5.1571] → [5.1571:1613]

∅:D[5.1613] → [3.504073:504147]

B:BD[3.504073] → [3.504073:504147]

        case MONS_ICE_STATUE:           // blast of ice fragments
        case MONS_ICE_BEAST:
        case MONS_SIMULACRUM_SMALL:
        case MONS_SIMULACRUM_LARGE:
            explode         = true;
            beam.name       = "icy blast";
            beam.colour     = WHITE;
            beam.damage.num = 2;
            beam.flavour    = BEAM_ICE;
            if (player_hurt_monster(midx, beam.damage.roll()))
                beam.damage.num++;
            break;
        case MONS_FLYING_SKULL:         // blast of bone
        case MONS_SKELETON_SMALL:
        case MONS_SKELETON_LARGE:
        case MONS_SKELETAL_DRAGON:
        case MONS_SKELETAL_WARRIOR:
            mprf("The %s explodes into sharp fragments of bone!",
                 (mon->type == MONS_FLYING_SKULL) ? "skull" : "skeleton");
            explode     = true;
            beam.name   = "blast of bone shards";
            beam.colour = LIGHTGREY;
            if (x_chance_in_y(pow / 5, 50))        // potential insta-kill
            {
                monster_die(mon, KILL_YOU, NON_MONSTER);
                beam.damage.num = 4;
            }
            else
            {
                beam.damage.num = 2;
                if (player_hurt_monster(midx, beam.damage.roll()))
                    beam.damage.num += 2;
            }
            goto all_done;      // i.e. no "Foo Explodes!"

Insertion in crawl-ref/source/spells4.cc at line 1784 [3.436250]

[3.505826]

[13.406]

            if (mons_is_icy(mon->type)) // blast of ice
            {
                explode         = true;
                beam.name       = "icy blast";
                beam.colour     = WHITE;
                beam.damage.num = 2;
                    beam.flavour    = BEAM_ICE;
                if (player_hurt_monster(midx, beam.damage.roll()))
                    beam.damage.num++;
                break;
            }
            else if (mons_is_skeletal(mon->type)
                || mon->type == MONS_FLYING_SKULL) // blast of bone
            {
                mprf("The %s explodes into sharp fragments of bone!",
                     (mon->type == MONS_FLYING_SKULL) ? "skull" : "skeleton");
                explode     = true;
                beam.name   = "blast of bone shards";
                beam.colour = LIGHTGREY;
                if (x_chance_in_y(pow / 5, 50)) // potential insta-kill
                {
                    monster_die(mon, KILL_YOU, NON_MONSTER);
                    beam.damage.num = 4;
                }
                else
                {
                      beam.damage.num = 2;
                      if (player_hurt_monster(midx, beam.damage.roll()))
                          beam.damage.num += 2;
                  }
                  goto all_done; // i.e., no "Foo Explodes!"
            }
            else

Insertion in crawl-ref/source/mon-util.h at line 771 [3.1682293]
[2.3167]
[14.2989]
```
bool mons_is_skeletal(int mc);
```

Insertion in crawl-ref/source/mon-util.cc at line 603 [3.1699344]

[2.3353]

[15.230]

}
bool mons_is_skeletal(int mc)
{
    return (mc == MONS_SKELETON_SMALL
            || mc == MONS_SKELETON_LARGE
            || mc == MONS_SKELETAL_DRAGON
            || mc == MONS_SKELETAL_WARRIOR);