X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fexample_client.py;h=eb198e0584da58e14063df126487fd1b2eaa4448;hb=4cfda20ebdf25c76d28530459126c6e4ecd85248;hp=b561d9ddbdbb380e4ea285b374026b0ecacb0379;hpb=34a2854e63892c17232fed7795d1b0d16d014626;p=plomrogue2-experiments diff --git a/new/example_client.py b/new/example_client.py index b561d9d..eb198e0 100755 --- a/new/example_client.py +++ b/new/example_client.py @@ -9,6 +9,7 @@ from plomrogue.mapping import MapBase from plomrogue.io import PlomSocket from plomrogue.things import ThingBase import types +import queue class Map(MapBase): @@ -71,6 +72,7 @@ class World(WorldBase): self.map_ = Map() self.player_inventory = [] self.player_id = 0 + self.pickable_items = [] def new_map(self, yx): self.map_ = Map(yx) @@ -94,8 +96,7 @@ def cmd_TURN(game, n): """Set game.turn to n, empty game.things.""" game.world.turn = n game.world.things = [] - game.to_update['turn'] = False - game.to_update['map'] = False + game.world.pickable_items = [] cmd_TURN.argtypes = 'int:nonneg' def cmd_VISIBLE_MAP_LINE(game, y, terrain_line): @@ -103,8 +104,8 @@ def cmd_VISIBLE_MAP_LINE(game, y, terrain_line): cmd_VISIBLE_MAP_LINE.argtypes = 'int:nonneg string' def cmd_GAME_STATE_COMPLETE(game): - game.to_update['turn'] = True - game.to_update['map'] = True + game.tui.to_update['turn'] = True + game.tui.to_update['map'] = True def cmd_THING_TYPE(game, i, type_): t = game.world.get_thing(i) @@ -115,6 +116,11 @@ def cmd_PLAYER_INVENTORY(game, ids): game.world.player_inventory = ids # TODO: test whether valid IDs cmd_PLAYER_INVENTORY.argtypes = 'seq:int:nonneg' +def cmd_PICKABLE_ITEMS(game, ids): + game.world.pickable_items = ids + game.tui.to_update['map'] = True +cmd_PICKABLE_ITEMS.argtypes = 'seq:int:nonneg' + class Game: @@ -130,15 +136,12 @@ class Game: 'PLAYER_INVENTORY': cmd_PLAYER_INVENTORY, 'GAME_STATE_COMPLETE': cmd_GAME_STATE_COMPLETE, 'MAP': cmd_MAP, + 'PICKABLE_ITEMS': cmd_PICKABLE_ITEMS, 'THING_TYPE': cmd_THING_TYPE, 'THING_POS': cmd_THING_POS} self.log_text = '' - self.to_update = { - 'log': True, - 'map': True, - 'turn': True, - } self.do_quit = False + self.tui = None def get_command(self, command_name): from functools import partial @@ -153,6 +156,7 @@ class Game: return None def handle_input(self, msg): + self.log(msg) if msg == 'BYE': self.do_quit = True return @@ -160,17 +164,15 @@ class Game: command, args = self.parser.parse(msg) if command is None: self.log('UNHANDLED INPUT: ' + msg) - self.to_update['log'] = True else: command(*args) except ArgError as e: self.log('ARGUMENT ERROR: ' + msg + '\n' + str(e)) - self.to_update['log'] = True def log(self, msg): """Prefix msg plus newline to self.log_text.""" self.log_text = msg + '\n' + self.log_text - self.to_update['log'] = True + self.tui.to_update['log'] = True def symbol_for_type(self, type_): symbol = '?' @@ -187,16 +189,15 @@ ASCII_printable = ' !"#$%&\'\(\)*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWX' 'YZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~' -def recv_loop(plom_socket, game): +def recv_loop(plom_socket, game, q): for msg in plom_socket.recv(): - game.handle_input(msg) + q.put(msg) class Widget: - def __init__(self, tui, start, size, check_game=[], check_tui=[]): - self.check_game = check_game - self.check_tui = check_tui + def __init__(self, tui, start, size, check_updates=[]): + self.check_updates = check_updates self.tui = tui self.start = start self.win = curses.newwin(1, 1, self.start[0], self.start[1]) @@ -204,6 +205,7 @@ class Widget: self.size = size self.do_update = True self.visible = True + self.children = [] @property def size(self): @@ -257,22 +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_game: - if key in self.tui.game.to_update and self.tui.game.to_update[key]: - do_refresh = True - break - if not do_refresh: - for key in self.check_tui: - 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 = 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): @@ -309,8 +310,6 @@ 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): @@ -319,13 +318,17 @@ class MapWidget(Widget): if self.tui.view == 'map': self.draw_map() elif self.tui.view == 'inventory': - self.draw_inventory() - - def draw_inventory(self): - lines = ['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) + + def draw_item_selector(self, title, selection): + lines = [title] counter = 0 - for id_ in self.tui.game.world.player_inventory: - pointer = '*' if counter == self.tui.inventory_pointer else ' ' + for id_ in selection: + pointer = '*' if counter == self.tui.item_pointer else ' ' t = self.tui.game.world.get_thing(id_) lines += ['%s %s' % (pointer, t.type_)] counter += 1 @@ -401,25 +404,32 @@ class TurnWidget(Widget): self.safe_write((str(self.tui.game.world.turn), curses.color_pair(2))) +class TextLineWidget(Widget): + + def __init__(self, text_line, *args, **kwargs): + self.text_line = text_line + super().__init__(*args, **kwargs) + + def draw(self): + self.safe_write(self.text_line) + + class TUI: - def __init__(self, plom_socket, game): + def __init__(self, plom_socket, game, q): self.socket = plom_socket self.game = game + self.game.tui = self + self.queue = q self.parser = Parser(self.game) - self.to_update = {'edit': False} - self.inventory_pointer = 0 + self.to_update = {} + self.item_pointer = 0 curses.wrapper(self.loop) - def draw_screen(self): - self.stdscr.addstr(0, 0, 'SEND:') - self.stdscr.addstr(2, 0, 'TURN:') - def setup_screen(self, stdscr): self.stdscr = stdscr self.stdscr.refresh() # will be called by getkey else, clearing screen self.stdscr.timeout(10) - self.draw_screen() def loop(self, stdscr): self.setup_screen(stdscr) @@ -429,36 +439,50 @@ class TUI: curses.init_pair(4, curses.COLOR_BLACK, curses.COLOR_YELLOW) curses.curs_set(False) # hide cursor self.to_send = [] - self.edit = EditWidget(self, (0, 6), (1, 14), check_tui = ['edit']) - self.turn = TurnWidget(self, (2, 6), (1, 14), ['turn']) - self.log = LogWidget(self, (4, 0), (None, 20), ['log']) - self.map_ = MapWidget(self, (0, 21), (None, None), ['map']) - self.popup = PopUpWidget(self, (0, 0), (1, 1), ['popup']) - self.popup.visible = False + edit_widget = TextLineWidget('SEND:', self, (0, 0), (1, 20)) + edit_line_widget = EditWidget(self, (0, 6), (1, 14), ['edit']) + edit_widget.children += [edit_line_widget] + 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']) + map_widget = MapWidget(self, (0, 21), (None, None), ['map']) + top_widgets = [edit_widget, turn_widget, log_widget, map_widget] + popup_widget = PopUpWidget(self, (0, 0), (1, 1)) + popup_widget.visible = False self.popup_text = 'Hi bob' - widgets = (self.edit, self.turn, self.log, self.map_, self.popup) write_mode = True self.view = 'map' + for w in top_widgets: + w.ensure_freshness(True) + draw_popup_if_visible = True while True: - for w in widgets: - w.ensure_freshness() - for key in self.game.to_update: - self.game.to_update[key] = False - for key in self.to_update: - self.to_update[key] = False + 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: + try: + command = self.queue.get(block=False) + except queue.Empty: + break + self.game.handle_input(command) try: key = self.stdscr.getkey() if key == 'KEY_RESIZE': curses.endwin() self.setup_screen(curses.initscr()) - for w in widgets: + for w in top_widgets: w.size = w.size_def w.ensure_freshness(True) elif key == '\t': # Tabulator key. write_mode = False if write_mode else True elif write_mode: if len(key) == 1 and key in ASCII_printable and \ - len(self.to_send) < len(self.edit): + len(self.to_send) < len(edit_line_widget): self.to_send += [key] self.to_update['edit'] = True elif key == 'KEY_BACKSPACE': @@ -482,46 +506,60 @@ class TUI: elif key == 'c': self.socket.send('TASK:MOVE DOWNRIGHT') elif key == 't': - if not self.popup.visible: + if not popup_widget.visible: self.to_update['popup'] = True - self.popup.visible = True - self.popup.reconfigure() + popup_widget.visible = True + popup_widget.reconfigure() + draw_popup_if_visible = True else: - self.popup.visible = False - self.stdscr.erase() # we'll call refresh here so - self.stdscr.refresh() # getkey doesn't, erasing screen - self.draw_screen() - for w in widgets: + popup_widget.visible = False + for w in top_widgets: w.ensure_freshness(True) elif key == 'p': - for t in self.game.world.things: - if t == self.game.world.player or \ - t.id_ in self.game.world.player_inventory: - continue - if t.position == self.game.world.player.position: - self.socket.send('TASK:PICKUP %s' % t.id_) - break + 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.game.to_update['map'] = True + 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 == 'i': + if key == 'c': self.view = 'map' elif key == 'j' and \ len(self.game.world.player_inventory) > \ - self.inventory_pointer + 1: - self.inventory_pointer += 1 - elif key == 'k' and self.inventory_pointer > 0: - self.inventory_pointer -= 1 + 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.inventory_pointer] + id_ = self.game.world.player_inventory[self.item_pointer] self.socket.send('TASK:DROP %s' % id_) - if self.inventory_pointer > 0: - self.inventory_pointer -= 1 + if self.item_pointer > 0: + self.item_pointer -= 1 else: continue - self.game.to_update['map'] = True + self.to_update['map'] = True except curses.error: pass if self.game.do_quit: @@ -531,6 +569,7 @@ class TUI: s = socket.create_connection(('127.0.0.1', 5000)) plom_socket = PlomSocket(s) game = Game() -t = threading.Thread(target=recv_loop, args=(plom_socket, game)) +q = queue.Queue() +t = threading.Thread(target=recv_loop, args=(plom_socket, game, q)) t.start() -TUI(plom_socket, game) +TUI(plom_socket, game, q)