X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/edit?a=blobdiff_plain;f=new%2Fexample_client.py;h=0e2ceddec7375e2a27d1a1cf05b0bb5afa965144;hb=398888f6b847dcd72c51a63720ce38c8feaffab2;hp=1b1d55fb3a0a81039f6fa009224ca061d63fdbfc;hpb=4b636feb0fc0bc00f9aa786533a72eea102e6087;p=plomrogue2-experiments diff --git a/new/example_client.py b/new/example_client.py index 1b1d55f..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) @@ -72,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): @@ -282,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 @@ -296,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): @@ -347,6 +367,10 @@ class PickableItemsWidget(ItemsSelectorWidget): class MapWidget(Widget): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.examine_mode = False + def draw(self): def annotated_terrain(): @@ -361,6 +385,10 @@ class MapWidget(Widget): 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): @@ -401,6 +429,8 @@ class MapWidget(Widget): annotated_terrain = annotated_terrain() center = self.tui.game.world.player.position + 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) @@ -434,6 +464,7 @@ class TUI: self.parser = Parser(self.game) self.to_update = {} self.item_pointer = 0 + self.examiner_position = (0, 0) curses.wrapper(self.loop) def loop(self, stdscr): @@ -456,6 +487,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: @@ -472,6 +504,14 @@ class TUI: 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) @@ -485,13 +525,16 @@ 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']) 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, map_widget, - inventory_widget, pickable_items_widget] + 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' write_mode = True @@ -546,25 +589,47 @@ class TUI: 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 + 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 == '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,