Point out a! in manual and ??, and note context sensitive help in ??

and I screens.


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

3 files changed, 24 insertions, 16 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 308993c8ce..5ddf64cebb 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -2329,21 +2329,25 @@ Character information:
     E                   Display experience info.
     ^                   Show religion screen.
     A                   Show abilities/mutations.
-    a                   Show current abilities menu.
+    a                   Lets you choose an ability. Pressing a? or a*
+                        show current abilities as a menu. Pressing a! 
+                        brings up the help on abilities.
     \                   Show item knowledge.
-    m                   Show skill screen.
+    m                   Show skill screen. You can get descriptions of
+                        present skills from that screen, as well as the
+                        aptitudes.
     i                   Show inventory list. Inside this list, pressing
                         a slot key shows information on that item.
     ]                   Shows a restricted inventory, only containing
                         worn, wielded and quivered items.
     I                   Show list of memorised spells.
     V                   Lists all monsters and items in sight.
-    %                   Show resistances and general character overview,
-                        including health, experience, gear, status,
-                        mutations, abilities (the latter three more
-                        terse than with the command @, A, a). This is a
-                        highly condensed conglomeration of the commands
-                        [, ", C, ^, @, A, a on a single screen.
+    %                   Show resistances and general character overview:
+                        health, experience, money, gear, and 
+                        status, mutations, abilities (the latter three 
+                        more terse than with the command @, A, a). This 
+                        is a highly condensed conglomeration of
+                        [, ", E, ^, @, A, a, $ on a single screen.
                         Pressing the key of a displayed item views it.
 
 Item interaction (inventory):
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 635c1f7cb1..7cad0c11d0 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -2065,9 +2065,10 @@ static void _add_formatted_keyhelp(column_composer &cols)
         "</lightcyan> : books (<w>r</w>ead, <w>M</w>emorise and <w>z</w>ap)\n"
         "<brown>\\</brown> : staves and rods (<w>w</w>ield and e<w>v</w>oke)\n"
         "<lightgreen>}</lightgreen> : miscellaneous items (e<w>v</w>oke)\n"
-        "<lightmagenta>0</lightmagenta> : the Orb of Zot (Carry the Orb \n"
-        "    to the surface and win!)\n"
-        "<yellow>$</yellow> : gold (<w>$</w> counts gold)\n",
+        "<yellow>$</yellow> : gold (<w>$</w> counts gold)\n"
+        "<lightmagenta>0</lightmagenta> : the Orb of Zot\n"
+        "    Carry it to the surface and win!\n",
+
 
 
     cols.add_formatted(
@@ -2077,8 +2078,8 @@ static void _add_formatted_keyhelp(column_composer &cols)
     cols.add_formatted(
             0,
             "<h>Other Gameplay Actions:\n"
-            "<w>a</w> : use special Ability\n"
-            "<w>p</w> : Pray\n"
+            "<w>a</w> : use special Ability (<w>a!</w> for help)\n"
+            "<w>p</w> : Pray (<w>^</w> and <w>^!</w> for help)\n"
             "<w>z</w> : cast a spell\n"
             "<w>I</w> : list all spells\n"
             "<w>t</w> : tell allies (<w>tt</w> to shout)\n"
@@ -2132,7 +2133,7 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "<w><<</w>/<w>></w> : use staircase (<w><<</w> enter shop)\n"
             "<w>;</w>   : examine occupied tile\n"
             "<w>x</w>   : eXamine surroundings/targets\n"
-            "<w>X</w>   : eXamine level map\n"
+            "<w>X</w>   : eXamine level map (<w>X?</w> for help)\n"
             "<w>V</w>   : list monsters and items in sight\n"
             "<w>Ctrl-O</w> : show dungeon Overview\n"
             "<w>Ctrl-A</w> : toggle auto-pickup\n"
@@ -2191,7 +2192,10 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "Many commands have context sensitive \n"
             "help, among them <w>X</w>, <w>x</w>, <w>f</w> (or any \n"
             "form of targeting), <w>Ctrl-G</w> or <w>G</w>, and \n"
-            "<w>Ctrl-F</w>.\n",
+            "<w>Ctrl-F</w>.\n"
+            "You can read descriptions of your \n"
+            "current spells (<w>I</w>), skills (<w>m?</w>) and \n"
+            "abilities (<w>a!</w>).",
             true, true, _cmdhelp_textfilter);
 }
 
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index f7b3db1861..1661a1f33a 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -211,7 +211,7 @@ int list_spells(bool toggle_with_I)
     if (toggle_with_I)
     {
         spell_menu.set_more(
-            formatted_string("Press '!' or 'I' to toggle spell view."));
+            formatted_string("Press '!' or 'I' to toggle spell view. Press spell slot for description."));
         spell_menu.add_toggle_key('I');
     }
     else