diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-08-12 22:18:26 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-08-12 22:20:10 -0700 |
| commit | 423313931866de0dd6d3111e7989fc1d5ef1cb79 (patch) | |
| tree | 70f2a1663343763b589430a7376202c8fa1559a7 | |
| parent | 7085e1e1b23851ed76e383ce88bc8d7fb63f8bb9 (diff) | |
| download | crawl-ref-423313931866de0dd6d3111e7989fc1d5ef1cb79.tar.gz crawl-ref-423313931866de0dd6d3111e7989fc1d5ef1cb79.zip | |
Reorder acid effects (doy)
For better messaging.
| -rw-r--r-- | crawl-ref/source/beam.cc | 8 |
1 files 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)) |