controls are now separate objects

1 files changed, 9 insertions, 9 deletions

diff --git a/asciifarm/keybindings/default.json b/asciifarm/keybindings/default.json
index 3fe413f..faf1b40 100644
--- a/asciifarm/keybindings/default.json
+++ b/asciifarm/keybindings/default.json
@@ -12,11 +12,11 @@
 "j": ["move", "south"],
 "l": ["move", "east"],
 "h": ["move", "west"],
-"e": ["input", ["take"]],
-"q": ["unuse"],
+"e": ["input", ["take", null]],
+"q": ["drop"],
 "Q": ["take"],
 "E": ["use"],
-"R": ["input", ["interact"]],
+"R": ["input", ["interact", [null]]],
 "r": ["input", ["interact", [null, "north", "south", "east", "west"]]],
 "x": ["selectitem", -1, true, true],
 "c": ["selectitem", 1, true, true],
@@ -27,16 +27,16 @@
 "/": ["selectwidget", -1, true, true],
 "*": ["selectwidget", 1, true, true],
 "f": ["input", ["attack", [null, "north", "south", "east", "west"]]],
-"F": ["input", ["attack"]],
-"W": ["input", ["attack", "north"]],
-"S": ["input", ["attack", "south"]],
-"D": ["input", ["attack", "east"]],
-"A": ["input", ["attack", "west"]],
+"F": ["input", ["attack", [null]]],
+"W": ["input", ["attack", ["north"]]],
+"S": ["input", ["attack", ["south"]]],
+"D": ["input", ["attack", ["east"]]],
+"A": ["input", ["attack", ["west"]]],
 "t": ["runinput"],
 "enter": ["runinput"],
 "pageup": ["scrollchat", 1],
 "pagedown": ["scrollchat", -1],
 "/": ["runinput", "/"]
 },
-"help": " Controls:\nwasd or arrows: Move around\ne: Grab\nq: Drop/unequip selected\nr: Interact\nf: Attack\nt: Chat\nE: Use selected\nxc: select item\nvb: select menu\nctrl-c: close client\nPgUp/PgDn: scroll chat"
+"help": " Controls:\nwasd or arrows: Move around\ne: Grab\nq: Drop selected\nr: Interact\nf: Attack\nt: Chat\nE: Use selected\nxc: select item\nvb: select menu\nctrl-c: close client\nPgUp/PgDn: scroll chat"
 }