summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/skills2.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/skills2.cc')
-rw-r--r--crawl-ref/source/skills2.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 62f5b2023c..6b83e96772 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -36,7 +36,6 @@
#include "menu.h"
#include "player.h"
#include "randart.h"
-#include "religion.h"
#include "stuff.h"
#include "transfor.h"
#include "view.h"
@@ -1879,10 +1878,7 @@ static void display_skill_table(bool show_aptitudes)
if ( !show_aptitudes )
{
textcolor(CYAN);
- if ( !Options.increasing_skill_progress )
- cprintf( " (%d)", (100 - percent_done) / 10 );
- else
- cprintf( " (%2d%%)", (percent_done / 5) * 5 );
+ cprintf( " (%2d%%)", (percent_done / 5) * 5 );
}
else
{
@@ -2249,6 +2245,10 @@ int calc_mp(bool real_mp)
if (!real_mp)
you.max_magic_points += player_magical_power();
+ // analogous to ROBUST/FRAIL
+ you.max_magic_points *= (10 + you.mutation[MUT_HIGH_MAGIC] - you.mutation[MUT_LOW_MAGIC]);
+ you.max_magic_points /= 10;
+
if (you.max_magic_points > 50)
you.max_magic_points = 50 + ((you.max_magic_points - 50) / 2);