diff options
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 10 |
1 files changed, 6 insertions, 4 deletions
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 { |