diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-24 10:59:41 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-24 10:59:41 +0000 |
| commit | a9f1fec61232ffd3c80b7a6589bcca31b8524aff (patch) | |
| tree | 481c9e95cb4ab7839824f6a8e3f2805db86fd0a7 /crawl-ref/source/player.cc | |
| parent | e6e4a21b991c9f51b42b992fc4137791ea08c987 (diff) | |
| download | crawl-ref-a9f1fec61232ffd3c80b7a6589bcca31b8524aff.tar.gz crawl-ref-a9f1fec61232ffd3c80b7a6589bcca31b8524aff.zip | |
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
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 { |