diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-01 12:29:07 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-01 12:29:07 +0000 |
| commit | f5e97453a4ac3af452849dd8b3b429ecc8c7389d (patch) | |
| tree | ae4ebfa3f583fde4b04738b120e0575f65b45353 /crawl-ref/source/ouch.cc | |
| parent | 04f5058cac8e12d3b85834bda4589239932f371a (diff) | |
| download | crawl-ref-f5e97453a4ac3af452849dd8b3b429ecc8c7389d.tar.gz crawl-ref-f5e97453a4ac3af452849dd8b3b429ecc8c7389d.zip | |
Added shields of reflection, though they're not randomly generated and have no
valuation is shopping.cc. It currently only reflects missiles that are blocked
with the shield. They could also reflect the brand effects of blocked melee
weapons, but I'm not sure if that's a good idea.
drop_item and the item to be dropped have been moved from fire_beam()'s
parameters into the bolt structure, along with the beam's remaining range.
Seems to work fine, but it might still lead to some buggyness.
The game now distinguishes between killing yourself by hitting yourself with a
beam bounced off a wall versus other forms of self targeting.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7705 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index a00a296e8d..6cdfe1c2fb 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -724,7 +724,9 @@ static void _xom_checks_damage(kill_method_type death_type, { if (you.religion == GOD_XOM) { - if (death_type == KILLED_BY_TARGETTING) + if (death_type == KILLED_BY_TARGETTING + || death_type == KILLED_BY_BOUNCE + || death_type == KILLED_BY_REFLECTION) { // Xom thinks the player hurting him/herself is funny. xom_is_stimulated(255 * dam / (dam + you.hp)); |