Do "keypress -> command_type" via keybindings. Solves bug 2018200,

where you couldn't do macros with the old 3.4 keymap since the 3.4 keys
were done via macros and macros can't recursively invoke macros.
Has the little snag that it doesn't exactly reproduce the 3.4 "fire ammo"
command since 3.4 automatically goes to the inventory list but 4.0
doesn't.

TODO:
* Get levelmap commands to use keybindings instead of hardcoded
  mappings.
* Let function keys and alt keys be bound to commands.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6587 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 18 insertions, 52 deletions

diff --git a/crawl-ref/settings/034_command_keys.txt b/crawl-ref/settings/034_command_keys.txt
index 5cbc347da3..d80c7027f5 100644
--- a/crawl-ref/settings/034_command_keys.txt
+++ b/crawl-ref/settings/034_command_keys.txt
@@ -1,56 +1,22 @@
-# This file contains macros for using 0.3.4 command keys instead of the 
+# This file keybinds for using 0.3.4 command keys instead of the 
 # new set from 0.4.
 
 # If you want to use it, add the following line to your init.txt:
-# : crawl.read_options('docs/034_command_keys.txt')
+# include = 034_keybindings.txt
 
 # Note that the 'v'iew item command is not available anymore. You can
-# get the same functionality by pressing the item slot in the inventor.
-
-# annotate level (Ctrl-I)
-M:\{9}
-A:!
-
-# auto-explore (Ctrl-O)
-M:\{15}
-A:o
-
-# shout/tell allies
-M:!
-A:t
-
-# experience information
-M:C
-A:E
-
-# evoke
-M:E
-A:v
-
-# dungeon overview
-M:O
-A:\{15}
-
-# cast spell
-M:Z
-A:z
-
-# close door
-M:c
-A:C
-
-# open door
-M:o
-A:O
-
-# throw
-M:t
-A:fi
-
-# zap wand
-M:z
-A:Z
-
-# butcher
-M:D
-A:c
+# get the same functionality by pressing the item slot while looking at
+# you inventory.
+
+bindkey = [^I] CMD_ANNOTATE_LEVEL
+bindkey = [^O] CMD_EXPLORE
+bindkey = [!]  CMD_SHOUT
+bindkey = [C]  CMD_EXPERIENCE_CHECK
+bindkey = [E]  CMD_EVOKE
+bindkey = [O]  CMD_DISPLAY_OVERMAP
+bindkey = [Z]  CMD_CAST_SPELL
+bindkey = [z]  CMD_ZAP_WAND
+bindkey = [c]  CMD_CLOSE_DOOR
+bindkey = [o]  CMD_OPEN_DOOR
+bindkey = [D]  CMD_BUTCHER
+bindkey = [t]  CMD_FIRE
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 3b9e37c593..cf1924e631 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -10,7 +10,7 @@
 # (New players should just ignore these lines.)
 #
 # include                 = 034_monster_glyphs.txt
-# additional_macro_file   = 034_command_keys.txt
+# inlcude                 = 034_command_keys.txt
 # classic_item_colours    = true
 # classic_hud             = true
 # use_old_selection_order = true