diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 12:12:34 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 12:12:34 +0000 |
| commit | 86d8666f0964efdda5bf3ce68abf7e3ae8a1a565 (patch) | |
| tree | 6c026f45e4b676d8cc7ac9a1055460c92d7a63ac /crawl-ref/source/player.cc | |
| parent | 9bf1ac53d17a3d206fcc21b064208b68c86645b6 (diff) | |
| download | crawl-ref-86d8666f0964efdda5bf3ce68abf7e3ae8a1a565.tar.gz crawl-ref-86d8666f0964efdda5bf3ce68abf7e3ae8a1a565.zip | |
* More documentation tweaks.
* Make Trog's Hand _add_ 100 regeneration points.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9958 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 015c96b96a..1eb78f9f73 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1050,8 +1050,11 @@ int player_regen() rr += 40 * player_equip(EQ_RINGS, RING_REGENERATION); // Spell. - if (you.duration[DUR_REGENERATION]) + if (you.duration[DUR_REGENERATION] + && !you.attribute[ATTR_DIVINE_REGENERATION]) + { rr += 100; + } // Troll leather (except for trolls). if (player_equip(EQ_BODY_ARMOUR, ARM_TROLL_LEATHER_ARMOUR) @@ -1093,9 +1096,9 @@ int player_regen() rr /= 3; } - // Trog's Hand. This overrides everything above. + // Trog's Hand. This circumvents the slow healing effect. if (you.attribute[ATTR_DIVINE_REGENERATION]) - rr = 100; + rr += 100; return (rr); } |