diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-18 14:53:38 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-18 14:53:38 +0000 |
| commit | e5860798ba239a9f474ad97263094c6d50967137 (patch) | |
| tree | 20bf394b6ae9e60e6f687ad881a2ef4e89d8e8d2 | |
| parent | bf8f76369f3779b4bd48ab9a1f09bc06a6f0ea7a (diff) | |
| download | crawl-ref-e5860798ba239a9f474ad97263094c6d50967137.tar.gz crawl-ref-e5860798ba239a9f474ad97263094c6d50967137.zip | |
r117@xenon: dshaligram | 2006-09-18 20:25:11 +051800
Fixed evocations giving increased max MP.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@48 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/skills.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/skills2.cc | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc index 2c96373bf3..db7fe62372 100644 --- a/crawl-ref/source/skills.cc +++ b/crawl-ref/source/skills.cc @@ -418,8 +418,7 @@ static int exercise2( int exsk ) if (exsk == SK_FIGHTING) calc_hp(); - if (exsk == SK_INVOCATIONS || exsk == SK_EVOCATIONS - || exsk == SK_SPELLCASTING) + if (exsk == SK_INVOCATIONS || exsk == SK_SPELLCASTING) { calc_mp(); } 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 ); |