summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2018-09-09 17:20:40 +0200
committertroido <troido@protonmail.com>2018-09-09 17:20:40 +0200
commite5962f67f90b85fdbcde8da348d471ef7a4db2cd (patch)
tree21c4df2dcc48128612b7be95435326a4a7f9ff84
parent9fe119a95b4cd8ab23ea30db9a72645063da264f (diff)
changed selector for menus. All inventory menus now use the same list
-rw-r--r--asciifarm/client/display/inventory.py5
-rw-r--r--asciifarm/client/display/screen.py8
-rw-r--r--asciifarm/client/display/switcher.py2
3 files changed, 9 insertions, 6 deletions
diff --git a/asciifarm/client/display/inventory.py b/asciifarm/client/display/inventory.py
index 9e62eff..48bf41e 100644
--- a/asciifarm/client/display/inventory.py
+++ b/asciifarm/client/display/inventory.py
@@ -5,9 +5,10 @@ from .widimp import WidImp
class Inventory(WidImp):
- def __init__(self, title, titlebar="{}:"):
+ def __init__(self, title, titlebar="{}:", selectorChar="*"):
self.title = title
self.titlebar = titlebar
+ self.selectorChar = selectorChar
self.items = []
self.selector = 0
@@ -63,7 +64,7 @@ class Inventory(WidImp):
win.addLine((0,0), (self.titlebar.format(self.title))[:width])
for i, item in enumerate(self.items[start:end]):
if i + start == selected:
- win.addLine((0, i+1), '*')
+ win.addLine((0, i+1), self.selectorChar)
win.addLine((1, i+1), self.itemName(item))
if end < len(self.items):
win.addLine((width-1, height), "+")
diff --git a/asciifarm/client/display/screen.py b/asciifarm/client/display/screen.py
index 438e818..666d3bc 100644
--- a/asciifarm/client/display/screen.py
+++ b/asciifarm/client/display/screen.py
@@ -50,6 +50,8 @@ class Screen:
infoY = listY + listH
infoH = self._limitHeight(20, infoY)
+ lists = self.makeWin(sideX, listY, sideW, listH)
+
self.windows = {
"field": self.makeWin(0, 0, sideX - 1, msgY),
"msg": self.makeWin(0, msgY, sideX - 1, msgH),
@@ -57,9 +59,9 @@ class Screen:
"health": self.makeWin(sideX, healthY, sideW, healthH),
"switch": self.makeWin(sideX, indexY, sideW, indexH),
- "ground": self.makeWin(sideX, listY, sideW, listH),
- "inventory": self.makeWin(sideX, listY, sideW, listH),
- "equipment": self.makeWin(sideX, listY, sideW, listH),
+ "ground": lists,
+ "inventory": lists,
+ "equipment": lists,
"info": self.makeWin(sideX, infoY, sideW, infoH)
}
diff --git a/asciifarm/client/display/switcher.py b/asciifarm/client/display/switcher.py
index b62e650..035aea3 100644
--- a/asciifarm/client/display/switcher.py
+++ b/asciifarm/client/display/switcher.py
@@ -8,7 +8,7 @@ class Switcher(Inventory):
"""
def __init__(self, widgets, initial=0):
- Inventory.__init__(self, "", "")
+ Inventory.__init__(self, "", "", "=")
self.setInventory(widgets)
for wid in widgets: