* 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

7 files changed, 40 insertions, 37 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index bff4661fe9..0ee49a17d5 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -189,6 +189,7 @@ Miscellaneous
 * Flying can be cancelled.
 * Petrify is an Enchantment/Earth spell.
 * Lee's Rapid Deconstruction deals great damage to petrified monsters.
+* Removed stash_tracking option, just track all stashes.
 * Rewrite and clean up of (among others) beam, trap, and mutations code.
 * Store code revision in save files for easier bug tracking.
 * Many useful new wizard commands.
diff --git a/crawl-ref/docs/key_changes.txt b/crawl-ref/docs/key_changes.txt
index 8f56e1bc95..5f2d2a9075 100644
--- a/crawl-ref/docs/key_changes.txt
+++ b/crawl-ref/docs/key_changes.txt
@@ -9,7 +9,7 @@ needed to interchange the Z and V commands if you refuse to learn that wands
 are nowadays activated with V.)
             key        new command
             V          evokes items in inventory like wands (was Z)
-            Z          cast a spell even if no monster is withing range
+            Z          cast a spell even if no monster is within range
             z          cast a spell (as before) but abort if no monster is
                        within range
             Ctrl-X     lists monsters, items and features in sight
diff --git a/crawl-ref/docs/tiles_help.txt b/crawl-ref/docs/tiles_help.txt
index 9edf241c77..231dd7ebb3 100644
--- a/crawl-ref/docs/tiles_help.txt
+++ b/crawl-ref/docs/tiles_help.txt
@@ -31,26 +31,26 @@ INVENTORY MANAGEMENT
 
 left mouseclick            Execute the most common action for this item type.
 
-  weapon, deck:      wield    ('w')
-  armour:            Wear     ('W')
-  food:              eat      ('e')
-  scroll, manual:    read     ('r')
-  potion:            quaff    ('q')
-  jewellery:         Put on   ('P')
-  spellbook:         Memorise ('M')
-  missiles:          fire     ('f')
-  wand, misc. item:  evoke    ('V')
-  corpse:            eat      ('e'), for Vampires
-
-wielded items:
-  rod, deck:         evoke    ('v')
-  weapon, staff:     unwield  ('w-')
-  armour, jewellery: unwield  ('w-')
-  others, as non-wielded
-
-worn items:
-  armour:            Take off ('T')
-  jewellery:         Remove   ('R')
+    weapon, deck:          wield    ('w')
+    armour:                Wear     ('W')
+    food:                  eat      ('e')
+    scroll, manual:        read     ('r')
+    potion:                quaff    ('q')
+    jewellery:             Put on   ('P')
+    spellbook:             Memorise ('M')
+    missiles:              fire     ('f')
+    wand, misc. item:      evoke    ('V')
+    corpse:                eat      ('e'), for Vampires
+
+  wielded items:
+    rod, deck:             evoke    ('v')
+    weapon, staff:         unwield  ('w-')
+    armour, jewellery:     unwield  ('w-')
+    others                 as non-wielded
+
+  worn items:
+    armour:                Take off ('T')
+    jewellery:             Remove   ('R')
 
 Sometimes alternative denominators are used such as "draw a card"
 instead of evoke for decks of cards, or "drink blood" instead of eat.
@@ -63,12 +63,12 @@ Shift + left mouseclick    Drop item ('d').
 
 Shift + right mouseclick   Execute secondary action for some item types.
 
-  weapon:            fire    ('f'), if throwable
-  non-weapon:        wield   ('w'), if corresponding spells memorised
+    weapon:                fire    ('f'), if throwable
+    non-weapon:            wield   ('w'), if corresponding spells memorised
 
-wielded items:
-  weapon:            fire    ('f')
-  anything else:     unwield ('w-')
+  wielded items:
+    weapon:                fire    ('f')
+    anything else:         unwield ('w-')
 
 
 NON-INVENTORY ITEM MANAGEMENT
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index 052c1d57df..bf331c5ec0 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -257,7 +257,7 @@ Go berserk. Going berserk greatly, if temporarily, increases your hit points and
 %%%%
 Trog's Hand
 
-Invoke a powerful regeneration ability which stacks with all other sources. This will also increase protection from magical effects.
+Invoke a powerful regeneration ability which stacks with all other sources and even allows otherwise non-healing species to regenerate. This will also increase protection from magical effects.
 %%%%
 Brothers in Arms
 
diff --git a/crawl-ref/source/dat/descript/branches.txt b/crawl-ref/source/dat/descript/branches.txt
index d51bbfc38f..b2ddc55877 100644
--- a/crawl-ref/source/dat/descript/branches.txt
+++ b/crawl-ref/source/dat/descript/branches.txt
@@ -44,9 +44,8 @@ Swamp
 A swampy wasteland, complete with ooze, muck, flies and large slavering
 carnivorous monsters.
 
-The Swamp is five levels deep and contains the decaying rune. A dungeon
-features only one of the Swamp or Shoals branches. If the Swamp is
-present, the entry is located between Lair:2 and Lair:7.
+The Swamp is five levels deep and contains the decaying rune. Its entry is
+located between Lair:2 and Lair:7.
 %%%%
 Shoals
 
@@ -56,9 +55,9 @@ making up a few islands in a vast sea. Out of a sudden, a bloodcurdling
 scream fills the air, followed by a gurgle. Anxiously, you look around and
 wonder: Who is the predator? And who is the prey?
 
-The Shoals are five levels deep and contain the barnacled rune. A dungeon
-features only one of the Swamp or Shoals branches. If the Shoals are
-present, the entry is located between Lair:2 and Lair:7.
+The Shoals are still under construction and while they can be accessed using
+wizard mode they will not be present in a normal game.
+They are five levels deep and contain the barnacled rune.
 %%%%
 Slime Pits
 
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);
 }
diff --git a/crawl-ref/source/util/docs/key_changes.tex b/crawl-ref/source/util/docs/key_changes.tex
index 57cd43b76d..be547363bf 100644
--- a/crawl-ref/source/util/docs/key_changes.tex
+++ b/crawl-ref/source/util/docs/key_changes.tex
@@ -50,7 +50,7 @@ activated with \key{V}.)
 \begin{tabular}{ll}
 key          & new command \\ \hline
 \key{V}      & evokes items in inventory like \textbf{wands} (was \key{Z}) \\
-\key{Z}      & cast a spell even if no monster is withing range \\
+\key{Z}      & cast a spell even if no monster is within range \\
 \key{z}      & cast a spell (as before) but abort if no monster is within range \\
 \key{Ctrl-X} & lists monsters, items and features in sight \\
 \key{Ctrl-S} & saves game without prompt (was \key{Ctrl-X}) \\