diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-02-26 21:48:09 -0700 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-02-26 21:48:09 -0700 |
| commit | 2280caa48a5b2f66cd94ee90e71bad0e4d15836e (patch) | |
| tree | 13ae6f1ccab8975aedfacc0f2de54e2ec3b12ccd /crawl-ref/source/spl-damage.cc | |
| parent | 5516d479cdc6e041aebf3df4311fde0ab3d6fb48 (diff) | |
| download | crawl-ref-2280caa48a5b2f66cd94ee90e71bad0e4d15836e.tar.gz crawl-ref-2280caa48a5b2f66cd94ee90e71bad0e4d15836e.zip | |
Blast "blasted by (static electricity)" with static electricity.
You now get terse "blasted by themself (static electricity)" and verbose
"Killed by their own static electricity".
This also adjusts the self-LRD death source to "you" to employ this new
handling.
Diffstat (limited to 'crawl-ref/source/spl-damage.cc')
| -rw-r--r-- | crawl-ref/source/spl-damage.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-damage.cc b/crawl-ref/source/spl-damage.cc index e79b5f28aa..d2f922935c 100644 --- a/crawl-ref/source/spl-damage.cc +++ b/crawl-ref/source/spl-damage.cc @@ -1843,7 +1843,9 @@ int discharge_monsters(coord_def where, int pow, int, actor *agent) dprf("You: static discharge damage: %d", damage); damage = check_your_resists(damage, BEAM_ELECTRICITY, "static discharge"); - ouch(damage, agent->mindex(), KILLED_BY_BEAM, "by static electricity"); + ouch(damage, agent->mindex(), KILLED_BY_BEAM, "by static electricity", + true, + agent->is_player() ? "you" : agent->name(DESC_A).c_str()); } else if (mons == NULL) return 0; @@ -2320,7 +2322,7 @@ spret_type cast_fragmentation(int pow, const actor *caster, ouch(beam.damage.roll(), caster->mindex(), KILLED_BY_BEAM, "by Lee's Rapid Deconstruction", true, - caster->is_player() ? "themself" + caster->is_player() ? "you" : caster->name(DESC_A).c_str()); } else // Monster explodes. |