From db099817902be676726cfa019a85aa0b685ee877 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Thu, 11 Jun 2009 09:23:54 +0000 Subject: * 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 --- crawl-ref/CREDITS | 41 ----------------------------------------- crawl-ref/CREDITS.txt | 41 +++++++++++++++++++++++++++++++++++++++++ crawl-ref/source/AppHdr.h | 4 ++-- crawl-ref/source/player.cc | 9 ++++++--- crawl-ref/source/spl-cast.cc | 3 ++- 5 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 crawl-ref/CREDITS create mode 100644 crawl-ref/CREDITS.txt diff --git a/crawl-ref/CREDITS b/crawl-ref/CREDITS deleted file mode 100644 index e9c1292139..0000000000 --- a/crawl-ref/CREDITS +++ /dev/null @@ -1,41 +0,0 @@ - -The Dungeon Crawl Stone Soup team (Peter Berger, Matthew Cline, Paul Du Bois, -Nat Lanza, Haran Pilpel, David Ploog, Johanna Ploog, David Lawrence Ramsey, -Enne Walker) would like to thank: - -* Linley Henzell, the author of Dungeon Crawl, for writing this great game. - -* Brent Ross, Dungeon Crawl 4.0/4.1 maintainer. Stone Soup owes a lot to his - ideas and code in Crawl 4.1. - -* Other members of the 4.0 Crawl development team: Michal Valvoda, Guus Sliepen, - Brian Robinson, Mark Mackey, Gordon Lipford, Daniel Ligon, Jesse Jones, Josh - Fishman, Don Brodale. - -We'd also like to thank members of the Dungeon Crawl community who have -contributed to Dungeon Crawl Stone Soup: - -Warwick Allison R. Dan Henry Dylan O'Donnell -Juha Arpiainen Benoit Hudson Stefan O'Rear -Roy Axenov Iainuki Yuuma Oohara -Max Bane Ilyak Erik Piper -Bill Beher Mitsuhiro Itakura Lemuel Pitkin -Alexander Beisig Eino Keskitalo Derek Ray -Erik Inge Bolsø Jarmo Kielosto Remsleep -Peter Borgmann Kornel Kisielewicz David Rose -Adam Borowski Vambola Kotkas Sebastian Salman -Terje Bø Vsevolod Kozlov Brett Scarborough -Jude (due) Brown Ryan Kusnery Darshan Shaligram -Aaron Curtis Jukka Kuusisto Robert Shimmin -Denzi Maciej Lapinski Sigurd -Rachel Elizabeth Dillon Jordan Lewis Edgar Simo -Mike Drinen Icy Lich Solf -Kieron Dunbar Jesse Luehrs Johan Strandell -Christopher Evenstar Markus Maier Roman Sêk -Ben Goetter Arien Malec Marc H. Thoben -Rob Grant Shawn M Moore Matt Titus -John Greenberg Eva Myers Robert Vollmert -GreyKnight Wille Mäntylä Steven Wheeler -Shayne Halvorson Onia Ninara Jeremey Wilson -Ciaran Hamilton Erkki Nurmi Yelve Yakut -Chris Hamons nyra Zooko diff --git a/crawl-ref/CREDITS.txt b/crawl-ref/CREDITS.txt new file mode 100644 index 0000000000..e9c1292139 --- /dev/null +++ b/crawl-ref/CREDITS.txt @@ -0,0 +1,41 @@ + +The Dungeon Crawl Stone Soup team (Peter Berger, Matthew Cline, Paul Du Bois, +Nat Lanza, Haran Pilpel, David Ploog, Johanna Ploog, David Lawrence Ramsey, +Enne Walker) would like to thank: + +* Linley Henzell, the author of Dungeon Crawl, for writing this great game. + +* Brent Ross, Dungeon Crawl 4.0/4.1 maintainer. Stone Soup owes a lot to his + ideas and code in Crawl 4.1. + +* Other members of the 4.0 Crawl development team: Michal Valvoda, Guus Sliepen, + Brian Robinson, Mark Mackey, Gordon Lipford, Daniel Ligon, Jesse Jones, Josh + Fishman, Don Brodale. + +We'd also like to thank members of the Dungeon Crawl community who have +contributed to Dungeon Crawl Stone Soup: + +Warwick Allison R. Dan Henry Dylan O'Donnell +Juha Arpiainen Benoit Hudson Stefan O'Rear +Roy Axenov Iainuki Yuuma Oohara +Max Bane Ilyak Erik Piper +Bill Beher Mitsuhiro Itakura Lemuel Pitkin +Alexander Beisig Eino Keskitalo Derek Ray +Erik Inge Bolsø Jarmo Kielosto Remsleep +Peter Borgmann Kornel Kisielewicz David Rose +Adam Borowski Vambola Kotkas Sebastian Salman +Terje Bø Vsevolod Kozlov Brett Scarborough +Jude (due) Brown Ryan Kusnery Darshan Shaligram +Aaron Curtis Jukka Kuusisto Robert Shimmin +Denzi Maciej Lapinski Sigurd +Rachel Elizabeth Dillon Jordan Lewis Edgar Simo +Mike Drinen Icy Lich Solf +Kieron Dunbar Jesse Luehrs Johan Strandell +Christopher Evenstar Markus Maier Roman Sêk +Ben Goetter Arien Malec Marc H. Thoben +Rob Grant Shawn M Moore Matt Titus +John Greenberg Eva Myers Robert Vollmert +GreyKnight Wille Mäntylä Steven Wheeler +Shayne Halvorson Onia Ninara Jeremey Wilson +Ciaran Hamilton Erkki Nurmi Yelve Yakut +Chris Hamons nyra Zooko 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 Z to cast anyway.)"); + mpr("There are no visible monsters within range! (Use Z to " + "cast anyway.)"); delay(500); Options.target_range = 0; viewwindow(true, false); -- cgit v1.2.3-54-g00ecf