diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-04 22:45:41 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-04 22:45:41 +0000 |
commit | bd3278609fdd2379bebbe7d15d25e10ec7445def (patch) | |
tree | e43ee76990d437fbfc6fe4bf05db5bd8dd7f6c3d /crawl-ref/source | |
parent | f4c98b5c1ff17fc786adafb369c2beb6ed007d30 (diff) | |
download | crawl-ref-bd3278609fdd2379bebbe7d15d25e10ec7445def.tar.gz crawl-ref-bd3278609fdd2379bebbe7d15d25e10ec7445def.zip |
Fix 2355689: player ghosts and swamp drakes now get the player Mephitic
Cloud effect.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8897 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/beam.cc | 23 | ||||
-rw-r--r-- | crawl-ref/source/mstuff2.cc | 10 |
2 files changed, 11 insertions, 22 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index b037cc74f4..919b7f7335 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2814,8 +2814,7 @@ void bolt::affect_endpoint() // They don't explode in tracers: why not? if (name == "orb of electricity" || name == "metal orb" - || name == "great blast of cold" - || name == "ball of vapour") + || name == "great blast of cold") { target = pos(); refine_for_explosion(); @@ -2827,9 +2826,9 @@ void bolt::affect_endpoint() if (name == "foul vapour") { - const cloud_type cl_type = (flavour == BEAM_MIASMA) ? CLOUD_MIASMA - : CLOUD_STINK; - big_cloud(cl_type, whose_kill(), killer(), pos(), 0, 9); + // death drake; swamp drakes handled earlier + ASSERT(flavour == BEAM_MIASMA); + big_cloud(CLOUD_MIASMA, whose_kill(), killer(), pos(), 0, 9); } if (name == "freezing blast") @@ -2841,17 +2840,7 @@ void bolt::affect_endpoint() bool bolt::stop_at_target() const { - if (is_explosion - || is_big_cloud - || aimed_at_spot - || name == "blast of poison" - || name == "foul vapour" - || name == "ball of vapour") - { - return (true); - } - - return (false); + return (is_explosion || is_big_cloud || aimed_at_spot); } void bolt::drop_object() @@ -5103,7 +5092,7 @@ void bolt::refine_for_explosion() hearMsg = "You hear a gentle \'poof\'."; } - if (name == "ball of vapour") + if (name == "foul vapour") { seeMsg = "The ball expands into a vile cloud!"; hearMsg = "You hear a gentle \'poof\'."; diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 8b31017927..e37c461e8a 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -1990,13 +1990,13 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power ) case SPELL_MEPHITIC_CLOUD: // swamp drake, player ghost beam.name = "foul vapour"; - beam.damage = dice_def( 3, 2 + power / 25 ); + beam.damage = dice_def(1,0); beam.colour = GREEN; - // FIXME: Players don't get the poison effect, only monsters - // do. This should be changed (probably by changing monsters). - beam.flavour = BEAM_POISON; + // Well, it works, even if the name isn't quite intuitive. + beam.flavour = BEAM_POTION_STINKING_CLOUD; beam.hit = 14 + power / 30; - beam.is_beam = true; + beam.ench_power = power; // probably meaningless + beam.is_explosion = true; beam.is_big_cloud = true; break; |