diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-19 22:28:38 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-19 22:28:38 +0000 |
| commit | a56eea02ae7ce566af2baff5be396ddc15134735 (patch) | |
| tree | a10aefecf614ec03b4c08c7544814e15d4076102 /crawl-ref/source/beam.cc | |
| parent | dbea6550fa584e710e7788b95f1037a9ec344ba5 (diff) | |
| download | crawl-ref-a56eea02ae7ce566af2baff5be396ddc15134735.tar.gz crawl-ref-a56eea02ae7ce566af2baff5be396ddc15134735.zip | |
* For flavour, let Xom laugh himself silly whenever a follower dies.
* Fix Xom being amused about rotten corpses being butchered. (As opposed
to clean corpses becoming rotten while butchered, which is how it was
originally intended.)
* Xom no longer is amused if you deliberately hit yourself with a
missile/wand/spell in safe surroundings. (Identifying wands that way
or zapping /random effects is still considered amusing.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9519 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 8606225b22..8fd7839844 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3136,7 +3136,12 @@ void bolt::internal_ouch(int dam) else if (bounces > 0) ouch(dam, NON_MONSTER, KILLED_BY_BOUNCE, name.c_str()); else - ouch(dam, NON_MONSTER, KILLED_BY_TARGETTING); + { + if (aimed_at_feet && effect_known) + ouch(dam, NON_MONSTER, KILLED_BY_SELF_AIMED, name.c_str()); + else + ouch(dam, NON_MONSTER, KILLED_BY_TARGETTING); + } } else if (MON_KILL(thrower)) ouch(dam, beam_source, KILLED_BY_BEAM, aux_source.c_str()); |