From 8c48efc21377680d88bbbbf68b8121d24bea666d Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Tue, 7 Apr 2020 10:08:47 +0200
Subject: removed equipment from the client

---
 asciifarmclient/commandhandler.py | 12 +++++++-----
 asciifarmclient/display.py        | 11 +----------
 asciifarmclient/gameclient.py     |  2 --
 asciifarmclient/layout.xml        |  9 ---------
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/asciifarmclient/commandhandler.py b/asciifarmclient/commandhandler.py
index 421249c..4bf785a 100644
--- a/asciifarmclient/commandhandler.py
+++ b/asciifarmclient/commandhandler.py
@@ -103,12 +103,14 @@ class CommandHandler:
         self.input([action, self.client.display.getSelectedItem(menu).getSelected()])
     
     def useSelected(self):
-        menu = self.client.display.getSelectedMenu()
+        menu = "inventory"
+        selected = self.client.display.getSelectedItem(menu)
+        self.input(["use", menu, selected])
+    
+    def interactSelected(self):
+        menu = "ground"
         selected = self.client.display.getSelectedItem(menu)
-        if menu in ("inventory", "equipment"):
-            self.input(["use", menu, selected])
-        elif menu == "ground":
-            self.input(["interact", selected])
+        self.input(["interact", selected])
     
     def dropSelected(self):
         menu = self.client.display.getSelectedMenu()
diff --git a/asciifarmclient/display.py b/asciifarmclient/display.py
index c9da29a..b3c32d8 100644
--- a/asciifarmclient/display.py
+++ b/asciifarmclient/display.py
@@ -57,17 +57,14 @@ class Display:
         # temporary, until these have a better place
         self.inventory = ListSelector(self.getWidget("inventory"))
         self.inventory._debug_name = "inventory"
-        self.equipment = ListSelector(self.getWidget("equipment"))
-        self.equipment._debug_name = "equipment"
         self.ground = ListSelector(self.getWidget("ground"))
         self.ground._debug_name = "ground"
         self.switch = ListSelector(self.getWidget("switchtitles"))
         self.switch._debug_name = "switch"
         
-        self.switch.setItems(["inventory", "equipment", "ground"])
+        self.switch.setItems(["inventory", "ground"])
         self.menus = {
             "inventory": self.inventory,
-            "equipment": self.equipment,
             "ground": self.ground
         }
         
@@ -137,12 +134,6 @@ class Display:
     def setInv(self, items):
         self.inventory.setItems([(":" if is_equipped else " ") + item for (item, is_equipped) in items])
     
-    def setEquipment(self, slots):
-        self.equipment.setItems([
-            slot + ": " + (item if item else "")
-            for slot, item in slots
-        ])
-    
     def setGround(self, items):
         self.ground.setItems(items)
         
diff --git a/asciifarmclient/gameclient.py b/asciifarmclient/gameclient.py
index b8f8727..edc3838 100644
--- a/asciifarmclient/gameclient.py
+++ b/asciifarmclient/gameclient.py
@@ -126,8 +126,6 @@ class Client:
             self.display.setInventory(msg[1])
         if msgType == "inv":
             self.display.setInv(msg[1])
-        if msgType == "equipment":
-            self.display.setEquipment(msg[1])
         if msgType == "ground":
             self.display.setGround(msg[1])
         if msgType == "message":
diff --git a/asciifarmclient/layout.xml b/asciifarmclient/layout.xml
index ec6052f..0a29caa 100644
--- a/asciifarmclient/layout.xml
+++ b/asciifarmclient/layout.xml
@@ -13,15 +13,6 @@
                     bread
                 </listing>
             </vbox>
-<!--            <vbox key="equipment">
-                <textbox height="1">Equipment:</textbox>
-                <listing id="equipment">
-                    cotton underwear
-                    cotton shirt
-                    jeans
-                    friendship bracelet
-                </listing>
-            </vbox>-->
             <vbox key="ground">
                 <textbox height="1">Ground:</textbox>
                 <listing id="ground">
-- 
cgit