From 4291b62cd7c2dd58932c4bb3efde293dbd7fe309 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Wed, 9 Oct 2019 00:04:08 +0200
Subject: equipment and food are now ECS

---
 asciifarm/client/inputhandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'asciifarm/client')

diff --git a/asciifarm/client/inputhandler.py b/asciifarm/client/inputhandler.py
index 0657749..4281c01 100644
--- a/asciifarm/client/inputhandler.py
+++ b/asciifarm/client/inputhandler.py
@@ -87,7 +87,7 @@ class InputHandler:
         elif key == "^I": # tab
             # return to game but keep entered string
             self.typing = False
-        elif key.isprintable():
+        elif key.isprintable() and len(key) == 1:
             self.string = self.string[:self.cursor] + key + self.string[self.cursor:]
             self.cursor += len(key)
         
-- 
cgit 


From 5231db6eed301ce86cd5026d1eeb32b4156835c3 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Fri, 11 Oct 2019 18:12:30 +0200
Subject: controls are now separate objects

---
 asciifarm/client/commandhandler.py | 13 ++++---------
 asciifarm/client/gameclient.py     |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'asciifarm/client')

diff --git a/asciifarm/client/commandhandler.py b/asciifarm/client/commandhandler.py
index 0c3027f..1677d7b 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,
@@ -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])
diff --git a/asciifarm/client/gameclient.py b/asciifarm/client/gameclient.py
index facb54e..4013505 100644
--- a/asciifarm/client/gameclient.py
+++ b/asciifarm/client/gameclient.py
@@ -88,7 +88,7 @@ class Client:
             if error == "invalidname":
                 self.close("Invalid name error: "+ str(message.description))
                 return
-            self.log(message.errtype + ": " + message.description)
+            self.log(message.errType + ": " + message.description)
         elif isinstance(message, messages.MessageMessage):
             self.log(message.text, message.type)
         elif isinstance(message, messages.WorldMessage):
-- 
cgit 


From 34d65f07de1f9364c176fea85a33bea3a51bb273 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Fri, 11 Oct 2019 20:08:15 +0200
Subject: finally got rid of all old components

---
 asciifarm/client/commandhandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'asciifarm/client')

diff --git a/asciifarm/client/commandhandler.py b/asciifarm/client/commandhandler.py
index 1677d7b..ec5baa3 100644
--- a/asciifarm/client/commandhandler.py
+++ b/asciifarm/client/commandhandler.py
@@ -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)
-- 
cgit 


From eb029f8d0241449d64e237a1d689200a0a741b72 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Wed, 16 Oct 2019 00:19:03 +0200
Subject: notifications are now passed though listen instead of events

---
 asciifarm/client/gameclient.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'asciifarm/client')

diff --git a/asciifarm/client/gameclient.py b/asciifarm/client/gameclient.py
index 4013505..c0f702c 100644
--- a/asciifarm/client/gameclient.py
+++ b/asciifarm/client/gameclient.py
@@ -129,7 +129,8 @@ class Client:
         if msgType == "ground":
             self.display.setGround(msg[1])
         if msgType == "message":
-            self.log(*msg[1:])
+            type, text = msg[1][:2]
+            self.log(text, type)
         if msgType == "options":
             if msg[1] != None:
                 description, options = msg[1]
-- 
cgit