diff options
Diffstat (limited to 'asciifarm')
| -rw-r--r-- | asciifarm/client/keymacros.hy | 2 | ||||
| -rw-r--r-- | asciifarm/keybindings/keybindings.hy | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/asciifarm/client/keymacros.hy b/asciifarm/client/keymacros.hy index 8b9952e..b7ff113 100644 --- a/asciifarm/client/keymacros.hy +++ b/asciifarm/client/keymacros.hy @@ -2,7 +2,7 @@ (defmacro send [data] `(fn [client] (client.send ~data))) -(defmacro input [action] +(defmacro inp [action] `(send ["input" ~action])) (defmacro doall [actions] diff --git a/asciifarm/keybindings/keybindings.hy b/asciifarm/keybindings/keybindings.hy index e6dac86..f5b33cc 100644 --- a/asciifarm/keybindings/keybindings.hy +++ b/asciifarm/keybindings/keybindings.hy @@ -1,26 +1,26 @@ -"w" (input ["move" "north"]) -"s" (input ["move" "south"]) -"d" (input ["move" "east"]) -"a" (input ["move" "west"]) -"KEY_UP" (input ["move" "north"]) -"KEY_DOWN" (input ["move" "south"]) -"KEY_RIGHT" (input ["move" "east"]) -"KEY_LEFT" (input ["move" "west"]) -"e" (input ["take" (selectorvalue "ground")]) -"q" (input ["drop" (selectorvalue "inventory")]) -"E" (input ["use" (selectorvalue "inventory")]) -"r" (input ["interact" (selectorvalue "ground")]) +"w" (inp ["move" "north"]) +"s" (inp ["move" "south"]) +"d" (inp ["move" "east"]) +"a" (inp ["move" "west"]) +"KEY_UP" (inp ["move" "north"]) +"KEY_DOWN" (inp ["move" "south"]) +"KEY_RIGHT" (inp ["move" "east"]) +"KEY_LEFT" (inp ["move" "west"]) +"e" (inp ["take" (selectorvalue "ground")]) +"q" (inp ["drop" (selectorvalue "inventory")]) +"E" (inp ["use" (selectorvalue "inventory")]) +"r" (inp ["interact" (selectorvalue "ground")]) "v" (fn [client] (.select (selector "inventory") 1 True True)) "c" (fn [client] (.select (selector "ground") 1 True True)) "x" (fn [client] (.select (selector "equipment") 1 True True)) -"z" (input ["unequip" (selectorvalue "equipment")]) +"z" (inp ["unequip" (selectorvalue "equipment")]) "f" (doall [ - (input ["attack"]) - (input ["attack" "north"]) - (input ["attack" "south"]) - (input ["attack" "east"]) - (input ["attack" "west"])]) + (inp ["attack"]) + (inp ["attack" "north"]) + (inp ["attack" "south"]) + (inp ["attack" "east"]) + (inp ["attack" "west"])]) "t" (fn [client] (client.readString)) "help" "\ Controls: |