diff options
| -rw-r--r-- | tui/static.py | 65 | ||||
| -rw-r--r-- | tui/tui.py | 85 |
2 files changed, 74 insertions, 76 deletions
diff --git a/tui/static.py b/tui/static.py new file mode 100644 index 0000000..c769e0f --- /dev/null +++ b/tui/static.py @@ -0,0 +1,65 @@ +from enum import Enum +from dataclasses import dataclass + +class Action(Enum): + QUIT = 0 # Pelin lopetus + OPEN = 1 # Ruudun avaaminen + FLAG = 2 # Ruudun liputus + HINT = 3 # Anna vihjeet + AUTO = 4 # Pelaa automaattisesti + LEFT = 5 + RIGHT = 6 + UP = 7 + DOWN = 8 + +ActionKeys = { + 'w': Action.UP, 'a': Action.LEFT, 's': Action.DOWN, + 'd': Action.RIGHT, ' ': Action.OPEN, '\n': Action.OPEN, + 'f': Action.FLAG, 'm': Action.FLAG, 'q': Action.QUIT +} + + +ActionEscKeys = { + '': Action.QUIT, 'A': Action.UP, 'D': Action.LEFT, + 'C': Action.RIGHT, 'B': Action.DOWN +} + +@dataclass +class TileType: + text: str # Teksti + colors: [] # Lista (väri, tausta) pareja tekstille + + +TileTypes = { + 0: TileType( "[ ]", [(0x7,0), (0x7,0), (0x7,0)] ), + 1: TileType( "[1]", [(0xA,0), (0xA,0), (0xA,0)] ), + 2: TileType( "[2]", [(0xB,0), (0xB,0), (0xB,0)] ), + 3: TileType( "[3]", [(0xD,0), (0xD,0), (0xD,0)] ), + 4: TileType( "[4]", [(0x9,0), (0x9,0), (0x9,0)] ), + 5: TileType( "[5]", [(0x9,0), (0x9,0), (0x9,0)] ), + 6: TileType( "[6]", [(0x9,0), (0x9,0), (0x9,0)] ), + 7: TileType( "[7]", [(0x9,0), (0x9,0), (0x9,0)] ), + 8: TileType( "[8]", [(0x9,0), (0x9,0), (0x9,0)] ), + 9: TileType( "[¤]", [(0xF,1), (0xF,1), (0xF,1)] ), + 10: TileType( "[#]", [(0x8,7), (0x8,7), (0x8,7)] ), + 11: TileType( "[B]", [(0x8,7), (0x1,7), (0x8,7)] ), + 12: TileType( "[?]", [(0x8,7), (0x3,7), (0x8,7)] ) +} + +class Colors: + BLACK = 0 + RED = 1 + GREEN = 2 + YELLOW = 3 + BLUE = 4 + MAGENTA = 5 + CYAN = 6 + WHITE = 7 + GRAY = 8 + BRIGHT_RED = 9 + BRIGHT_GREEN = 0xA + BRIGHT_YELLOW = 0xB + BRIGHT_BLUE = 0xC + BRIGHT_MAGENTA = 0xD + BRIGHT_CYAN = 0xE + BRIGHT_WHITE = 0xF
\ No newline at end of file @@ -1,61 +1,5 @@ import termios, fcntl, sys, os -from enum import Enum -from dataclasses import dataclass - - -class Action(Enum): - QUIT = 0 # Pelin lopetus - OPEN = 1 # Ruudun avaaminen - FLAG = 2 # Ruudun liputus - HINT = 3 # Anna vihjeet - AUTO = 4 # Pelaa automaattisesti - LEFT = 5 - RIGHT = 6 - UP = 7 - DOWN = 8 - - -class Colors: - BLACK = 0 - RED = 1 - GREEN = 2 - YELLOW = 3 - BLUE = 4 - MAGENTA = 5 - CYAN = 6 - WHITE = 7 - GRAY = 8 - BRIGHT_RED = 9 - BRIGHT_GREEN = 0xA - BRIGHT_YELLOW = 0xB - BRIGHT_BLUE = 0xC - BRIGHT_MAGENTA = 0xD - BRIGHT_CYAN = 0xE - BRIGHT_WHITE = 0xF - - -@dataclass -class TileType: - text: str # Teksti - colors: [] # Lista (väri, tausta) pareja tekstille - - -tile_types = { - 0: TileType( "[ ]", [(0x7,0), (0x7,0), (0x7,0)] ), - 1: TileType( "[1]", [(0xA,0), (0xA,0), (0xA,0)] ), - 2: TileType( "[2]", [(0xB,0), (0xB,0), (0xB,0)] ), - 3: TileType( "[3]", [(0xD,0), (0xD,0), (0xD,0)] ), - 4: TileType( "[4]", [(0x9,0), (0x9,0), (0x9,0)] ), - 5: TileType( "[5]", [(0x9,0), (0x9,0), (0x9,0)] ), - 6: TileType( "[6]", [(0x9,0), (0x9,0), (0x9,0)] ), - 7: TileType( "[7]", [(0x9,0), (0x9,0), (0x9,0)] ), - 8: TileType( "[8]", [(0x9,0), (0x9,0), (0x9,0)] ), - 9: TileType( "[¤]", [(0xF,1), (0xF,1), (0xF,1)] ), - 10: TileType( "[#]", [(0x8,7), (0x8,7), (0x8,7)] ), - 11: TileType( "[B]", [(0x8,7), (0x1,7), (0x8,7)] ), - 12: TileType( "[?]", [(0x8,7), (0x3,7), (0x8,7)] ) -} - +from tui.static import Action, ActionKeys, ActionEscKeys, Colors, TileTypes class Tui(): def __init__(self): @@ -99,11 +43,11 @@ class Tui(): def draw_tile(self, tile, hilighted): - for i in range(len(tile_types[tile].text)): - color, bg = tile_types[tile].colors[i] + for i in range(len(TileTypes[tile].text)): + color, bg = TileTypes[tile].colors[i] self.set_color(Colors.BLACK if hilighted else color) self.set_bg(Colors.CYAN if hilighted else bg) - print(end=tile_types[tile].text[i]) + print(end=TileTypes[tile].text[i]) self.reset_color() @@ -117,15 +61,6 @@ class Tui(): def read_action(self): - actions = { - 'w': Action.UP, 'a': Action.LEFT, 's': Action.DOWN, - 'd': Action.RIGHT, ' ': Action.OPEN, '\n': Action.OPEN, - 'f': Action.FLAG, 'm': Action.FLAG, 'q': Action.QUIT - } - esc_actions = { - '': Action.QUIT, 'A': Action.UP, 'D': Action.LEFT, - 'C': Action.RIGHT, 'B': Action.DOWN - } escape = 0 while True: try: @@ -135,18 +70,17 @@ class Tui(): if escape: if c in "[0123456789": continue - if c in esc_actions: - return esc_actions[c] + if c in ActionEscKeys: + return ActionEscKeys[c] escape = 0 continue else: if c == '\033': escape = 1 continue - if c in actions: - return actions[c] - - + if c in ActionKeys: + return ActionKeys[c] + def matrix_selector(self, matrix, x, y ): self.draw_matrix(matrix, x, y) @@ -167,4 +101,3 @@ class Tui(): case Action.RIGHT: x = x+1 if x<len(matrix)-1 else x self.draw_matrix(matrix, x, y) -
\ No newline at end of file |