diff options
| -rw-r--r-- | crawl-ref/docs/034_changes.txt | 38 | ||||
| -rw-r--r-- | crawl-ref/docs/crawl_manual.txt | 16 | ||||
| -rw-r--r-- | crawl-ref/source/command.cc | 11 |
3 files changed, 35 insertions, 30 deletions
diff --git a/crawl-ref/docs/034_changes.txt b/crawl-ref/docs/034_changes.txt index 6ed359420d..c30f42396c 100644 --- a/crawl-ref/docs/034_changes.txt +++ b/crawl-ref/docs/034_changes.txt @@ -1,33 +1,37 @@ Information for players of versions 0.3.4 or earlier ---------------------------------------------------- -There have been many changes to the interface in the new version. Among -them: +There have been many changes to the interface in the new version, +mostly in 0.4, some more in 0.5. Among them: * Swapped some command keys around: - z cast spell (was Z) - Z zap wand (was z) - o auto-explore (was Ctrl-O) - Ctrl-O dungeon overview (was O) - O open door (was o) - C close door (was c) - c chop up (was D, dissect) - E show experience (was C) - v evoke (was E) - f, F fire/throw (was t) - t tell/yell (was !) - Ctrl-V Tiles settings (was Ctrl-Q) - Ctrl-Q quit (was Q) + z cast spell (was Z) + Z zap wand (was z) + o auto-explore (was Ctrl-O) + Ctrl-O dungeon overview (was O) + O open door (was o) + C close door (was c) + c chop up (was D, dissect) + E show experience (was C) + v evoke (was E) + f, F fire/throw (was t) + t tell/yell (was !) + Ctrl-V Tiles settings (was Ctrl-Q) + Ctrl-Q quit (was Q) + +* Changed the commands for travel exclusions in the level map: + e set exclusion (was Ctrl-X) + E cycle exclusions (was x) * Added some new commands: ! annotate dungeon level (If your annotation contains '!' you'll be prompted whenever you attempt to enter the level.) - ( cycle the quiver to the next appropriate item + (, ) cycle the quiver to the next/previous appropriate item Q quiver an item for firing ` repeat previous command 0 repeat next command # of times - V verbose list of monsters in sight + V verbose list of monsters and items in sight Ctrl-D define macros (synonym to '~') Ctrl-T change your allies' pickup behaviour (only available to some characters) diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt index 40aa2ad7eb..eb349a58b6 100644 --- a/crawl-ref/docs/crawl_manual.txt +++ b/crawl-ref/docs/crawl_manual.txt @@ -709,10 +709,10 @@ throw with 'i'; but it may not be very effective if you lack the correct launcher. At times it is sensible to throw weapons like spears, daggers, or hand axes. -Use the '(' or 'Q' command if you want to change your quiver without -firing. If you'd like to throw something without inserting it into the -quiver use 'F' instead. Note that non-weapon, non-missile items will -never be quivered. +Use the '(', ')' to cycle through your quiver without firing, and 'Q' +to choose the quivered item. If you'd like to throw something without +inserting it into the quiver use 'F' instead. Note that non-weapon, +non-missile items will never be quivered. The interface for shooting or throwing things is also used for zapping wands and casting certain spells, and is described in detail in @@ -2326,7 +2326,7 @@ Character information: 'show' means usage of the whole screen. @ Display character status. [ Display worn armour. - ) Display wielded and secondary weapons, + } Display wielded and secondary weapons, and missiles (to be shot with the 'f' command). " Display worn jewellery. E Display experience info. @@ -2338,7 +2338,7 @@ Character information: i Show inventory list. Inside this list, pressing a slot key shows information on that item. ] Shows a restricted inventory, only containing - worn and wielded items. + worn, wielded and quivered items. I Show list of memorised spells. V Lists all monsters and items in sight. % Show resistances and general character overview, @@ -2346,7 +2346,7 @@ Character information: mutations, abilities (the latter three more terse than with the command @, A, a). This is a highly condensed conglomeration of the commands - [, (, ", C, ^, @, A, a on a single screen. + [, ", C, ^, @, A, a on a single screen. Pressing the key of a displayed item views it. Item interaction (inventory): @@ -2361,7 +2361,7 @@ Item interaction (inventory): Pressing f again shoots. F Directly choose an item and fire. Contrary to fi this does not change the quiver. - ( Cycle quiver to next suitable missile. + (, ) Cycle quiver to next/previous suitable missile. Q Quiver item from a menu. q Quaff a potion. e Eat food (tries floor first, inventory next). diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index fc82b6801e..4da934aadb 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -2034,7 +2034,7 @@ static void _add_formatted_keyhelp(column_composer &cols) 0, "<h>Extended Movement:\n" "<w>o</w> : auto-explore\n" - "<w>Ctrl-G</w> : interlevel travel (also <w>G</w>)\n" + "<w>G</w> : interlevel travel (also <w>Ctrl-G</w>)\n" "<w>Ctrl-F</w> : Find items\n" "<w>Ctrl-W</w> : set Waypoint\n" "<w>Ctrl-E</w> : Exclude square from searches\n" @@ -2049,7 +2049,7 @@ static void _add_formatted_keyhelp(column_composer &cols) std::string item_types = "<h>Item types (and common commands)\n" "<cyan>)</cyan> : hand weapons (<w>w</w>ield)\n" - "<brown>(</brown> : missiles (<w>Q</w>uiver, <w>f</w>ire, <w>(</w> cycle)\n" + "<brown>(</brown> : missiles (<w>Q</w>uiver, <w>f</w>ire, <w>()</w> cycle)\n" "<cyan>[</cyan> : armour (<w>W</w>ear and <w>T</w>ake off)\n" "<brown>%</brown> : corpses and food (<w>c</w>hop up and <w>e</w>at)\n" "<w>?</w> : scrolls (<w>r</w>ead)\n" @@ -2119,7 +2119,7 @@ static void _add_formatted_keyhelp(column_composer &cols) "<w>A</w> : show Abilities/mutations\n" "<w>\\</w> : show item knowledge\n" "<w>[</w> : display worn armour\n" - "<w>)</w> : display current weapons\n" + "<w>}</w> : display current weapons\n" "<w>\"</w> : display worn jewellery\n" "<w>$</w> : display gold in possession\n" "<w>E</w> : display experience info\n", @@ -2146,7 +2146,8 @@ static void _add_formatted_keyhelp(column_composer &cols) "<w>{</w> : inscribe item\n" "<w>f</w> : Fire next appropriate item\n" "<w>F</w> : select an item and Fire it\n" - "<w>(</w> : cycle current ammunition\n" + "<w>Q</w> : select item slot to be quivered\n" + "<w>(</w>, <w>)</w> : cycle current ammunition\n" "<w>e</w> : "; interact += (you.species == SP_VAMPIRE ? "Drain corpses" : "Eat food"); @@ -2203,7 +2204,7 @@ static void _add_formatted_tutorial_help(column_composer &cols) text << "<h>Item types (and common commands)\n" "<cyan>)</cyan> : hand weapons (<w>w</w>ield)\n" - "<brown>(</brown> : missiles (<w>Q</w>uiver, <w>f</w>ire, <w>(</w> to cycle ammo)\n" + "<brown>(</brown> : missiles (<w>Q</w>uiver, <w>f</w>ire, <w>()</w> to cycle ammo)\n" "<cyan>[</cyan> : armour (<w>W</w>ear and <w>T</w>ake off)\n" "<brown>%</brown> : corpses and food (<w>c</w>hop up and <w>e</w>at)\n" "<w>?</w> : scrolls (<w>r</w>ead)\n" |