summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-23 19:01:20 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-23 19:01:20 +0000
commit20f61e40c48c46c84ff44f26257026b46d41bb58 (patch)
tree42caa66b6c6038bf035e53a318052c1d38f656d7 /crawl-ref/source/player.cc
parentf886bb92d5c362dafad2d00e9331b548f94c297a (diff)
downloadcrawl-ref-20f61e40c48c46c84ff44f26257026b46d41bb58.tar.gz
crawl-ref-20f61e40c48c46c84ff44f26257026b46d41bb58.zip
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9182 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc22
1 files changed, 9 insertions, 13 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 156dc2d0eb..61764313bf 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1036,36 +1036,32 @@ int player_regen()
if (rr > 20)
rr = 20 + ((rr - 20) / 2);
- // rings
+ // Rings.
rr += 40 * player_equip(EQ_RINGS, RING_REGENERATION);
- // spell
+ // Spell.
if (you.duration[DUR_REGENERATION])
rr += 100;
- // troll leather (except for trolls)
+ // Troll leather (except for trolls).
if (player_equip(EQ_BODY_ARMOUR, ARM_TROLL_LEATHER_ARMOUR)
&& you.species != SP_TROLL)
{
rr += 30;
}
- // fast heal mutation
+ // Fast heal mutation.
rr += player_mutation_level(MUT_REGENERATION) * 20;
- // Ghouls heal slowly.
- // Dematerialised people heal slowly.
- // Dematerialised ghouls shouldn't heal any more slowly. -- bwr
- if ((you.species == SP_GHOUL
- && (you.attribute[ATTR_TRANSFORMATION] == TRAN_NONE
- || you.attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS))
+ // Ghouls and dematerialised people heal slowly.
+ if (you.species == SP_GHOUL
|| you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
{
rr /= 2;
}
- // Before applying other effects, make sure that there's
- // something to heal.
+ // Before applying other effects, make sure that there's something
+ // to heal.
if (rr < 1)
rr = 1;
@@ -1104,7 +1100,7 @@ int player_regen()
}
}
- // Slow heal mutation. Applied last.
+ // Slow heal mutation. Applied last.
// Each level reduces your natural healing by one third.
if (player_mutation_level(MUT_SLOW_HEALING))
{