Apply more commits into 0.4 branch, again mostly by Haran:

6950, 6954, 6959, 6962, 6963, 6965, 6968, 6970 (partly), 6997, 6998, 
7001, 7061, 7065, 7071, 7132 (partly), 7174, 7186, 7213, 7233, 7268,
7268, 7293, 7319, 7339, 7358, 7393 (partly)

* Tweak a few monster flags.
* Fix autoswapping jewellery taking longer than manual swapping.
* Fix crash when attempting to create nonexisting monster in wizmode.
* Make ego armour descriptions follow abbreviation guidelines.
* Fixed buggy monster movement away from the player.
* Disabled traps in the Abyss.
* Fixed a few other minor bugs, and improves messaging.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7788 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 14 insertions, 4 deletions

diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 86f4d07c52..15422763de 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -2023,7 +2023,8 @@ static bool _choose_book( item_def& book, int firstbook, int numbooks )
         _print_character_info();
 
         textcolor( CYAN );
-        cprintf(EOL "You have a choice of books:" EOL);
+        cprintf(EOL "You have a choice of books:  "
+                "(Press %% for a list of aptitudes)" EOL);
 
         for (int i = 0; i < numbooks; ++i)
         {
@@ -2080,6 +2081,9 @@ static bool _choose_book( item_def& book, int firstbook, int numbooks )
                     else
                         keyin = ('a' +  Options.prev_book - 1);
                 }
+            case '%':
+                list_commands('%');
+                return _choose_book(book, firstbook, numbooks);
             default:
                 break;
             }
@@ -2301,7 +2305,8 @@ static bool _choose_weapon()
         _print_character_info();
 
         textcolor( CYAN );
-        cprintf(EOL "You have a choice of weapons:" EOL);
+        cprintf(EOL "You have a choice of weapons:  "
+                "(Press %% for a list of aptitudes)" EOL);
 
         bool prevmatch = false;
         for (int i = 0; i < num_choices; i++)
@@ -2373,6 +2378,11 @@ static bool _choose_weapon()
                                  keyin = 'a' + i;
                     }
                 }
+            case '%':
+                list_commands('%');
+                return _choose_weapon();
+            default:
+                break;
            }
         }
         while (keyin != '*' && keyin != '+'
@@ -3834,10 +3844,10 @@ spec_query:
         break;
     // access to the help files
     case '?':
-        list_commands(false, '1');
+        list_commands('1');
         return choose_race();
     case '%':
-        list_commands(false, '%');
+        list_commands('%');
         return choose_race();
     default:
         break;