X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-logo.png?a=blobdiff_plain;f=new%2Fexample_client.py;h=1b1d55fb3a0a81039f6fa009224ca061d63fdbfc;hb=4b636feb0fc0bc00f9aa786533a72eea102e6087;hp=3f31780e17332ffa74a768d47ee2416829a99201;hpb=8746c041c61dad2feb5f7c8cf3f103869dc69dbd;p=plomrogue2-experiments diff --git a/new/example_client.py b/new/example_client.py index 3f31780..1b1d55f 100755 --- a/new/example_client.py +++ b/new/example_client.py @@ -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) @@ -233,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: @@ -350,15 +349,19 @@ class MapWidget(Widget): def draw(self): - def terrain_with_objects(): + 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 + return terrain_as_list def pad_or_cut_x(lines): line_width = self.size[1] @@ -396,9 +399,9 @@ 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, + lines = self.tui.game.world.map_.format_to_view(annotated_terrain, center, self.size) pad_or_cut_x(lines) pad_y(lines) @@ -433,19 +436,43 @@ class TUI: self.item_pointer = 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): - def switch_widgets(self, widget_1, widget_2): - widget_1.visible = False - widget_2.visible = True - x = widget_2.check_updates[0] - self.to_update[x] = True + 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) + 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 loop(self, stdscr): - self.setup_screen(stdscr) + 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) @@ -490,7 +517,7 @@ class TUI: key = self.stdscr.getkey() if key == 'KEY_RESIZE': curses.endwin() - self.setup_screen(curses.initscr()) + setup_screen(curses.initscr()) for w in top_widgets: w.size = w.size_def w.ensure_freshness(True) @@ -508,6 +535,16 @@ class TUI: self.socket.send(''.join(self.to_send)) self.to_send[:] = [] self.to_update['edit'] = True + 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 == 'w': self.socket.send('TASK:MOVE UPLEFT') @@ -521,64 +558,21 @@ class TUI: 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() - draw_popup_if_visible = True - else: - popup_widget.visible = False - for w in top_widgets: - w.ensure_freshness(True) elif key == 'p': self.socket.send('GET_PICKABLE_ITEMS') self.item_pointer = 0 - self.switch_widgets(map_widget, pickable_items_widget) + switch_widgets(map_widget, pickable_items_widget) elif key == 'i': self.item_pointer = 0 - self.switch_widgets(map_widget, inventory_widget) + switch_widgets(map_widget, inventory_widget) elif pickable_items_widget.visible: - if len(self.game.world.pickable_items) < self.item_pointer + 1\ - and self.item_pointer > 0: - self.item_pointer = len(self.game.world.pickable_items) - 1 - while len(self.game.world.pickable_items) <= self.item_pointer: - self.item_pointer -= 1 - if key == 'c': - self.switch_widgets(pickable_items_widget, map_widget) - elif key == 'j': - 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['pickable_items'] = True + pick_or_drop_menu('p', pickable_items_widget, + self.game.world.pickable_items, + 'PICKUP', 'GET_PICKABLE_ITEMS') elif inventory_widget.visible: - if len(self.game.world.player_inventory) < self.item_pointer + 1\ - and self.item_pointer > 0: - self.item_pointer = len(self.game.world.player_inventory) - 1 - if key == 'c': - self.switch_widgets(inventory_widget, map_widget) - elif key == 'j': - 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['inventory'] = True + pick_or_drop_menu('d', inventory_widget, + self.game.world.player_inventory, + 'DROP') except curses.error: pass if self.game.do_quit: