Made simalq.keyboard a little friendlier-looking for editing.

Author: Kodiologist

simalq/commands.hy

@@ -77,12 +77,12 @@
 
 
 (defn get-command [key]
-  (import simalq.keyboard [read-dir-key cmd-keys])
+  (import simalq.keyboard [read-dir-key command-keys])
   (when (setx v (read-dir-key key))
     (return (if (= v 'center)
       (Wait)
       (Walk v))))
-  (when (setx v (.get cmd-keys (str key)))
+  (when (setx v (.get command-keys (str key)))
     (return (if (isinstance v list)
       ((get v 0) #* (cut v 1 None))
       (v))))
@@ -336,7 +336,7 @@
 
 (defn help-text []
   (setv controls (.join "\n" (lfor
-    [k cmd] (.items hy.I.simalq/keyboard.cmd-keys)
+    [k cmd] (.items hy.I.simalq/keyboard.command-keys)
     :setv [cmd arg] (if (isinstance cmd list) cmd [cmd None])
     (+ k " - " (.format
       (re.sub r"\s+" " " cmd.__doc__)

simalq/keyboard.hy

@@ -2,33 +2,34 @@
 
 
 (import
-  simalq.geometry [Direction]
+  simalq.geometry [Direction :as D]
   simalq.commands *)
 
 
-(defn read-dir-key [key]
-  (.get _dir-keys (str key) (.get _dir-keys key.name)))
-(setv _dir-keys (dfor
-  :setv D Direction
-  [k v] (partition 2 [
-    ["7" "y" "HOME"] D.NW  ["8" "k" "UP"]     D.N      ["9" "u" "PGUP"]   D.NE
-    ["4" "h" "LEFT"] D.W   ["5" "." "ESCAPE"] 'center  ["6" "l" "RIGHT"]  D.E
-    ["1" "b" "END"]  D.SW  ["2" "j" "DOWN"]   D.S      ["3" "n" "PGDOWN"] D.SE])
-  s k
-  (if (> (len s) 1) (+ "KEY_" s) s) v))
-
-
-(setv cmd-keys {
+(setv direction-keys {
+  "7/y/HOME" D.NW  "8/k/UP"     D.N      "9/u/PGUP"   D.NE
+  "4/h/LEFT" D.W   "5/./ESCAPE" 'center  "6/l/RIGHT"  D.E
+  "1/b/END"  D.SW  "2/j/DOWN"   D.S      "3/n/PGDOWN" D.SE})
+(setv command-keys {
   "?" Help
   "!" Quit
   "S" [SaveGame 'main]
   "C" [SaveGame 'checkpoint]
   "L" LoadGame
   "e" [ShiftHistory  -1]  ; Undo
-  "E" [ShiftHistory -10]
+  "E" [ShiftHistory -10]  ; Undo several times
   "r" [ShiftHistory  +1]  ; Redo
-  "R" [ShiftHistory +10]
+  "R" [ShiftHistory +10]  ; Redo several times
   ";" Look
   "f" GonnaShoot
   "i" Inventory
   "a" GonnaUseItem})
+
+
+(setv direction-keys (dfor
+  :setv D Direction
+  [k v] (.items direction-keys)
+  s (.split k "/")
+  (if (> (len s) 1) (+ "KEY_" s) s) v))
+(defn read-dir-key [key]
+  (.get direction-keys (str key) (.get direction-keys key.name)))