diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-23 04:53:19 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-23 04:53:19 +0000 |
| commit | 8ca11ca1abfafae094983a6445cf7ac2b8013835 (patch) | |
| tree | 3218b65b3d5e043c53a03bf49bc8c5d602fc9b48 /crawl-ref/source | |
| parent | 67a552e915ba6e0e604a443458c3e36a8df29420 (diff) | |
| download | crawl-ref-8ca11ca1abfafae094983a6445cf7ac2b8013835.tar.gz crawl-ref-8ca11ca1abfafae094983a6445cf7ac2b8013835.zip | |
When under penance from TSO, you don't get his negative energy
protection. Properly take this into account on the "%" screen (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4506 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/player.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index a98a2ed5b5..fe4203a98c 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1725,8 +1725,11 @@ int player_prot_life(bool calc_unid, bool temp) // same here: Your piety status is something you can more or less control. // TSO's protection - if (you.religion == GOD_SHINING_ONE && you.piety > pl * 50) + if (you.religion == GOD_SHINING_ONE && you.piety > pl * 50 + && !player_under_penance()) + { pl = you.piety / 50; + } if (temp) { |