From f278a501a1598647a72dae0a086d8c7221e34727 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Sun, 26 Nov 2006 13:20:24 +0000 Subject: Updated keyboard help (David) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@493 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/command.cc | 221 +++++++++++++++++++++++++++++--------------- 1 file changed, 149 insertions(+), 72 deletions(-) (limited to 'crawl-ref/source/command.cc') diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index aaa8b458d9..33246fec39 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -607,8 +607,8 @@ static const char *level_map_help = "Esc : leave level map (also Space)\n" "Dir.: move cursor\n" "/ Dir., Shift-Dir.: move cursor far\n" - "+/- : scroll level map up/down\n" - ". : travel (also Enter and , and ;)\n" + "-/+ : scroll level map up/down\n" + ". : travel (also Enter and , and ;)\n" " (moves cursor to last travel\n" " destination if still on @)\n" "<</> : cycle through up/down stairs\n" @@ -616,12 +616,27 @@ static const char *level_map_help = "Tab : cycle through shops and portals\n" "X : cycle through travel eXclusions\n" "W : cycle through waypoints\n" - "I : cycle through stashes\n" + "* : cycle forward through stashes\n" + "/ : cycle backward through stashes\n" "Ctrl-X : set travel eXclusion\n" "Ctrl-E : Erase all travel exclusions\n" "Ctrl-W : set Waypoint\n" "Ctrl-C : Clear level and main maps\n"; +static const char *targeting_help = + "Targeting (like zapping wands/spells):\n" + "Esc : stop targeting\n" + "Dir. : shoots straight in that direction\n" + "p : fires at Previous target (also t)\n" + "+ : cycle monsters forward (also =)\n" + "- : cycle monsters backward\n" + ". : fires at target (also Enter or Del)\n" + "> : fires at target and stops there\n" + "Ctrl-F : toggles cycle mode\n" + "* : enter manual targeting (where Dir.\n" + " moves the cursor and . etc. fire)\n" + "? : describes monster under cursor\n"; + static void show_keyhelp_menu(const std::vector &lines) { Menu cmd_help; @@ -690,8 +705,8 @@ void list_commands(bool wizard) "or vi keys:\n" " 1 2 3 y k u\n" " \\|/ \\|/\n" - " 4-5-6" - " h-.-l\n" + " 4-5-6" + " h-.-l\n" " /|\\ /|\\\n" " 7 8 9 b j n\n", true, true, cmdhelp_textfilter); @@ -699,37 +714,38 @@ void list_commands(bool wizard) cols.add_formatted( 0, "Rest/Search:\n" - "5 (numpad), ., s, Del: " - "rest one turn and\n" - " search adjacent squares.\n" - "Shift-5 (numpad), 5: rest until HP/MP are\n" - "full or something found or 100 turns over\n", + "s : rest one turn and search adjacent\n" + " squares (also numpad-5, ., Del)\n" + "5 : fully rest HP/MP or search; stop after \n" + " 100 turns (also Shift-numpad-5)\n", true, true, cmdhelp_textfilter); cols.add_formatted( 0, - "Dungeon Interaction and Information:\n" - "o/c : Open/Close door\n" - "<</> : use staircase (<< also enters shop)\n" - "; : examine occupied tile\n" - "x : eXamine surroundings/targets\n" - "X : eXamine level map\n" - "O : show dungeon Overview\n", + "Extended Movement:\n" + "/ Dir., Shift-Dir.: long walk\n" + "* Dir., Ctrl-Dir. : untrap, attack\n" + " without move, open door\n" + "Ctrl-G : interlevel travel\n" + "Ctrl-O : auto-explore\n" + "Ctrl-W : set Waypoint\n" + "Ctrl-F : Find items\n", true, true, cmdhelp_textfilter); cols.add_formatted( 0, "Item Interaction (inventory):\n" + "i : show Inventory list\n" "v : View item description\n" "{ : inscribe item\n" "t : Throw/shoot an item\n" "f : Fire first available missile\n" - "q : Quaff a potion\n" "e : Eat food (but tries floor first)\n" + "q : Quaff a potion\n" "z : Zap a wand\n" "r : Read a scroll or book\n" "M : Memorise a spell from a book\n" - "w : Wield an item ( - for none)\n" + "w : Wield an item ( - for none)\n" "' : wield item a, or switch to b\n" "E : Evoke power of wielded item\n" "W : Wear armour\n" @@ -738,21 +754,14 @@ void list_commands(bool wizard) "R : Remove jewellery\n", true, true, cmdhelp_textfilter); - cols.add_formatted( - 0, - "Other Gameplay Actions:\n" - "a : use special Ability\n" - "p : Pray\n" - "Z : cast a spell\n" - "! : shout or command allies\n", - true, true, cmdhelp_textfilter); - cols.add_formatted( 0, "In-game Toggles:\n" "Ctrl-A : toggle Autopickup\n" "Ctrl-V : toggle auto-prayer\n" - "Ctrl-T : toggle spell fizzle check\n", +// "Ctrl-T : toggle spell fizzle check\n" + " \n" + " \n", true, true, cmdhelp_textfilter); cols.add_formatted( @@ -761,16 +770,39 @@ void list_commands(bool wizard) true, true, cmdhelp_textfilter); cols.add_formatted( - 1, - "Extended Movement:\n" - "Ctrl-G : interlevel travel\n" - "Ctrl-O : auto-explore\n" - "Ctrl-W : set Waypoint\n" - "/ Dir., Shift-Dir.: long walk\n" - "* Dir., Ctrl-Dir. : untrap, attack\n" - " without move, open door\n", - true, true, cmdhelp_textfilter, 45); + 0, +// "\p" + // I want a page break here, but perhaps there are + // less violent ways to enforce it. + " \n \n \n \n" + "Item types (and common commands)\n" + ") : hand weapons (wield)\n" + "( : missiles (throw or fire)\n" + "[ : armour (Wear and Take off)\n" + "% : food and corpses (e and Dissect)\n" + "? : scrolls (read)\n" + "! : potions (quaff)\n" + "= : rings (Put on and Remove)\n" + "\" : amulets (Put on and Remove)\n" + "/ : wands (zap)\n" + "+ : books (read, Memorise and Zap)\n" + "\\ : staves and rods (wield and Evoke)\n" + "{ : miscellaneous items (Evoke)\n" + "0 : the Orb of Zot\n" + "\n" + "$ : gold\n" + " \n", + true, true, cmdhelp_textfilter); + cols.add_formatted( + 0, + "Stash Management Commands:\n" + "Ctrl-F : Find (in stashes and shops)\n" + "\n" + "Searching in stashes allows regular\n" + "expressions, and terms like 'altar'\n" + "or 'artifact' or 'long blades'.\n", + true, true, cmdhelp_textfilter); cols.add_formatted( 1, @@ -785,15 +817,26 @@ void list_commands(bool wizard) "Player Character Information:\n" "@ : display character status\n" "[ : display worn armour\n" + "( : display current weapons (also ))\n" "\" : display worn jewellery\n" "C : display experience info\n" "^ : show religion screen\n" "A : show Abilities/mutations\n" "\\ : show item knowledge\n" "m : show skill screen\n" - "i : show Inventory list\n" "% : show resistances\n", - true, true, cmdhelp_textfilter, 45); + true, true, cmdhelp_textfilter,45); + + cols.add_formatted( + 1, + "Dungeon Interaction and Information:\n" + "o/c : Open/Close door\n" + "<</> : use staircase (<< enter shop)\n" + "; : examine occupied tile\n" + "x : eXamine surroundings/targets\n" + "X : eXamine level map\n" + "O : show dungeon Overview\n", + true, true, cmdhelp_textfilter,45); cols.add_formatted( 1, @@ -803,13 +846,22 @@ void list_commands(bool wizard) "d : Drop an item\n" "d#: Drop exact number of items \n" "D : Dissect a corpse \n" - "e : Eat food from floor \n" - "z : Zap a wand \n" - "r : Read a scroll or book \n" - "M : Memorise a spell from a book \n" - "w : Wield an item ( - for none) \n" - "' : wield item a, or switch to b \n" - "E : Evoke power of wielded item\n", + "e : Eat food from floor \n", +// "z : Zap a wand \n" +// "r : Read a scroll or book \n" +// "M : Memorise a spell from a book \n" +// "w : Wield an item ( - for none) \n" +// "' : wield item a, or switch to b \n" +// "E : Evoke power of wielded item\n", + true, true, cmdhelp_textfilter); + + cols.add_formatted( + 1, + "Other Gameplay Actions:\n" + "a : use special Ability\n" + "p : Pray\n" + "Z : cast a spell\n" + "! : shout or command allies\n", true, true, cmdhelp_textfilter); cols.add_formatted( @@ -821,45 +873,70 @@ void list_commands(bool wizard) "Ctrl-C : Clear main and level maps\n" "# : dump character to file\n" ": : add note to dump file\n" - "` : add macro\n" - "~ : save macros\n" - "= : reassign inventory/spell letters\n", + "~ : add macro\n" +// "~ : save macros\n" + "= : reassign inventory/spell letters\n" + " \n", true, true, cmdhelp_textfilter); - cols.add_formatted( - 1, - "Stash Management Commands:\n" - "Ctrl-S : mark Stash\n" - "Ctrl-E : Erase stash (ignore square)\n" - "Ctrl-F : Find (in stashes and shops)\n", - true, true, cmdhelp_textfilter); +// cols.add_formatted( +// 1, +// "Stash Management Commands:\n" +// "Ctrl-S : mark Stash\n" +// "Ctrl-E : Erase stash (ignore square)\n" +// "Ctrl-F : Find (in stashes and shops)\n", +// true, true, cmdhelp_textfilter); cols.add_formatted( 1, - "Targeting, Surroundings ('x' in main):\n" - " x : stop targeting (also Esc and Space)\n" - " + : cycle monsters forward\n" + "Examine Surroundings ('x' in main):\n" + " x : back to map (also Esc and Space)\n" + " + : cycle monsters forward (also =)\n" " - : cycle monsters backward\n" - " * : cycle objects forward (also ')\n" - " / : cycle objects backward (also ;)\n" - " . : choose target/move (also Enter)\n" + " * : cycle objects forward (also ')\n" + " / : cycle objects backward (also ;)\n" + " . : travel to cursor (also Enter)\n" " ? : describe monster under cursor\n" - "<</> : cycle through up/down stairs\n", + "<</> : cycle through up/down stairs\n" + "Tab : cycle dungeon features\n", true, true, cmdhelp_textfilter); cols.add_formatted( + 1, + targeting_help, + true, true, cmdhelp_textfilter); + + cols.add_formatted( 1, "Shortcuts in Lists (like multidrop):\n" - "(/) : selects all missiles/hand weapons\n" - "%/& : selects all food/carrion\n" - "+/? : selects all books/scrolls\n" - "//\\ : selects all wands/staves\n" - "!/\" : selects all potions/jewellry\n" - "[/} : selects all armour/misc. items\n" - ",/- : global select/deselect\n" - "* : invert selection\n", + ") : selects hand weapons\n" + "( : selects missiles\n" + "[ : selects armour\n" + "% : selects food, & : selects carrion\n" + "? : selects scrolls\n" + "! : selects potions\n" + "= : selects rings\n" + "\" : selects amulets\n" + "/ : selects wands\n" + "+ : selects books\n" + "\\ : selects staves\n" + "{ : selects miscellaneous items\n" + "Carry the Orb to the surface and win!\n" + ", : global selection\n" + "- : global deselection\n" + "* : invert selection\n", true, true, cmdhelp_textfilter); + cols.add_formatted( + 1, + " \n" + "Crawl usually considers every item it\n" + "sees as a stash. When using a value\n" + "different from stash_tracking = all, you\n" + "can use Ctrl-S to manually declare\n" + "stashes, and Ctrl-E to erase them.\n", + true, true, cmdhelp_textfilter); + show_keyhelp_menu(cols.formatted_lines()); } -- cgit v1.2.3-54-g00ecf