From 829e64f681f2cbe7d6b7ef8b87993f538d4a4ca2 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 18 Jan 2009 04:56:58 +0000 Subject: 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 --- crawl-ref/source/monstuff.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 0d47e3e5e0..6e09231b8c 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -912,30 +912,31 @@ static bool _spore_goes_pop(monsters *monster, killer_type killer, if (type == MONS_GIANT_SPORE) { beam.flavour = BEAM_SPORE; + beam.damage = dice_def(3, 15); 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."; + 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.damage = dice_def(3, 20); 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."; + 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(type) << std::endl; - return false; + return (false); } bool saw = false; -- cgit v1.2.3-54-g00ecf