From 423313931866de0dd6d3111e7989fc1d5ef1cb79 Mon Sep 17 00:00:00 2001 From: Nicholas Feinberg Date: Tue, 12 Aug 2014 22:18:26 -0700 Subject: Reorder acid effects (doy) For better messaging. --- crawl-ref/source/beam.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 6834aeba67..ab7d59c30c 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4069,10 +4069,6 @@ void bolt::affect_player() you.attribute[ATTR_BARBS_POW] = 4; } - // Acid. - if (flavour == BEAM_ACID) - splash_with_acid(5, beam_source, affects_items); - if (flavour == BEAM_ENSNARE) was_affected = ensnare(&you) || was_affected; @@ -4113,6 +4109,10 @@ void bolt::affect_player() internal_ouch(hurted); + // Acid. (Apply this afterward, to avoid bad message ordering.) + if (flavour == BEAM_ACID) + splash_with_acid(5, beam_source, affects_items); + extra_range_used += range_used_on_hit(); if (can_knockback(&you, hurted)) -- cgit v1.2.3-54-g00ecf