diff options
| author | troido <troido@protonmail.com> | 2020-09-29 10:12:23 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-09-29 10:12:23 +0200 |
| commit | c899971bd4d3071d9f5ccdbcc928f95369a03937 (patch) | |
| tree | 65aba562298ff182fb3fc2fbf886e19aa26bb077 | |
| parent | f05b2f8560df7d79465f12714edd2f4e17109215 (diff) | |
when ground is not selected just take whatever
| -rw-r--r-- | asciifarmclient/commandhandler.py | 7 | ||||
| -rw-r--r-- | keybindings/default.json | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/asciifarmclient/commandhandler.py b/asciifarmclient/commandhandler.py index f4c1de1..59b8a2c 100644 --- a/asciifarmclient/commandhandler.py +++ b/asciifarmclient/commandhandler.py @@ -123,12 +123,11 @@ class CommandHandler: def takeSelected(self): menu = self.client.display.getSelectedMenu() - selected = self.client.display.getSelectedItem(menu) if menu == "ground": - action = "take" + selected = self.client.display.getSelectedItem(menu) else: - return - self.input([action, selected]) + selected = None + self.input(["take", selected]) def eval(self, text): self.log(eval(text, self.evalArgs)) diff --git a/keybindings/default.json b/keybindings/default.json index 94ab8ba..e3a1f53 100644 --- a/keybindings/default.json +++ b/keybindings/default.json @@ -12,9 +12,8 @@ "j": ["move", "south"], "l": ["move", "east"], "h": ["move", "west"], -"e": ["input", ["take", null]], +"e": ["take"], "q": ["drop"], -"Q": ["take"], "E": ["use"], "R": ["input", ["interact", ["none"]]], "r": ["input", ["interact", ["none", "north", "south", "east", "west"]]], |