From 705bc3ea52c52f13bddf0946bdb77a5a3fef77c6 Mon Sep 17 00:00:00 2001
From: troido <troido@hotmail.com>
Date: Sat, 30 Dec 2017 12:49:28 +0100
Subject: added equipment display

---
 asciifarm/client/display/display.py | 12 +++++++++++-
 asciifarm/client/display/screen.py  |  5 ++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'asciifarm/client/display')

diff --git a/asciifarm/client/display/display.py b/asciifarm/client/display/display.py
index 79991af..1a2dca0 100644
--- a/asciifarm/client/display/display.py
+++ b/asciifarm/client/display/display.py
@@ -49,6 +49,8 @@ class Display:
         setwin(self.inventoryPad, "inventory")
         self.groundPad = InventoryPad("Ground")
         setwin(self.groundPad, "ground")
+        self.equipment = InventoryPad("Equipment")
+        setwin(self.equipment, "equipment")
         self.messagePad = MessagePad()
         setwin(self.messagePad, "msg")
         self.textInput = TextInput()
@@ -58,7 +60,7 @@ class Display:
         
         #self.changed = False
         
-        self.update()
+        self.update(True)
     
     def getWidget(self, name):
         if name in self.widgets:
@@ -93,6 +95,14 @@ class Display:
         self.inventoryPad.setInventory(items)
         #self.change()
     
+    def setEquipment(self, slots):
+        self.equipment.setInventory(
+            sorted([
+                slot + ": " + (item if item else "")
+                for slot, item in slots.items()
+            ])
+        )
+    
     def setGround(self, items):
         self.groundPad.setInventory(items)
         #self.change()
diff --git a/asciifarm/client/display/screen.py b/asciifarm/client/display/screen.py
index 5eeb879..a09c2a9 100644
--- a/asciifarm/client/display/screen.py
+++ b/asciifarm/client/display/screen.py
@@ -32,7 +32,9 @@ class Screen:
         groundH = self._limitHeight(7, groundY)
         invY = groundY + groundH
         invH = self._limitHeight(12, invY)
-        infoY = invY + invH
+        eqY = invY + invH
+        eqH = self._limitHeight(5, eqY)
+        infoY = eqY + eqH
         infoH = self._limitHeight(20, infoY)
         
         self.windows = {
@@ -42,6 +44,7 @@ class Screen:
             "health": self.makeWin(sideX, healthY, sideW, healthH),
             "ground": self.makeWin(sideX, groundY, sideW, groundH),
             "inventory": self.makeWin(sideX, invY, sideW, invH),
+            "equipment": self.makeWin(sideX, eqY, sideW, eqH),
             "info": self.makeWin(sideX, infoY, sideW, infoH)
         }
     
-- 
cgit