fiddlerwoaroof/crawl - Change RRRFGYU6Q6FGB7PMXIK4NPUAUPSSNHVWXK4RRI5FIU4GKE4SYDCAC

Clean up manual explosion routines a bit.

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

Created by dolorous on January 17, 2009

RRRFGYU6Q6FGB7PMXIK4NPUAUPSSNHVWXK4RRI5FIU4GKE4SYDCAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/xom.cc at line 1100 [6.3]
B:BD[5.5919] → [5.5919:5950]
```
    beam.is_tracer    = false;
```
Deletion in crawl-ref/source/spl-cast.cc at line 2424 [9.293070]
∅:D[7.1718] → [8.14595:14626]
B:BD[8.14595] → [8.14595:14626]
```
    beam.is_beam      = false;
```

Replacement in crawl-ref/source/spl-cast.cc at line 3038 [9.293070]

∅:D[10.507] → [8.27574:27688]

B:BD[8.27574] → [8.27574:27688]

            mon_msg_unseen = "A violent explosion happens from "
                             "out of thin air!";

[10.507]

[8.27688]

            mon_msg_unseen = "A violent explosion happens from out of thin "
                             "air!";

Replacement in crawl-ref/source/spl-cast.cc at line 3041 [9.293070]

B:BD[8.27689] → [8.27689:27735]

∅:D[8.27735] → [11.2755:2862]

B:BD[11.2755] → [11.2755:2862]

B:BD[12.3655] → [8.27736:27775]

∅:D[8.27775] → [11.2990:3033]

B:BD[11.2990] → [11.2990:3033]

            beam.damage  = dice_def( 3, 12 );
            beam.flavour = BEAM_MISSILE; // unsure about this
            // BEAM_EXPLOSION instead? {dlb}
            beam.name   = "explosion";
            beam.colour = random_colour();

[8.27689]

[12.3656]

            beam.flavour = BEAM_MISSILE;
            beam.damage  = dice_def(3, 12);
            beam.name    = "explosion";
            beam.colour  = random_colour();

Insertion in crawl-ref/source/spl-cast.cc at line 3063 [9.293070]
[8.28109]
[8.28109]
```
            beam.flavour = BEAM_MISSILE;
```

Replacement in crawl-ref/source/spl-cast.cc at line 3065 [9.293070]

B:BD[8.28168] → [8.28168:28214]

∅:D[8.28214] → [11.3815:3922]

B:BD[11.3815] → [11.3815:3922]

            beam.damage  = dice_def( 3, 20 );
            beam.flavour = BEAM_MISSILE; // unsure about this
            // BEAM_EXPLOSION instead? {dlb}

[8.28168]

[8.28215]

            beam.damage  = dice_def(3, 20);

Insertion in crawl-ref/source/spl-cast.cc at line 4213 [9.293070]
[8.48365]
[8.48365]
```
            beam.flavour = BEAM_FIRE;
```
Replacement in crawl-ref/source/spl-cast.cc at line 4215 [9.293070]
B:BD[8.48424] → [8.48424:48470]
∅:D[8.48470] → [11.27486:27524]
B:BD[11.27486] → [11.27486:27524]
```
            beam.damage  = dice_def( 3, 14 );
            beam.flavour = BEAM_FIRE;
```
[8.48424]
[8.48471]
```
            beam.damage  = dice_def(3, 14);
```
Insertion in crawl-ref/source/spl-cast.cc at line 4218 [9.293070]
[8.48543]
[8.48543]
Insertion in crawl-ref/source/spl-cast.cc at line 4238 [9.293070]
[8.49024]
[8.49024]
```
            beam.flavour = BEAM_FIRE;
```
Replacement in crawl-ref/source/spl-cast.cc at line 4240 [9.293070]
B:BD[8.49083] → [8.49083:49129]
∅:D[8.49129] → [11.28542:28580]
B:BD[11.28542] → [11.28542:28580]
```
            beam.damage  = dice_def( 3, 20 );
            beam.flavour = BEAM_FIRE;
```
[8.49083]
[8.49130]
```
            beam.damage  = dice_def(3, 20);
```
Replacement in crawl-ref/source/spl-cast.cc at line 4243 [9.293070]
∅:D[8.49201] → [11.28929:28972]
B:BD[11.28929] → [11.28929:28972]
```
            beam.ex_size = coinflip()?1:2;
```
[8.49201]
[8.49202]
```
            beam.ex_size = coinflip() ? 1 : 2;
```
Insertion in crawl-ref/source/spl-cast.cc at line 4381 [9.293070]
[8.51873]
[8.51873]
```
            beam.flavour = BEAM_COLD;
```
Replacement in crawl-ref/source/spl-cast.cc at line 4383 [9.293070]
B:BD[8.51932] → [8.51932:51978]
∅:D[8.51978] → [11.31488:31526]
B:BD[11.31488] → [11.31488:31526]
```
            beam.damage  = dice_def( 3, 11 );
            beam.flavour = BEAM_COLD;
```
[8.51932]
[8.51979]
```
            beam.damage  = dice_def(3, 11);
```
Insertion in crawl-ref/source/spl-cast.cc at line 4386 [9.293070]
[8.52053]
[8.52054]
Replacement in crawl-ref/source/spl-cast.cc at line 4544 [9.293070]
∅:D[4.340] → [13.2299:2355]
∅:D[8.55326] → [13.2299:2355]
B:BD[11.34534] → [13.2299:2355]
∅:D[13.2355] → [11.34569:34614]
B:BD[11.34569] → [11.34569:34614]
```
            beam.type = dchar_glyph(DCHAR_FIRED_BURST);
            beam.damage = dice_def( 3, 15 );
```
[4.340]
[11.34614]

Replacement in crawl-ref/source/spl-cast.cc at line 4546 [9.293070]

B:BD[11.34730] → [11.34730:34799]

            beam.name = "explosion";
            beam.colour = CYAN;

[11.34652]

[12.4467]

            beam.type    = dchar_glyph(DCHAR_FIRED_BURST);
            beam.damage  = dice_def(3, 15);
            beam.name    = "explosion";
            beam.colour  = CYAN;

Deletion in crawl-ref/source/spl-cast.cc at line 4715 [9.293070]

B:BD[8.58753] → [8.58753:58857]

            beam.type    = dchar_glyph(DCHAR_FIRED_BURST);
            beam.damage  = dice_def( 3, 8 );

Insertion in crawl-ref/source/spl-cast.cc at line 4716 [9.293070]

[11.38075]

[8.58858]

            beam.type    = dchar_glyph(DCHAR_FIRED_BURST);
            beam.damage  = dice_def(3, 8);

Insertion in crawl-ref/source/spells4.cc at line 1692 [9.436250]

[14.6972]

[15.270]

    beam.flavour     = BEAM_FRAG;
    beam.type        = dchar_glyph(DCHAR_FIRED_BURST);
    beam.colour      = BLACK;

Replacement in crawl-ref/source/spells4.cc at line 1697 [9.436250]

B:BD[15.335] → [15.335:439]

    beam.ex_size     = 1;              // default
    beam.type        = '#';
    beam.colour      = 0;

[15.335]

[16.22001]

    beam.ex_size     = 1;

Deletion in crawl-ref/source/spells4.cc at line 1699 [9.436250]
∅:D[16.22035] → [15.507:541]
B:BD[15.507] → [15.507:541]
```
    beam.flavour     = BEAM_FRAG;
```
Replacement in crawl-ref/source/spells4.cc at line 1700 [9.436250]
B:BD[15.579] → [15.579:609]
```
    beam.is_tracer   = false;
```
[15.579]
[15.609]

Replacement in crawl-ref/source/spells1.cc at line 269 [9.616635]

B:BD[17.750] → [17.750:818]

        source->atype() == ACT_PLAYER? KILL_YOU_MISSILE : KILL_MON;

[17.750]

[18.153461]

        source->atype() == ACT_PLAYER ? KILL_YOU_MISSILE : KILL_MON;

Insertion in crawl-ref/source/monstuff.cc at line 915 [9.1396662]
[19.3581]
[19.3581]
```
        beam.damage  = dice_def(3, 15);
```
Deletion in crawl-ref/source/monstuff.cc at line 918 [9.1396662]
B:BD[19.3661] → [19.3661:3703]
```
        beam.damage  = dice_def( 3, 15 );
```

Replacement in crawl-ref/source/monstuff.cc at line 919 [9.1396662]

B:BD[19.3729] → [19.3729:3853]

        msg = "The giant spore explodes!";
        sanct_msg = "By Zin's power, the giant spore's explosion is contained.";

[19.3729]

[19.3853]

        msg          = "The giant spore explodes!";
        sanct_msg    = "By Zin's power, the giant spore's explosion is "
                       "contained.";

Insertion in crawl-ref/source/monstuff.cc at line 926 [9.1396662]
[19.3948]
[19.3948]
```
        beam.damage  = dice_def(3, 20);
```
Deletion in crawl-ref/source/monstuff.cc at line 929 [9.1396662]
B:BD[19.4027] → [19.4027:4069]
```
        beam.damage  = dice_def( 3, 20 );
```

Replacement in crawl-ref/source/monstuff.cc at line 930 [9.1396662]

B:BD[19.4112] → [19.4112:4265]

        msg = "The ball lightning explodes!";
        sanct_msg = "By Zin's power, the ball lightning's explosion "
                    "is contained.";

[19.4112]

[19.4265]

        msg          = "The ball lightning explodes!";
        sanct_msg    = "By Zin's power, the ball lightning's explosion "
                       "is contained.";

Replacement in crawl-ref/source/monstuff.cc at line 939 [9.1396662]
B:BD[19.4472] → [2.2772:2794]
```
        return false;
```
[19.4472]
[19.4488]
```
        return (false);
```

Replacement in crawl-ref/source/it_use3.cc at line 889 [9.2870456]

B:BD[20.1445] → [13.5852:5904]

∅:D[13.5904] → [9.2896941:2897081]

B:BD[9.2896941] → [9.2896941:2897081]

B:BD[9.2897081] → [16.66167:66200]

∅:D[16.66200] → [18.765900:765939]

B:BD[9.2897151] → [18.765900:765939]

∅:D[18.765939] → [9.2897204:2897362]

B:BD[9.2897204] → [9.2897204:2897362]

B:BD[9.2897362] → [20.1446:1508]

∅:D[20.1508] → [9.2897418:2897444]

B:BD[9.2897418] → [9.2897418:2897444]

B:BD[9.2897444] → [18.765940:766006]

        beam.type = dchar_glyph(DCHAR_FIRED_BURST);
        beam.damage = dice_def( 3, 15 );
        // unsure about this    // BEAM_EXPLOSION instead? [dlb]
        beam.flavour = BEAM_FIRE;
        beam.target = you.pos();
        beam.name = "fiery explosion";
        beam.colour = RED;
        // your explosion, (not someone else's explosion)
        beam.beam_source = NON_MONSTER;
        beam.thrower = KILL_YOU;
        beam.aux_source = "an exploding tome of Destruction";
        beam.ex_size = 2;
        beam.is_tracer = false;
        beam.is_explosion = true;

[20.1445]

[9.2897475]


        beam.flavour       = BEAM_FIRE;
        beam.type          = dchar_glyph(DCHAR_FIRED_BURST);
        beam.damage        = dice_def(3, 15);
        beam.target        = you.pos();
        beam.name          = "fiery explosion";
        beam.colour        = RED;
        beam.beam_source   = NON_MONSTER;
        beam.thrower       = KILL_YOU;
        beam.aux_source    = "an exploding Tome of Destruction";
        beam.ex_size       = 2;
        beam.is_explosion  = true;

Deletion in crawl-ref/source/it_use3.cc at line 902 [9.2870456]
B:BD[9.2897476] → [21.4542:4566]
```
        beam.explode();
```
Deletion in crawl-ref/source/effects.cc at line 303 [9.3382105]
B:BD[3.3997] → [3.3997:4029]
```
    beam.is_tracer     = false;
```
Deletion in crawl-ref/source/effects.cc at line 340 [9.3382105]
B:BD[22.3707] → [22.3707:3738]
```
    beam.is_tracer    = false;
```

Insertion in crawl-ref/source/effects.cc at line 3229 [9.3382105]

[23.17103]

[24.12952]

            // Undead enjoy extra contamination explosion damage because
            // the magical contamination has a harder time dissipating
            // through non-living flesh. :-)

Replacement in crawl-ref/source/effects.cc at line 3234 [9.3382105]

B:BD[24.13027] → [16.69672:69699]

∅:D[16.69699] → [23.17104:17252]

B:BD[24.13061] → [23.17104:17252]

B:BD[23.17252] → [16.69700:69743]

∅:D[16.69743] → [24.13288:13489]

B:BD[24.13288] → [24.13288:13489]

B:BD[24.13489] → [25.3061:3202]

∅:D[26.2844] → [23.17253:17494]

∅:D[25.3202] → [23.17253:17494]

B:BD[24.13698] → [23.17253:17494]

∅:D[23.17494] → [24.13923:14010]

B:BD[24.13923] → [24.13923:14010]

                bolt boom;
                boom.type     = dchar_glyph(DCHAR_FIRED_BURST);
                boom.colour   = BLACK;
                boom.flavour  = BEAM_RANDOM;
                boom.target   = you.pos();
                // Undead enjoy extra contamination explosion damage because
                // the magical contamination has a harder time dissipating
                // through non-living flesh. :-)
                boom.damage = dice_def(3, you.magic_contamination
                                           * (you.is_undead ? 4 : 2) / 4);
                boom.thrower      = KILL_MISC;
                boom.aux_source   = "a magical explosion";
                boom.beam_source  = NON_MONSTER;
                boom.is_beam      = false;
                boom.is_tracer    = false;
                boom.is_explosion = true;
                boom.name = "magical storm";

[24.13027]

[24.14010]

                bolt beam;
                beam.flavour      = BEAM_RANDOM;
                beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
                beam.damage       = dice_def(3, you.magic_contamination
                                             * (you.is_undead ? 4 : 2) / 4);
                beam.target       = you.pos();
                beam.name         = "magical storm";
                beam.colour       = BLACK;
                beam.thrower      = KILL_MISC;
                beam.beam_source  = NON_MONSTER;
                beam.aux_source   = "a magical explosion";
                beam.ex_size      = std::min(9, you.magic_contamination / 15);
                beam.ench_power   = (you.magic_contamination * 5);
                beam.is_explosion = true;

Replacement in crawl-ref/source/effects.cc at line 3250 [9.3382105]

B:BD[24.14011] → [24.14011:14076]

B:BD[24.14076] → [26.2845:2919]

B:BD[26.2919] → [21.4817:4849]

                boom.ench_power = (you.magic_contamination * 5);
                boom.ex_size = std::min(9, you.magic_contamination / 15);
                boom.explode();

[24.14011]

[24.14249]

                beam.explode();

Replacement in crawl-ref/source/beam.cc at line 5421 [9.4128068]

B:BD[27.19659] → [21.73086:73146]

               item(NULL), source(), target(), damage(0,0),

[27.19659]

[27.19726]

               item(NULL), source(), target(), damage(0, 0),

Clean up manual explosion routines a bit.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/xom.cc at line 1100 [6.3]

Deletion in crawl-ref/source/spl-cast.cc at line 2424 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3038 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3041 [9.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 3063 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3065 [9.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 4213 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4215 [9.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 4218 [9.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 4238 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4240 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4243 [9.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 4381 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4383 [9.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 4386 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4544 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4546 [9.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 4715 [9.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 4716 [9.293070]

Insertion in crawl-ref/source/spells4.cc at line 1692 [9.436250]

Replacement in crawl-ref/source/spells4.cc at line 1697 [9.436250]

Deletion in crawl-ref/source/spells4.cc at line 1699 [9.436250]

Replacement in crawl-ref/source/spells4.cc at line 1700 [9.436250]

Replacement in crawl-ref/source/spells1.cc at line 269 [9.616635]

Insertion in crawl-ref/source/monstuff.cc at line 915 [9.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 918 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 919 [9.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 926 [9.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 929 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 930 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 939 [9.1396662]

Replacement in crawl-ref/source/it_use3.cc at line 889 [9.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 902 [9.2870456]

Deletion in crawl-ref/source/effects.cc at line 303 [9.3382105]

Deletion in crawl-ref/source/effects.cc at line 340 [9.3382105]

Insertion in crawl-ref/source/effects.cc at line 3229 [9.3382105]

Replacement in crawl-ref/source/effects.cc at line 3234 [9.3382105]

Replacement in crawl-ref/source/effects.cc at line 3250 [9.3382105]

Replacement in crawl-ref/source/beam.cc at line 5421 [9.4128068]