From a9fdbb0f00c69102a08ce24236b4d9a358b6b5f4 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 15 May 2008 16:00:34 +0000 Subject: Clean up the non-stacking of Zin's divine boosts and the equivalent mutations. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5055 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/skills2.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/skills2.cc') diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index cbdd7309d4..2c8f655f44 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -2110,12 +2110,10 @@ int calc_hp(bool real_hp) } } - // robust mutations and divine robustness don't stack - const int robust = std::min(player_mutation_level(MUT_ROBUST) - + you.attribute[ATTR_DIVINE_ROBUSTNESS], 3); - // frail and robust mutations, and divine robustness - hitp *= (10 + robust - player_mutation_level(MUT_FRAIL)); + hitp *= (10 + player_mutation_level(MUT_ROBUST) + + you.attribute[ATTR_DIVINE_ROBUSTNESS] + - player_mutation_level(MUT_FRAIL)); hitp /= 10; you.hp_max = hitp; -- cgit v1.2.3-54-g00ecf