diff options
| author | troido <troido@hotmail.com> | 2017-10-27 22:18:51 +0200 |
|---|---|---|
| committer | troido <troido@hotmail.com> | 2017-10-27 22:18:51 +0200 |
| commit | 687bc04dd7988b2b9a34e91397f948c6fa44aad9 (patch) | |
| tree | 4d1c05c36cb480bc1a45ddc7508e2b38a4368b56 /asciifarm/client/display/__init__.py | |
| parent | b821aa6cc7e4bd137eb57a0ccebb5b514eb0031b (diff) | |
merged master changes from today into package branch
Diffstat (limited to 'asciifarm/client/display/__init__.py')
| -rw-r--r-- | asciifarm/client/display/__init__.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/asciifarm/client/display/__init__.py b/asciifarm/client/display/__init__.py index 80e2904..dc553a8 100644 --- a/asciifarm/client/display/__init__.py +++ b/asciifarm/client/display/__init__.py @@ -6,32 +6,33 @@ from .infopad import InfoPad from .healthpad import HealthPad from .inventorypad import InventoryPad from .screen import Screen +from .colours import Colours SIDEWIDTH = 20 -HEALTHHEIGHT = 2 -INVENTORYHEIGHT = 12 class Display: def __init__(self, stdscr, charMap, colours=False): + if colours: + self.colours = Colours() + else: + self.colours = None self.screen = Screen(stdscr) - self.fieldPad = FieldPad((64, 32), charMap.get("charwidth", 1), colours) + self.fieldPad = FieldPad((1, 1), charMap.get("charwidth", 1), self.colours) self.characters = charMap["mapping"] self.defaultChar = charMap.get("default", "?") self.infoPad = InfoPad((100, 100)) - self.healthPad = HealthPad(20, ("@",39), ("-",23), colours) + self.healthPad = HealthPad(20, + charMap.get("healthfull", ("@",7, 2)), + charMap.get("healthempty", ("-",7, 1)), + self.colours) self.inventoryPad = InventoryPad("Inventory", 16) self.groundPad = InventoryPad("Ground", 8) self.lastinfostring = None - self.colours = colours self.changed = False - if colours: - curses.use_default_colors() - for i in range(0, min(256, curses.COLORS, curses.COLOR_PAIRS)): - curses.init_pair(i, i%16, i//16) def resizeField(self, size): |