diff options
| -rw-r--r-- | asciifarm/client/commandhandler.py | 6 | ||||
| -rw-r--r-- | asciifarm/client/gameclient.py | 9 | ||||
| -rw-r--r-- | asciifarm/client/inputhandler.py | 2 | ||||
| -rw-r--r-- | asciifarm/client/newdisplay/display.py | 22 |
4 files changed, 18 insertions, 21 deletions
diff --git a/asciifarm/client/commandhandler.py b/asciifarm/client/commandhandler.py index 0fe3c3d..f2e94d1 100644 --- a/asciifarm/client/commandhandler.py +++ b/asciifarm/client/commandhandler.py @@ -28,7 +28,7 @@ class CommandHandler: "runinput": self.runInput, "selectwidget": self.selectWidget, "selectitem": self.selectItem, - #"inputwithselected": self.actWithSelected, + "inputwithselected": self.actWithSelected, "use": self.useSelected, "unuse": self.unUseSelected, "take": self.takeSelected, @@ -100,8 +100,8 @@ class CommandHandler: def selectItem(self, value, relative=False, modular=False): self.client.display.selectItem(None, value, relative, modular) - #def actWithSelected(self, action, widget): - #self.input([action, self.client.display.getWidget(widget).getSelected()]) + def actWithSelected(self, action, menu): + self.input([action, self.client.display.getSelectedItem(menu).getSelected()]) def useSelected(self): menu = self.client.display.getSelectedMenu() diff --git a/asciifarm/client/gameclient.py b/asciifarm/client/gameclient.py index 37335f5..d9d0c89 100644 --- a/asciifarm/client/gameclient.py +++ b/asciifarm/client/gameclient.py @@ -108,14 +108,11 @@ class Client: if maxHealth is None: self.log("You have died. Restart the client to respawn") if msgType == "inventory": - #self.display.setInventory(msg[1]) - self.display.inventory.setItems(msg[1]) + self.display.setInventory(msg[1]) if msgType == "equipment": - #self.display.setEquipment(msg[1]) - self.display.equipment.setItems(msg[1]) + self.display.setEquipment(msg[1]) if msgType == "ground": - #self.display.setGround(msg[1]) - self.display.ground.setItems(msg[1]) + self.display.setGround(msg[1]) if msgType == "message": self.log(*msg[1:]) if msgType == "options": diff --git a/asciifarm/client/inputhandler.py b/asciifarm/client/inputhandler.py index a4d0262..b2e4ac9 100644 --- a/asciifarm/client/inputhandler.py +++ b/asciifarm/client/inputhandler.py @@ -1,4 +1,4 @@ -= + import string from .commandhandler import CommandHandler, InvalidCommandException diff --git a/asciifarm/client/newdisplay/display.py b/asciifarm/client/newdisplay/display.py index 565f1cf..8a578fa 100644 --- a/asciifarm/client/newdisplay/display.py +++ b/asciifarm/client/newdisplay/display.py @@ -128,20 +128,20 @@ class Display: name = name.casefold() return self.menus[name] - #def setInventory(self, items): - #self.getWidget("inventory").setInventory(items) + def setInventory(self, items): + self.getWidget("inventory").set_items(items) - #def setEquipment(self, slots): - #self.getWidget("equipment").setInventory( - #sorted([ - #slot + ": " + (item if item else "") - #for slot, item in slots.items() - #]) - #) + def setEquipment(self, slots): + self.getWidget("equipment").set_items( + sorted([ + slot + ": " + (item if item else "") + for slot, item in slots.items() + ]) + ) - #def setGround(self, items): - #self.getWidget("ground").setInventory(items) + def setGround(self, items): + self.getWidget("ground").set_items(items) def addMessage(self, message, type): |