From 369f7452f8dc5b3667055ece417638dbf7feec77 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 14 Aug 2014 22:26:34 -0400 Subject: 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. --- crawl-ref/source/command.cc | 18 +++++++++--------- crawl-ref/source/main.cc | 42 ++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 31 deletions(-) (limited to 'crawl-ref') 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) "A set all skills to level\n" "Ctrl-D change enchantments/durations\n" "g exercise a skill\n" - "Ctrl-L change experience level\n" + "l change experience level\n" "p list props\n" "r change character's species\n" "s gain 20000 skill points\n" @@ -2523,14 +2523,14 @@ int list_wizard_commands(bool do_redraw_screen) "^ set piety to a value\n" "@ set Str Int Dex\n" "# load character from a dump file\n" - "Z gain lots of Zot Points\n" + "Ctrl-Z gain lots of Zot Points\n" "& list all divine followers\n" "= show info about skill points\n" "\n" "Create level features\n" "L place a vault by name\n" "T make a trap\n" - "<</> create up/down staircase\n" + ",/. create up/down staircase\n" "( turn cell into feature\n" "\\ make a shop\n" "Ctrl-K mark all vaults as unused\n" @@ -2538,8 +2538,8 @@ int list_wizard_commands(bool do_redraw_screen) "Other level related commands\n" "Ctrl-A generate new Abyss area\n" "b controlled blink\n" - "Ctrl-B controlled teleport\n" - "B banish yourself to the Abyss\n" + "B controlled teleport\n" + "Ctrl-B banish yourself to the Abyss\n" "k shift section of a labyrinth\n" "R change monster spawn rate\n" "Ctrl-S change Abyss speed\n" @@ -2550,7 +2550,7 @@ int list_wizard_commands(bool do_redraw_screen) "; list known levels and counters\n" "{ magic mapping\n" "} detect all traps on level\n" - ") change Shoals' tide speed\n" + "Ctrl-W change Shoals' tide speed\n" "Ctrl-E dump level builder information\n" "Ctrl-R regenerate current level\n" "P create a level based on a vault\n", @@ -2563,14 +2563,14 @@ int list_wizard_commands(bool do_redraw_screen) "Ctrl-G save/load ghost (bones file)\n" #endif "h/H heal yourself (super-Heal)\n" - "Ctrl-H set hunger state\n" + "e set hunger state\n" "X make Xom do something now\n" "z cast spell by number/name\n" - "Ctrl-M memorise spell\n" + "! memorise spell\n" "W god wrath\n" "w god mollification\n" "Ctrl-P polymorph into a form\n" - "Ctrl-V toggle xray vision\n" + "V toggle xray vision\n" "\n" "Monster related commands\n" "D 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: -- cgit v1.2.3-54-g00ecf