X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fexample_client.py;h=0e2ceddec7375e2a27d1a1cf05b0bb5afa965144;hb=398888f6b847dcd72c51a63720ce38c8feaffab2;hp=66c2bf651ea777d77f1ed48dd9f155c836287dde;hpb=e08cc5e251e260b969e374b610b09d3b8fdc4f9f;p=plomrogue2-experiments diff --git a/new/example_client.py b/new/example_client.py index 66c2bf6..0e2cedd 100755 --- a/new/example_client.py +++ b/new/example_client.py @@ -5,14 +5,14 @@ import threading from plomrogue.parser import ArgError, Parser from plomrogue.commands import cmd_MAP, cmd_THING_POS, cmd_PLAYER_ID from plomrogue.game import Game, WorldBase -from plomrogue.mapping import MapBase +from plomrogue.mapping import MapHex from plomrogue.io import PlomSocket from plomrogue.things import ThingBase import types import queue -class Map(MapBase): +class ClientMap(MapHex): def y_cut(self, map_lines, center_y, view_height): map_height = len(map_lines) @@ -33,14 +33,17 @@ class Map(MapBase): cut_end = cut_start + view_width map_lines[:] = [line[cut_start:cut_end] for line in map_lines] - def format_to_view(self, map_string, center, size): + def format_to_view(self, map_cells, center, size): - def map_string_to_lines(map_string): + def map_cells_to_lines(map_cells): map_view_chars = ['0'] x = 0 y = 0 - for c in map_string: - map_view_chars += [c, ' '] + for cell in map_cells: + if type(cell) == str: + map_view_chars += [cell, ' '] + else: + map_view_chars += [cell[0], cell[1]] x += 1 if x == self.size[1]: map_view_chars += ['\n'] @@ -53,7 +56,7 @@ class Map(MapBase): map_view_chars = map_view_chars[:-1] return ''.join(map_view_chars).split('\n') - map_lines = map_string_to_lines(map_string) + map_lines = map_cells_to_lines(map_cells) self.y_cut(map_lines, center[0], size[0]) map_width = self.size[1] * 2 + 1 self.x_cut(map_lines, center[1] * 2, size[1], map_width) @@ -69,13 +72,13 @@ class World(WorldBase): on any update, even before we actually receive map data. """ super().__init__(*args, **kwargs) - self.map_ = Map() + self.map_ = ClientMap() self.player_inventory = [] self.player_id = 0 self.pickable_items = [] def new_map(self, yx): - self.map_ = Map(yx) + self.map_ = ClientMap(yx) @property def player(self): @@ -106,6 +109,7 @@ cmd_VISIBLE_MAP_LINE.argtypes = 'int:nonneg string' def cmd_GAME_STATE_COMPLETE(game): game.tui.to_update['turn'] = True game.tui.to_update['map'] = True + game.tui.to_update['inventory'] = True def cmd_THING_TYPE(game, i, type_): t = game.world.get_thing(i) @@ -118,7 +122,7 @@ cmd_PLAYER_INVENTORY.argtypes = 'seq:int:nonneg' def cmd_PICKABLE_ITEMS(game, ids): game.world.pickable_items = ids - game.tui.to_update['map'] = True + game.tui.to_update['pickable_items'] = True cmd_PICKABLE_ITEMS.argtypes = 'seq:int:nonneg' @@ -196,7 +200,7 @@ def recv_loop(plom_socket, game, q): class Widget: - def __init__(self, tui, start, size, check_updates=[]): + def __init__(self, tui, start, size, check_updates=[], visible=True): self.check_updates = check_updates self.tui = tui self.start = start @@ -204,7 +208,7 @@ class Widget: self.size_def = size # store for re-calling .size on SIGWINCH self.size = size self.do_update = True - self.visible = True + self.visible = visible self.children = [] @property @@ -232,14 +236,10 @@ class Widget: if not type(part) == str: part_string = part[0] attr = part[1] - if len(part_string) > 0: - return [(char, attr) for char in part_string] - elif len(part_string) == 1: - return [part] - return [] + return [(char, attr) for char in part_string] chars_with_attrs = [] - if type(foo) == str or len(foo) == 2 and type(foo[1]) == int: + if type(foo) == str or (len(foo) == 2 and type(foo[1]) == int): chars_with_attrs += to_chars_with_attrs(foo) else: for part in foo: @@ -259,19 +259,21 @@ class Widget: self.win.addstr(char_with_attr[0], char_with_attr[1]) def ensure_freshness(self, do_refresh=False): - if not self.visible: - return - if not do_refresh: - for key in self.check_updates: - if key in self.tui.to_update and self.tui.to_update[key]: - do_refresh = True - break - if do_refresh: - self.win.erase() - self.draw() - self.win.refresh() - for child in self.children: - child.ensure_freshness(do_refresh) + did_refresh = False + if self.visible: + if not do_refresh: + for key in self.check_updates: + if key in self.tui.to_update and self.tui.to_update[key]: + do_refresh = True + break + if do_refresh: + self.win.erase() + self.draw() + self.win.refresh() + did_refresh = True + for child in self.children: + did_refresh = child.ensure_freshness(do_refresh) | did_refresh + return did_refresh class EditWidget(Widget): @@ -280,13 +282,13 @@ class EditWidget(Widget): self.safe_write((''.join(self.tui.to_send), curses.color_pair(1))) -class LogWidget(Widget): +class TextLinesWidget(Widget): def draw(self): + lines = self.get_text_lines() line_width = self.size[1] - log_lines = self.tui.game.log_text.split('\n') to_join = [] - for line in log_lines: + for line in lines: to_pad = line_width - (len(line) % line_width) if to_pad == line_width: to_pad = 0 @@ -294,6 +296,26 @@ class LogWidget(Widget): self.safe_write((''.join(to_join), curses.color_pair(3))) +class LogWidget(TextLinesWidget): + + def get_text_lines(self): + return self.tui.game.log_text.split('\n') + + +class DescriptorWidget(TextLinesWidget): + + def get_text_lines(self): + lines = [] + pos_i = self.tui.game.world.map_.\ + get_position_index(self.tui.examiner_position) + terrain = self.tui.game.world.map_.terrain[pos_i] + lines = [terrain] + for t in self.tui.game.world.things: + if t.position == self.tui.examiner_position: + lines += [t.type_] + return lines + + class PopUpWidget(Widget): def draw(self): @@ -308,20 +330,9 @@ class PopUpWidget(Widget): offset_x = int((self.tui.stdscr.getmaxyx()[1] / 2) - (size[1] / 2)) self.start = (offset_y, offset_x) self.win.mvwin(self.start[0], self.start[1]) - self.ensure_freshness(True) - -class MapWidget(Widget): - def draw(self): - if self.tui.view == 'map': - self.draw_map() - elif self.tui.view == 'inventory': - self.draw_item_selector('INVENTORY:', - self.tui.game.world.player_inventory) - elif self.tui.view == 'pickable_items': - self.draw_item_selector('PICKABLE:', - self.tui.game.world.pickable_items) +class ItemsSelectorWidget(Widget): def draw_item_selector(self, title, selection): lines = [title] @@ -340,17 +351,45 @@ class MapWidget(Widget): to_join += [line + ' '*to_pad] self.safe_write((''.join(to_join), curses.color_pair(3))) - def draw_map(self): - def terrain_with_objects(): +class InventoryWidget(ItemsSelectorWidget): + + def draw(self): + self.draw_item_selector('INVENTORY:', + self.tui.game.world.player_inventory) + +class PickableItemsWidget(ItemsSelectorWidget): + + def draw(self): + self.draw_item_selector('PICKABLE:', + self.tui.game.world.pickable_items) + + +class MapWidget(Widget): + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.examine_mode = False + + def draw(self): + + def annotated_terrain(): terrain_as_list = list(self.tui.game.world.map_.terrain[:]) for t in self.tui.game.world.things: pos_i = self.tui.game.world.map_.get_position_index(t.position) symbol = self.tui.game.symbol_for_type(t.type_) - if symbol in {'i'} and terrain_as_list[pos_i] in {'@', 'm'}: - continue - terrain_as_list[pos_i] = symbol - return ''.join(terrain_as_list) + if terrain_as_list[pos_i][0] in {'i', '@', 'm'}: + old_symbol = terrain_as_list[pos_i][0] + if old_symbol in {'@', 'm'}: + symbol = old_symbol + terrain_as_list[pos_i] = (symbol, '+') + else: + terrain_as_list[pos_i] = symbol + if self.examine_mode: + pos_i = self.tui.game.world.map_.\ + get_position_index(self.tui.examiner_position) + terrain_as_list[pos_i] = (terrain_as_list[pos_i][0], '?') + return terrain_as_list def pad_or_cut_x(lines): line_width = self.size[1] @@ -388,9 +427,11 @@ class MapWidget(Widget): self.safe_write(''.join(lines)) return - terrain_with_objects = terrain_with_objects() + annotated_terrain = annotated_terrain() center = self.tui.game.world.player.position - lines = self.tui.game.world.map_.format_to_view(terrain_with_objects, + if self.examine_mode: + center = self.tui.examiner_position + lines = self.tui.game.world.map_.format_to_view(annotated_terrain, center, self.size) pad_or_cut_x(lines) pad_y(lines) @@ -423,16 +464,55 @@ class TUI: self.parser = Parser(self.game) self.to_update = {} self.item_pointer = 0 - self.top_widgets = [] + self.examiner_position = (0, 0) curses.wrapper(self.loop) - def setup_screen(self, stdscr): - self.stdscr = stdscr - self.stdscr.refresh() # will be called by getkey else, clearing screen - self.stdscr.timeout(10) - def loop(self, stdscr): - self.setup_screen(stdscr) + + def setup_screen(stdscr): + self.stdscr = stdscr + self.stdscr.refresh() # will be called by getkey else, clearing screen + self.stdscr.timeout(10) + + def switch_widgets(widget_1, widget_2): + widget_1.visible = False + widget_2.visible = True + trigger = widget_2.check_updates[0] + self.to_update[trigger] = True + + def pick_or_drop_menu(action_key, widget, selectables, task, + bonus_command=None): + if len(selectables) < self.item_pointer + 1 and\ + self.item_pointer > 0: + self.item_pointer = len(selectables) - 1 + if key == 'c': + switch_widgets(widget, map_widget) + map_widget.examine_mode = False + elif key == 'j': + self.item_pointer += 1 + elif key == 'k' and self.item_pointer > 0: + self.item_pointer -= 1 + elif key == action_key and len(selectables) > 0: + id_ = selectables[self.item_pointer] + self.socket.send('TASK:%s %s' % (task, id_)) + if bonus_command: + self.socket.send(bonus_command) + if self.item_pointer > 0: + self.item_pointer -= 1 + else: + return + trigger = widget.check_updates[0] + self.to_update[trigger] = True + + def move_examiner(direction): + start_pos = self.examiner_position + new_examine_pos = self.game.world.map_.move(start_pos, direction) + if new_examine_pos: + self.examiner_position = new_examine_pos + self.to_update['map'] = True + self.to_update['descriptor'] = True + + setup_screen(stdscr) curses.init_pair(1, curses.COLOR_BLACK, curses.COLOR_RED) curses.init_pair(2, curses.COLOR_BLACK, curses.COLOR_GREEN) curses.init_pair(3, curses.COLOR_BLACK, curses.COLOR_BLUE) @@ -445,19 +525,29 @@ class TUI: turn_widget = TextLineWidget('TURN:', self, (2, 0), (1, 20)) turn_widget.children += [TurnWidget(self, (2, 6), (1, 14), ['turn'])] log_widget = LogWidget(self, (4, 0), (None, 20), ['log']) + descriptor_widget = DescriptorWidget(self, (4, 0), (None, 20), + ['descriptor'], False) map_widget = MapWidget(self, (0, 21), (None, None), ['map']) - popup_widget = PopUpWidget(self, (0, 0), (1, 1), ['popup']) - popup_widget.visible = False + inventory_widget = InventoryWidget(self, (0, 21), (None, None), + ['inventory'], False) + pickable_items_widget = PickableItemsWidget(self, (0, 21), (None, None), + ['pickable_items'], False) + top_widgets = [edit_widget, turn_widget, log_widget, + descriptor_widget, map_widget, inventory_widget, + pickable_items_widget] + popup_widget = PopUpWidget(self, (0, 0), (1, 1), visible=False) self.popup_text = 'Hi bob' - self.top_widgets = [edit_widget, turn_widget, log_widget, map_widget, - popup_widget] write_mode = True - self.view = 'map' - for w in self.top_widgets: + for w in top_widgets: w.ensure_freshness(True) + draw_popup_if_visible = True while True: - for w in self.top_widgets: - w.ensure_freshness() + for w in top_widgets: + did_refresh = w.ensure_freshness() + draw_popup_if_visible = did_refresh | draw_popup_if_visible + if popup_widget.visible and draw_popup_if_visible: + popup_widget.ensure_freshness(True) + draw_popup_if_visible = False for k in self.to_update.keys(): self.to_update[k] = False while True: @@ -470,8 +560,8 @@ class TUI: key = self.stdscr.getkey() if key == 'KEY_RESIZE': curses.endwin() - self.setup_screen(curses.initscr()) - for w in self.top_widgets: + setup_screen(curses.initscr()) + for w in top_widgets: w.size = w.size_def w.ensure_freshness(True) elif key == '\t': # Tabulator key. @@ -488,73 +578,66 @@ class TUI: self.socket.send(''.join(self.to_send)) self.to_send[:] = [] self.to_update['edit'] = True - elif self.view == 'map': - if key == 'w': + elif key == 't': + if not popup_widget.visible: + self.to_update['popup'] = True + popup_widget.visible = True + popup_widget.reconfigure() + draw_popup_if_visible = True + else: + popup_widget.visible = False + for w in top_widgets: + w.ensure_freshness(True) + elif map_widget.visible: + if key == '?': + map_widget.examine_mode = not map_widget.examine_mode + if map_widget.examine_mode: + self.examiner_position = self.game.world.\ + player.position + switch_widgets(log_widget, descriptor_widget) + else: + switch_widgets(descriptor_widget, log_widget) + self.to_update['map'] = True + elif key == 'p': + self.socket.send('GET_PICKABLE_ITEMS') + self.item_pointer = 0 + switch_widgets(map_widget, pickable_items_widget) + elif key == 'i': + self.item_pointer = 0 + switch_widgets(map_widget, inventory_widget) + elif map_widget.examine_mode: + if key == 'w': + move_examiner('UPLEFT') + elif key == 'e': + move_examiner('UPRIGHT') + elif key == 's': + move_examiner('LEFT') + elif key == 'd': + move_examiner('RIGHT') + elif key == 'x': + move_examiner('DOWNLEFT') + elif key == 'c': + move_examiner('DOWNRIGHT') + elif key == 'w': self.socket.send('TASK:MOVE UPLEFT') elif key == 'e': self.socket.send('TASK:MOVE UPRIGHT') - if key == 's': + elif key == 's': self.socket.send('TASK:MOVE LEFT') elif key == 'd': self.socket.send('TASK:MOVE RIGHT') - if key == 'x': + elif key == 'x': self.socket.send('TASK:MOVE DOWNLEFT') elif key == 'c': self.socket.send('TASK:MOVE DOWNRIGHT') - elif key == 't': - if not popup_widget.visible: - self.to_update['popup'] = True - popup_widget.visible = True - popup_widget.reconfigure() - else: - popup_widget.visible = False - for w in self.top_widgets: - w.ensure_freshness(True) - elif key == 'p': - self.socket.send('GET_PICKABLE_ITEMS') - self.item_pointer = 0 - self.view = 'pickable_items' - elif key == 'i': - self.item_pointer = 0 - self.view = 'inventory' - self.to_update['map'] = True - elif self.view == 'pickable_items': - if key == 'c': - self.view = 'map' - elif key == 'j' and \ - len(self.game.world.pickable_items) > \ - self.item_pointer + 1: - self.item_pointer += 1 - elif key == 'k' and self.item_pointer > 0: - self.item_pointer -= 1 - elif key == 'p' and \ - len(self.game.world.pickable_items) > 0: - id_ = self.game.world.pickable_items[self.item_pointer] - self.socket.send('TASK:PICKUP %s' % id_) - self.socket.send('GET_PICKABLE_ITEMS') - if self.item_pointer > 0: - self.item_pointer -= 1 - else: - continue - self.to_update['map'] = True - elif self.view == 'inventory': - if key == 'c': - self.view = 'map' - elif key == 'j' and \ - len(self.game.world.player_inventory) > \ - self.item_pointer + 1: - self.item_pointer += 1 - elif key == 'k' and self.item_pointer > 0: - self.item_pointer -= 1 - elif key == 'd' and \ - len(self.game.world.player_inventory) > 0: - id_ = self.game.world.player_inventory[self.item_pointer] - self.socket.send('TASK:DROP %s' % id_) - if self.item_pointer > 0: - self.item_pointer -= 1 - else: - continue - self.to_update['map'] = True + elif pickable_items_widget.visible: + pick_or_drop_menu('p', pickable_items_widget, + self.game.world.pickable_items, + 'PICKUP', 'GET_PICKABLE_ITEMS') + elif inventory_widget.visible: + pick_or_drop_menu('d', inventory_widget, + self.game.world.player_inventory, + 'DROP') except curses.error: pass if self.game.do_quit: