X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fexample_client.py;h=4e61c51aaf8679403cbfa34e6837ec7f9bae4413;hb=d78993c5566a9b206ab1ed835ebf7d4d19c66335;hp=66c2bf651ea777d77f1ed48dd9f155c836287dde;hpb=e08cc5e251e260b969e374b610b09d3b8fdc4f9f;p=plomrogue2-experiments diff --git a/new/example_client.py b/new/example_client.py index 66c2bf6..4e61c51 100755 --- a/new/example_client.py +++ b/new/example_client.py @@ -106,6 +106,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 +119,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 +197,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 +205,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 @@ -259,19 +260,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): @@ -308,20 +311,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,7 +332,23 @@ class MapWidget(Widget): to_join += [line + ' '*to_pad] self.safe_write((''.join(to_join), curses.color_pair(3))) - def draw_map(self): + +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 draw(self): def terrain_with_objects(): terrain_as_list = list(self.tui.game.world.map_.terrain[:]) @@ -423,16 +431,45 @@ class TUI: self.parser = Parser(self.game) self.to_update = {} self.item_pointer = 0 - self.top_widgets = [] 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) + 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 + + 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) @@ -446,18 +483,25 @@ class TUI: 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']) - 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, 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 +514,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,7 +532,17 @@ class TUI: self.socket.send(''.join(self.to_send)) self.to_send[:] = [] self.to_update['edit'] = True - elif self.view == 'map': + 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') elif key == 'e': @@ -501,60 +555,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() - 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' + switch_widgets(map_widget, pickable_items_widget) 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 + switch_widgets(map_widget, inventory_widget) + 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: