A number of "gain mutation" debug command improvements:

* The name given is now a simple name (fast, clever, etc) matching
  the enumeration name, rather than the description of when you
  first get the mutation.

* The name can be "any" to get a random mutation, or "xom" to get a
  random Xom mutation.

* If the player has the resist mutation mutation, the command asks
  if you want to get rid of it.

* You can force a mutation to happen, so that it will happen in spite
  of mutation resistance mutation, mutation resistance amulet,
  already being covered in too many scales, and so on.

Other wizard command improvements:

* The dismiss all (genocide) command can now take a regex of the monsters
  to dismiss, rather than dismissing all of them.

* The heal and super-heal wizard commands now never make you engorged.


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

1 files changed, 5 insertions, 3 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 71809c47ad..35c9b08124 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -420,6 +420,7 @@ static void handle_wizard_command( void )
         case 'X':
         case '!':
         case '[':
+        case ']':
         case '^':
         case '%':
         case 'o':
@@ -613,7 +614,7 @@ static void handle_wizard_command( void )
         you.duration[DUR_POISONING] = 0;
         you.disease = 0;
         set_hp( abs(you.hp_max), false );
-        set_hunger( 5000 + abs(you.hunger), true );
+        set_hunger( 10999, true );
         break;
 
     case 'H':
@@ -622,7 +623,7 @@ static void handle_wizard_command( void )
         you.disease = 0;
         inc_hp( 10, true );
         set_hp( you.hp_max, false );
-        set_hunger( 12000, true );
+        set_hunger( 10999, true );
         you.redraw_hit_points = 1;
         break;
 
@@ -850,7 +851,7 @@ static void handle_wizard_command( void )
 
                     // Use mpr_comma_separated_list() because the list
                     // might be *LONG*.
-                    mpr_comma_separated_list(prefix, matches, ", ", " and ",
+                    mpr_comma_separated_list(prefix, matches, " and ", ", ",
                                              MSGCH_DIAGNOSTICS);
                     return;
                 }
@@ -1053,6 +1054,7 @@ static bool cmd_is_repeatable(command_type cmd, bool is_again = false)
     case CMD_LIST_WEAPONS:
     case CMD_LIST_ARMOUR:
     case CMD_LIST_JEWELLERY:
+    case CMD_LIST_EQUIPMENT:
     case CMD_CHARACTER_DUMP:
     case CMD_DISPLAY_COMMANDS:
     case CMD_DISPLAY_INVENTORY: