From a9f1fec61232ffd3c80b7a6589bcca31b8524aff Mon Sep 17 00:00:00 2001 From: haranp Date: Sun, 24 Jun 2007 10:59:41 +0000 Subject: Helm card can now have a shield effect. (Well, sort of.) Antimagic shouldn't cancel kenku permaflight. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1635 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/player.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 356228f36b..8f5e5088bd 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -2027,10 +2027,12 @@ int player_shield_class(void) //jmf: changes for new spell if (shield == -1) { - if (!you.duration[DUR_FIRE_SHIELD] && you.duration[DUR_CONDENSATION_SHIELD]) - base_shield = 2 + (you.skills[SK_ICE_MAGIC] / 6); // max 6 - else - return (0); + if (you.duration[DUR_MAGIC_SHIELD]) + base_shield = 2 + you.skills[SK_EVOCATIONS] / 6; + + if (!you.duration[DUR_FIRE_SHIELD] && + you.duration[DUR_CONDENSATION_SHIELD]) + base_shield += 2 + (you.skills[SK_ICE_MAGIC] / 6); // max 6 } else { -- cgit v1.2.3-54-g00ecf