From 44c26befaab94781e35d159db82d875bff2ed31e Mon Sep 17 00:00:00 2001
From: troido <troido@hotmail.com>
Date: Tue, 2 Jan 2018 21:26:46 +0100
Subject: keybindings are now executed a bit smarter as hy code

---
 asciifarm/keybindings/keybindings.hy | 12 ++++++------
 asciifarm/keybindings/vimbindings.hy |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'asciifarm/keybindings')

diff --git a/asciifarm/keybindings/keybindings.hy b/asciifarm/keybindings/keybindings.hy
index f5b33cc..a54b79a 100644
--- a/asciifarm/keybindings/keybindings.hy
+++ b/asciifarm/keybindings/keybindings.hy
@@ -1,4 +1,4 @@
-
+{
 "w" (inp ["move" "north"])
 "s" (inp ["move" "south"])
 "d" (inp ["move" "east"])
@@ -11,9 +11,9 @@
 "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))
+"v" (.select (selector "inventory") 1 True True)
+"c" (.select (selector "ground") 1 True True)
+"x" (.select (selector "equipment") 1 True True)
 "z" (inp ["unequip" (selectorvalue "equipment")])
 "f" (doall [
     (inp ["attack"])
@@ -21,7 +21,7 @@
     (inp ["attack" "south"])
     (inp ["attack" "east"])
     (inp ["attack" "west"])])
-"t" (fn [client] (client.readString))
+"t" (self.parseMessage (self.display.getString)) ; This should not work, but somehow it does
 "help" "\
 Controls:
  wasd or arrows:
@@ -34,4 +34,4 @@ Controls:
  t: Chat
  z: Unequip
  xcv: scroll"
-
+}
diff --git a/asciifarm/keybindings/vimbindings.hy b/asciifarm/keybindings/vimbindings.hy
index 00c1ae1..b2525f5 100644
--- a/asciifarm/keybindings/vimbindings.hy
+++ b/asciifarm/keybindings/vimbindings.hy
@@ -1,5 +1,7 @@
 
 
+;; Outdated! Don't use
+
 ;; mainly intended as example for using different keybindings
 "k" (input ["move" "north"])
 "j" (input ["move" "south"])
-- 
cgit