diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 09:23:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-11 09:23:54 +0000 |
| commit | db099817902be676726cfa019a85aa0b685ee877 (patch) | |
| tree | e32629a9a64120b19c6e78206f27bb77881fd366 | |
| parent | a83003cc352db2c464b62d6a653152ba05838633 (diff) | |
| download | crawl-ref-db099817902be676726cfa019a85aa0b685ee877.tar.gz crawl-ref-db099817902be676726cfa019a85aa0b685ee877.zip | |
* Rename CREDITS -> CREDITS.txt
* Change Trog's Hand to rr += 100.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9957 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/CREDITS.txt (renamed from crawl-ref/CREDITS) | 0 | ||||
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/crawl-ref/CREDITS b/crawl-ref/CREDITS.txt index e9c1292139..e9c1292139 100644 --- a/crawl-ref/CREDITS +++ b/crawl-ref/CREDITS.txt diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 17740f7c98..f417f201ab 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -326,7 +326,7 @@ // ========================================================================= // Game Play Defines // ========================================================================= -// number of back messages saved during play (currently none saved into files) +// number of older messages stored during play and in save files #define NUM_STORED_MESSAGES 1000 // clamp time between command inputs at 5 minutes when reporting play time. @@ -370,7 +370,7 @@ // bwr: set this to non-zero if you want to know the pluses, "runed" status // of the monster's weapons in the hiscore file. -// #define HISCORE_WEAPON_DETAIL 1 +#define HISCORE_WEAPON_DETAIL 1 // ====================== ----------------------------------------------------- //jmf: end of new defines diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 643da199f0..8d98d8dcb3 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 overrides the slow healing effect. if (you.attribute[ATTR_DIVINE_REGENERATION]) - rr = 100; + rr += 100; return (rr); } diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 3e1ac00721..4c15a594a5 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -736,7 +736,8 @@ bool cast_a_spell(bool check_range) // markers for about half a second. Options.target_range = _calc_spell_range(spell); viewwindow(true, false); - mpr("There are no visible monsters within range! (Use <w>Z</w> to cast anyway.)"); + mpr("There are no visible monsters within range! (Use <w>Z</w> to " + "cast anyway.)"); delay(500); Options.target_range = 0; viewwindow(true, false); |