From b7dee52a419fd5470a063b2e34b3d2bfb7a04e5f Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Sun, 4 Oct 2009 18:15:56 +0200 Subject: 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. --- crawl-ref/source/ouch.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'crawl-ref/source/ouch.cc') 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)) -- cgit v1.2.3-54-g00ecf