diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-10-04 18:15:56 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-10-05 22:02:25 +0200 |
| commit | b7dee52a419fd5470a063b2e34b3d2bfb7a04e5f (patch) | |
| tree | fef93966a3726abaac7e3045f869bd15ec941092 /crawl-ref/source/ouch.cc | |
| parent | ef6ad2cc032c461e2acea1f53dc01710b8dd2305 (diff) | |
| download | crawl-ref-b7dee52a419fd5470a063b2e34b3d2bfb7a04e5f.tar.gz crawl-ref-b7dee52a419fd5470a063b2e34b3d2bfb7a04e5f.zip | |
Amulet of guardian spirit, it comes as an amulet or a cap.
When worn, all non-poison damage will drain mana instead, hurting hp
only after mana is depleted.
The cap brand is intended only for a fixedart, but per dpeg's request,
it will be generated on ordinary caps for now, as a test.
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 91753b5ff0..69bba8b5dc 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -943,6 +943,17 @@ void ouch(int dam, int death_source, kill_method_type death_type, if (dam != INSTANT_DEATH) { + if (player_spirit_shield() && death_type != KILLED_BY_POISON) + { + if (dam <= you.magic_points) + { + dec_mp(dam); + return; + } + dam -= you.magic_points; + dec_mp(you.magic_points); + } + if (dam >= you.hp) { if (harm_protection_type hpt = god_protects_from_harm(you.religion)) |