From f72c658220a78ec058ceca25118e3e9a499a6c2b Mon Sep 17 00:00:00 2001 From: troido Date: Wed, 17 Jan 2018 20:26:16 +0100 Subject: updated maps and refactored client: renamed display parts and removed selector --- asciifarm/keybindings/keybindings.hy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asciifarm/keybindings') diff --git a/asciifarm/keybindings/keybindings.hy b/asciifarm/keybindings/keybindings.hy index 5813362..d64bc8c 100644 --- a/asciifarm/keybindings/keybindings.hy +++ b/asciifarm/keybindings/keybindings.hy @@ -21,9 +21,9 @@ r (do [ (inp ["interact" "south"]) (inp ["interact" "east"]) (inp ["interact" "west"])]) -c (.select (selector "inventory") 1 True True) -x (.select (selector "ground") 1 True True) -v (.select (selector "equipment") 1 True True) +c (.select (self.display.getWidget "inventory") 1 True True) +x (.select (self.display.getWidget "ground") 1 True True) +v (.select (self.display.getWidget "equipment") 1 True True) z (inp ["unequip" (selectorvalue "equipment")]) f (do [ (inp ["attack"]) -- cgit From b1ea1bff79c5e9edf6aedbe8f4183c7e4f92f1e8 Mon Sep 17 00:00:00 2001 From: troido Date: Wed, 17 Jan 2018 21:26:52 +0100 Subject: fixed selectorvalue crash and selector disappearing when selected is removed --- asciifarm/keybindings/keybindings.hy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'asciifarm/keybindings') diff --git a/asciifarm/keybindings/keybindings.hy b/asciifarm/keybindings/keybindings.hy index d64bc8c..2919d1d 100644 --- a/asciifarm/keybindings/keybindings.hy +++ b/asciifarm/keybindings/keybindings.hy @@ -11,9 +11,9 @@ k (inp ["move" "north"]) j (inp ["move" "south"]) l (inp ["move" "east"]) h (inp ["move" "west"]) -e (inp ["take" (selectorvalue "ground")]) -q (inp ["drop" (selectorvalue "inventory")]) -E (inp ["use" (selectorvalue "inventory")]) +e (inp ["take" (.getSelected (self.display.getWidget "ground"))]) +q (inp ["drop" (.getSelected (self.display.getWidget "inventory"))]) +E (inp ["use" (.getSelected (self.display.getWidget "inventory"))]) R (inp ["interact"]) r (do [ (inp ["interact"]) @@ -24,7 +24,7 @@ r (do [ c (.select (self.display.getWidget "inventory") 1 True True) x (.select (self.display.getWidget "ground") 1 True True) v (.select (self.display.getWidget "equipment") 1 True True) -z (inp ["unequip" (selectorvalue "equipment")]) +z (inp ["unequip" (.getSelected (self.display.getWidget "equipment"))]) f (do [ (inp ["attack"]) (inp ["attack" "north"]) -- cgit