X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fexample_client.py;h=234ed768ed53df4e6d93ccdf110c9cd42c404a70;hb=f5797c816396a105c0d72cc826c2cc2566f1478c;hp=ee71241110e28d0121a83571c8ddf93ff4118416;hpb=373b553f83f45d34e424676a3c8e863a8507bdd4;p=plomrogue2-experiments diff --git a/new/example_client.py b/new/example_client.py index ee71241..234ed76 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): @@ -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: @@ -348,17 +347,30 @@ class PickableItemsWidget(ItemsSelectorWidget): class MapWidget(Widget): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.examine_mode = False + self.examine_pos = (0, 0) + 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 + if self.examine_mode: + pos_i = self.tui.game.world.map_.\ + get_position_index(self.examine_pos) + 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] @@ -396,9 +408,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.examine_pos + lines = self.tui.game.world.map_.format_to_view(annotated_terrain, center, self.size) pad_or_cut_x(lines) pad_y(lines) @@ -453,6 +467,7 @@ class TUI: 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: @@ -469,6 +484,13 @@ class TUI: trigger = widget.check_updates[0] self.to_update[trigger] = True + def move_examiner(direction): + start_pos = map_widget.examine_pos + new_examine_pos = self.game.world.map_.move(start_pos, direction) + if new_examine_pos: + map_widget.examine_pos = new_examine_pos + self.to_update['map'] = True + setup_screen(stdscr) curses.init_pair(1, curses.COLOR_BLACK, curses.COLOR_RED) curses.init_pair(2, curses.COLOR_BLACK, curses.COLOR_GREEN) @@ -532,36 +554,53 @@ 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': + if key == '?': + map_widget.examine_mode = not map_widget.examine_mode + map_widget.examine_pos = self.game.world.player.position + 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() - 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 - switch_widgets(map_widget, pickable_items_widget) - elif key == 'i': - self.item_pointer = 0 - switch_widgets(map_widget, inventory_widget) elif pickable_items_widget.visible: pick_or_drop_menu('p', pickable_items_widget, self.game.world.pickable_items,