summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ability.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-06-26 21:42:00 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-06-26 22:25:41 -0700
commitd16265b1dca17f728ff9a9900cd72ea716958647 (patch)
treeefa02ee12e75a5d9a3c4fc9c04a7c4b97aa8029d /crawl-ref/source/ability.cc
parent55310b93fcfec5eb19251a72bffbe496492a0e20 (diff)
downloadcrawl-ref-d16265b1dca17f728ff9a9900cd72ea716958647.tar.gz
crawl-ref-d16265b1dca17f728ff9a9900cd72ea716958647.zip
Make Makhleb's Destruction not fail before targeting
Diffstat (limited to 'crawl-ref/source/ability.cc')
-rw-r--r--crawl-ref/source/ability.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/ability.cc b/crawl-ref/source/ability.cc
index 5b14a4143d..5b44f062ab 100644
--- a/crawl-ref/source/ability.cc
+++ b/crawl-ref/source/ability.cc
@@ -2648,7 +2648,6 @@ static spret_type _do_ability(const ability_def& abil, bool fail)
break;
case ABIL_MAKHLEB_MINOR_DESTRUCTION:
- fail_check();
beam.range = 8;
if (!spell_direction(spd, beam))
@@ -2663,6 +2662,8 @@ static spret_type _do_ability(const ability_def& abil, bool fail)
if (!player_tracer(ZAP_DEBUGGING_RAY, power, beam, 8))
return SPRET_ABORT;
+ fail_check();
+
switch (random2(5))
{
case 0: zapping(ZAP_THROW_FLAME, power, beam); break;
@@ -2681,7 +2682,6 @@ static spret_type _do_ability(const ability_def& abil, bool fail)
break;
case ABIL_MAKHLEB_MAJOR_DESTRUCTION:
- fail_check();
beam.range = 6;
if (!spell_direction(spd, beam))
@@ -2696,6 +2696,8 @@ static spret_type _do_ability(const ability_def& abil, bool fail)
if (!player_tracer(ZAP_DEBUGGING_RAY, power, beam, 8))
return SPRET_ABORT;
+ fail_check();
+
{
zap_type ztype =
random_choose(ZAP_BOLT_OF_FIRE,