From 560898d3d46657020a1e051f0432fb26973c66d4 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Mon, 9 Mar 2015 22:53:43 +0200 Subject: [PATCH] Change command X to twoweapon toggle Explore mode is now an extended command #exploremode. There's no sense that a command used max. once per game, and in normal games not at all, takes up a key. So, analogous to the 'x' command (swap weapons), 'X' now toggles two-weapon combat. --- dat/cmdhelp | 2 +- dat/help | 2 +- dat/hh | 2 +- doc/Guidebook.mn | 7 ++++--- src/cmd.c | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dat/cmdhelp b/dat/cmdhelp index 811c9bdda..d7487750f 100644 --- a/dat/cmdhelp +++ b/dat/cmdhelp @@ -69,7 +69,7 @@ V Show long version and game history w Wield (put in use) a weapon W Wear a piece of armor x Swap wielded and secondary weapons -X Enter explore (discovery) mode (only if defined) +X Toggle two-weapon combat y Go northwest 1 space Y Go northwest until you are on top of something ^Y Go northwest until you are near something diff --git a/dat/help b/dat/help index 7f9ee92ab..07971cec2 100644 --- a/dat/help +++ b/dat/help @@ -147,7 +147,7 @@ Commands: w Wield weapon. w- means wield nothing, use bare hands. W Wear armor. x Swap wielded and secondary weapons. - X Switch the game to explore (discovery) mode. + X Toggle two-weapon combat. ^X Show your attributes. z Zap a wand. (Use y instead of z if number_pad is -1.) Z Cast a spell. (Use Y instead of Z if number_pad is -1.) diff --git a/dat/hh b/dat/hh index 1887547c7..b16b1c91c 100644 --- a/dat/hh +++ b/dat/hh @@ -32,7 +32,6 @@ O options set options \ known display list of what's been discovered v version display version number V history display game history -X explore switch the game to explore (discovery) mode ^A again redo the previous command (^A denotes the keystroke CTRL-A) ^R redraw redraw the screen ^P prevmsg repeat previous message (subsequent ^P's repeat earlier ones) @@ -70,6 +69,7 @@ T takeoff take off some armor w wield wield a weapon (w- wield nothing) W wear put on some armor x xchange swap wielded and secondary weapons +X twoweapon toggle two-weapon combat z zap zap a wand (use y instead of z if number_pad is -1) Z Zap cast a spell (use Y instead of Z if number_pad is -1) < up go up the stairs diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index f04f3b309..86094fe26 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -708,7 +708,8 @@ The latter is used as your secondary weapon when engaging in two-weapon combat. Note that if one of these slots is empty, the exchange still takes place. .lp X -Enter explore (discovery) mode, explained in its own section later. +Toggle two-weapon combat, if your character can do it. Also available +via the ``#twoweapon'' extended command .lp "" Since using this command by accident would be troublesome, you are asked to confirm your intent before switching to explore mode. By default @@ -2980,8 +2981,8 @@ with the .op -X command-line switch or with the .op playmode:explore -option. The other is to issue the `X' command while already -playing the game. Starting a new game in explore mode provides your +option. The other is to issue the ``#exploremode'' extended command while +already playing the game. Starting a new game in explore mode provides your character with a wand of wishing in initial inventory; switching via `X' during play does not. The other benefits of explore mode are left for the trepid reader to discover. diff --git a/src/cmd.c b/src/cmd.c index f7e858e01..5d9bcfc27 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -2411,7 +2411,7 @@ static const struct func_tab cmdlist[] = { {'W', FALSE, dowear}, {M('w'), FALSE, dowipe}, {'x', FALSE, doswapweapon}, - {'X', TRUE, enter_explore_mode}, + {'X', FALSE, dotwoweapon}, /* 'y', 'Y' : go nw */ {'z', FALSE, dozap}, {'Z', TRUE, docast}, @@ -2456,6 +2456,7 @@ struct ext_func_tab extcmdlist[] = { {"dip", "dip an object into something", dodip, FALSE}, {"enhance", "advance or check weapon and spell skills", enhance_weapon_skill, TRUE}, + {"exploremode", "enter explore mode", enter_explore_mode, TRUE}, {"force", "force a lock", doforce, FALSE}, {"invoke", "invoke an object's powers", doinvoke, TRUE}, {"jump", "jump to a location", dojump, FALSE}, -- 2.40.0