Apply r9964 to trunk, and documentation update.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9965 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 39 insertions, 33 deletions

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/item_use.cc b/crawl-ref/source/item_use.cc
index d82638b0d0..f81196f13d 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3493,6 +3493,8 @@ static bool _swap_rings(int ring_slot)
 
     // Don't prompt if both rings are of the same type.
     if (lring->sub_type == rring->sub_type
+        && lring->plus == rring->plus
+        && lring->plus2 == rring->plus2
         && !is_artefact(*lring) && !is_artefact(*rring))
     {
         if (item_cursed(*lring))
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 43176d8c9b..fd2ebd42db 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -752,10 +752,14 @@ static void _get_status_lights(std::vector<status_light>& out)
 
     if (you.magic_contamination || you.backlit(false))
     {
-        int color = you.magic_contamination > 5
-            ? _bad_ench_colour( you.magic_contamination, 15, 25 )
-            : LIGHTBLUE;
-        out.push_back(status_light(color, "Glow"));
+        int colour = LIGHTBLUE;
+        if (you.magic_contamination > 0)
+        {
+            colour = (you.magic_contamination > 5
+                        ? _bad_ench_colour( you.magic_contamination, 15, 25 )
+                        : DARKGREY);
+        }
+        out.push_back(status_light(colour, "Glow"));
     }
 
     if (you.duration[DUR_SWIFTNESS])
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 8d98d8dcb3..29e7e62ba3 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1096,7 +1096,7 @@ int player_regen()
         rr /= 3;
     }
 
-    // Trog's Hand.  This overrides the slow healing effect.
+    // Trog's Hand.  This circumvents the slow healing effect.
     if (you.attribute[ATTR_DIVINE_REGENERATION])
         rr += 100;
 
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}) \\