summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/skills2.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-18 15:13:34 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-18 15:13:34 +0000
commit2f75c92ad79443e954d0167055c08decff3e41b2 (patch)
tree20bf394b6ae9e60e6f687ad881a2ef4e89d8e8d2 /crawl-ref/source/skills2.cc
parenta4d4f3ecccb29c3f5fc1ce55579119106c399911 (diff)
parente5860798ba239a9f474ad97263094c6d50967137 (diff)
downloadcrawl-ref-0.1b1.tar.gz
crawl-ref-0.1b1.zip
Updated stone_soup-0.1b1 tag to include fix for Poison Arrow of Doom.0.1b1
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/tags/stone_soup-0.1b1@51 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/skills2.cc')
-rw-r--r--crawl-ref/source/skills2.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 6a6f468125..b4a0cbca9f 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -2178,14 +2178,11 @@ int calc_mp(void)
int spell_extra = (you.experience_level * you.skills[SK_SPELLCASTING]) / 4;
int invoc_extra = (you.experience_level * you.skills[SK_INVOCATIONS]) / 6;
- int evoc_extra = (you.experience_level * you.skills[SK_EVOCATIONS]) / 6;
- if (spell_extra > invoc_extra && spell_extra > evoc_extra)
+ if (spell_extra > invoc_extra)
enp += spell_extra;
- else if (invoc_extra > evoc_extra)
- enp += invoc_extra;
else
- enp += evoc_extra;
+ enp += invoc_extra;
you.max_magic_points = stepdown_value( enp, 9, 18, 45, 100 );