Merge remote-tracking branch 'origin/ecs'

1 files changed, 5 insertions, 10 deletions

diff --git a/asciifarm/client/commandhandler.py b/asciifarm/client/commandhandler.py
index 0c3027f..ec5baa3 100644
--- a/asciifarm/client/commandhandler.py
+++ b/asciifarm/client/commandhandler.py
@@ -29,7 +29,7 @@ class CommandHandler:
             "selectitem": self.selectItem,
             "inputwithselected": self.actWithSelected,
             "use": self.useSelected,
-            "unuse": self.unUseSelected,
+            "drop": self.dropSelected,
             "take": self.takeSelected,
             "eval": self.eval,
             "exec": self.exec,
@@ -74,7 +74,7 @@ class CommandHandler:
         self.input(["say", text])
     
     def pick(self, option):
-        self.input(["pick", option])
+        self.input(["interact", [None, "north", "south", "east", "west"], option])
     
     def chat(self, text):
         self.client.sendChat( text)
@@ -103,20 +103,15 @@ class CommandHandler:
         menu = self.client.display.getSelectedMenu()
         selected = self.client.display.getSelectedItem(menu)
         if menu in ("inventory", "equipment"):
-            action = "use"
+            self.input(["use", menu, selected])
         elif menu == "ground":
-            action = "interact",
-        else:
-            return
-        self.input([action, selected])
+            self.input(["interact", selected])
     
-    def unUseSelected(self):
+    def dropSelected(self):
         menu = self.client.display.getSelectedMenu()
         selected = self.client.display.getSelectedItem(menu)
         if menu == "inventory":
             action = "drop"
-        elif menu == "equipment":
-            action = "unequip"
         else:
             return
         self.input([action, selected])