adjust a few more wizmode commands

Moving all commands off of ^M, <, and >, since those are menu keys, and
so &?< wouldn't do the right thing, for instance. Also trying to move
things off of control-key combinations in general where an easy
non-control-key combination exists, for easier typing. Finally, moving
level-specific wizmode commands (like Shoals tide speed or Lab shifting)
onto control-key combinations, since they are less frequently used, to
free up normal keys for other commands in the future.

2 files changed, 29 insertions, 31 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index bcfad0972b..5f426ba495 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -2511,7 +2511,7 @@ int list_wizard_commands(bool do_redraw_screen)
                        "<w>A</w>      set all skills to level\n"
                        "<w>Ctrl-D</w> change enchantments/durations\n"
                        "<w>g</w>      exercise a skill\n"
-                       "<w>Ctrl-L</w> change experience level\n"
+                       "<w>l</w>      change experience level\n"
                        "<w>p</w>      list props\n"
                        "<w>r</w>      change character's species\n"
                        "<w>s</w>      gain 20000 skill points\n"
@@ -2523,14 +2523,14 @@ int list_wizard_commands(bool do_redraw_screen)
                        "<w>^</w>      set piety to a value\n"
                        "<w>@</w>      set Str Int Dex\n"
                        "<w>#</w>      load character from a dump file\n"
-                       "<w>Z</w>      gain lots of Zot Points\n"
+                       "<w>Ctrl-Z</w> gain lots of Zot Points\n"
                        "<w>&</w>      list all divine followers\n"
                        "<w>=</w>      show info about skill points\n"
                        "\n"
                        "<yellow>Create level features</yellow>\n"
                        "<w>L</w>      place a vault by name\n"
                        "<w>T</w>      make a trap\n"
-                       "<w><<</w>/<w>></w>    create up/down staircase\n"
+                       "<w>,</w>/<w>.</w>    create up/down staircase\n"
                        "<w>(</w>      turn cell into feature\n"
                        "<w>\\</w>      make a shop\n"
                        "<w>Ctrl-K</w> mark all vaults as unused\n"
@@ -2538,8 +2538,8 @@ int list_wizard_commands(bool do_redraw_screen)
                        "<yellow>Other level related commands</yellow>\n"
                        "<w>Ctrl-A</w> generate new Abyss area\n"
                        "<w>b</w>      controlled blink\n"
-                       "<w>Ctrl-B</w> controlled teleport\n"
-                       "<w>B</w>      banish yourself to the Abyss\n"
+                       "<w>B</w>      controlled teleport\n"
+                       "<w>Ctrl-B</w> banish yourself to the Abyss\n"
                        "<w>k</w>      shift section of a labyrinth\n"
                        "<w>R</w>      change monster spawn rate\n"
                        "<w>Ctrl-S</w> change Abyss speed\n"
@@ -2550,7 +2550,7 @@ int list_wizard_commands(bool do_redraw_screen)
                        "<w>;</w>      list known levels and counters\n"
                        "<w>{</w>      magic mapping\n"
                        "<w>}</w>      detect all traps on level\n"
-                       "<w>)</w>      change Shoals' tide speed\n"
+                       "<w>Ctrl-W</w> change Shoals' tide speed\n"
                        "<w>Ctrl-E</w> dump level builder information\n"
                        "<w>Ctrl-R</w> regenerate current level\n"
                        "<w>P</w>      create a level based on a vault\n",
@@ -2563,14 +2563,14 @@ int list_wizard_commands(bool do_redraw_screen)
                        "<w>Ctrl-G</w> save/load ghost (bones file)\n"
 #endif
                        "<w>h</w>/<w>H</w>    heal yourself (super-Heal)\n"
-                       "<w>Ctrl-H</w> set hunger state\n"
+                       "<w>e</w>      set hunger state\n"
                        "<w>X</w>      make Xom do something now\n"
                        "<w>z</w>      cast spell by number/name\n"
-                       "<w>Ctrl-M</w> memorise spell\n"
+                       "<w>!</w>      memorise spell\n"
                        "<w>W</w>      god wrath\n"
                        "<w>w</w>      god mollification\n"
                        "<w>Ctrl-P</w> polymorph into a form\n"
-                       "<w>Ctrl-V</w> toggle xray vision\n"
+                       "<w>V</w>      toggle xray vision\n"
                        "\n"
                        "<yellow>Monster related commands</yellow>\n"
                        "<w>D</w>      detect all monsters\n"
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 81cc6b029b..8c18873c42 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -693,13 +693,13 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
         break;
 
     case 'b': blink(1000, true, true); break;
-    case 'B':
+    case 'B': you.teleport(true, true); break;
+    case CONTROL('B'):
         if (!player_in_branch(BRANCH_ABYSS))
             banished("wizard command");
         else
             down_stairs(DNGN_EXIT_ABYSS);
         break;
-    case CONTROL('B'): you.teleport(true, true); break;
 
     case 'c': wizard_draw_card(); break;
     case 'C': wizard_uncurse_item(); break;
@@ -709,7 +709,7 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     case 'D': wizard_detect_creatures(); break;
     case CONTROL('D'): wizard_edit_durations(); break;
 
-    // case 'e': break;
+    case 'e': wizard_set_hunger_state(); break;
     // case 'E': break;
     case CONTROL('E'): debug_dump_levgen(); break;
 
@@ -725,7 +725,7 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
 
     case 'h': wizard_heal(false); break;
     case 'H': wizard_heal(true); break;
-    case CONTROL('H'): wizard_set_hunger_state(); break;
+    // case CONTROL('H'): break;
 
     case 'i': wizard_identify_pack(); break;
     case 'I': wizard_unidentify_pack(); break;
@@ -744,13 +744,13 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     // case 'K': break;
     case CONTROL('K'): wizard_clear_used_vaults(); break;
 
-    // case 'l': break;
+    case 'l': wizard_set_xl(); break;
     case 'L': debug_place_map(false); break;
-    case CONTROL('L'): wizard_set_xl(); break;
+    // case CONTROL('L'): break;
 
     case 'm': wizard_create_spec_monster_name(); break;
     case 'M': wizard_create_spec_monster(); break;
-    case CONTROL('M'): wizard_memorise_spec_spell(); break;
+    // case CONTROL('M'): break; // XXX do not use, menu command
 
     // case 'n': break;
     // case 'N': break;
@@ -784,17 +784,17 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     case 'T': debug_make_trap(); break;
     case CONTROL('T'): debug_terp_dlua(); break;
 
-    case 'u':
-    case 'U': wizard_level_travel(false); break;
+    case 'u': wizard_level_travel(false); break;
+    // case 'U': break;
     case CONTROL('U'): debug_terp_dlua(clua); break;
 
     case 'v': wizard_value_artefact(); break;
-    // case 'V': break;
-    case CONTROL('V'): wizard_toggle_xray_vision(); break;
+    case 'V': wizard_toggle_xray_vision(); break;
+    // case CONTROL('V'): break;
 
     case 'w': wizard_god_mollify(); break;
     case 'W': wizard_god_wrath(); break;
-    // case CONTROL('W'): break;
+    case CONTROL('W'): wizard_mod_tide(); break;
 
     case 'x':
         you.experience = 1 + exp_needed(1 + you.experience_level);
@@ -820,7 +820,7 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     // case CONTROL('Y'): break;
 
     case 'z': wizard_cast_spec_spell(); break;
-    case 'Z':
+    // case 'Z': break;
     case CONTROL('Z'):
         if (crawl_state.game_is_zotdef())
         {
@@ -831,7 +831,7 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
             mpr("But you're not in Zot Defence!");
         break;
 
-    // case '!': break;
+    case '!': wizard_memorise_spec_spell(); break;
     case '@': wizard_set_stats(); break;
     case '#': wizard_load_dump_file(); break;
     case '$': you.add_gold(1000); break;
@@ -840,7 +840,7 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     case '&': wizard_list_companions(); break;
     // case '*': break;
     case '(': wizard_create_feature(); break;
-    case ')': wizard_mod_tide(); break;
+    // case ')': break;
 
     // case '`': break;
     case '~': wizard_interlevel_travel(); break;
@@ -874,11 +874,11 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     case '\'': wizard_list_items(); break;
     case '"': debug_list_monsters(); break;
 
-    // case ',': break;
-    case '>': wizard_place_stairs(true); break;
+    case ',': wizard_place_stairs(true); break;
+    // case '>': break; // XXX do not use, menu command
 
-    // case '.': break;
-    case '<': wizard_place_stairs(false); break;
+    case '.': wizard_place_stairs(false); break;
+    // case '<': break; // XXX do not use, menu command
 
     // case '/': break;
 
@@ -959,14 +959,12 @@ static void _handle_wizard_command()
         case 'm':
         case 'M':
         case 'X':
-        case '!':
-        case '[':
         case ']':
         case '^':
         case '%':
         case 'o':
         case 'z':
-        case 'Z':
+        case CONTROL('Z'):
             break;
 
         default: