X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client.py;h=6e22d0006f4d911d06c1373faf968a836b17a206;hb=5f2e6342f11b5fd438f4c3d60f48f0bd08f32590;hp=c5d6fcde99000d5972cd9d0a4b3c93a5737ed25b;hpb=ca1257ec655f95611de1cbbac2814509d23f6116;p=plomrogue2-experiments diff --git a/client.py b/client.py index c5d6fcd..6e22d00 100755 --- a/client.py +++ b/client.py @@ -4,61 +4,79 @@ import plom_socket_io import socket import threading from parser import ArgError, Parser +import game_common -class Game: - turn = 0 - log_text = '' - map_size = (0, 0) - terrain_map = '' - things = [] +class MapSquare(game_common.Map): - class Thing: - def __init__(self, id_, position, symbol): - self.id_ = id_ - self.position = position - self.symbol = symbol + def list_terrain_to_lines(self, terrain_as_list): + terrain = ''.join(terrain_as_list) + map_lines = [] + start_cut = 0 + while start_cut < len(terrain): + limit = start_cut + self.size[1] + map_lines += [terrain[start_cut:limit]] + start_cut = limit + return map_lines + + +class MapHex(game_common.Map): + + def list_terrain_to_lines(self, terrain_as_list): + new_terrain_list = [' '] + x = 0 + y = 0 + for c in terrain_as_list: + new_terrain_list += [c, ' '] + x += 1 + if x == self.size[1]: + new_terrain_list += ['\n'] + x = 0 + y += 1 + if y % 2 == 0: + new_terrain_list += [' '] + return ''.join(new_terrain_list).split('\n') + + +map_manager = game_common.MapManager(globals()) + + +class World(game_common.World): + + def __init__(self, game, *args, **kwargs): + """Extend original with local classes and empty default map. + + We need the empty default map because we draw the map widget + on any update, even before we actually receive map data. + """ + super().__init__(*args, **kwargs) + self.game = game + self.map_ = self.game.map_manager.get_map_class('Hex')() + + +class Game(game_common.CommonCommandsMixin): + + def __init__(self): + self.map_manager = map_manager + self.world = World(self) + self.log_text = '' def log(self, msg): """Prefix msg plus newline to self.log_text.""" self.log_text = msg + '\n' + self.log_text - def get_thing(self, i): - for thing in self.things: - if i == thing.id_: - return thing - t = self.Thing(i, [0,0], '?') - self.things += [t] - return t - - def cmd_THING_TYPE(self, i, type_): - t = self.get_thing(i) + def symbol_for_type(self, type_): symbol = '?' if type_ == 'human': symbol = '@' elif type_ == 'monster': symbol = 'm' - t.symbol = symbol - cmd_THING_TYPE.argtypes = 'int:nonneg string' - - def cmd_THING_POS(self, i, yx): - t = self.get_thing(i) - t.position = list(yx) - cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg' - - def cmd_THING_POS(self, i, yx): - t = self.get_thing(i) - t.position = list(yx) - cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg' - - def cmd_MAP_SIZE(self, yx): - """Set self.map_size to yx, redraw self.terrain_map as '?' cells.""" - y, x = yx - self.map_size = (y, x) - self.terrain_map = '' - for y in range(self.map_size[0]): - self.terrain_map += '?' * self.map_size[1] - cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg' + return symbol + + def cmd_LAST_PLAYER_TASK_RESULT(self, msg): + if msg != "success": + self.log_text = msg + '\n' + self.log_text + cmd_LAST_PLAYER_TASK_RESULT.argtypes = 'string' def cmd_TURN_FINISHED(self, n): """Do nothing. (This may be extended later.)""" @@ -67,20 +85,13 @@ class Game: def cmd_NEW_TURN(self, n): """Set self.turn to n, empty self.things.""" - self.turn = n - self.things = [] + self.world.turn = n + self.world.things = [] cmd_NEW_TURN.argtypes = 'int:nonneg' - def cmd_TERRAIN_LINE(self, y, terrain_line): - width_map = self.map_size[1] - if y >= self.map_size[0]: - raise ArgError('too large row number %s' % y) - width_line = len(terrain_line) - if width_line > width_map: - raise ArgError('too large map line width %s' % width_line) - self.terrain_map = self.terrain_map[:y * width_map] + \ - terrain_line + self.terrain_map[(y + 1) * width_map:] - cmd_TERRAIN_LINE.argtypes = 'int:nonneg string' + def cmd_VISIBLE_MAP_LINE(self, y, terrain_line): + self.world.map_.set_line(y, terrain_line) + cmd_VISIBLE_MAP_LINE.argtypes = 'int:nonneg string' class WidgetManager: @@ -89,34 +100,50 @@ class WidgetManager: """Set up all urwid widgets we want on the screen.""" self.game = game edit_widget = self.EditToSocketWidget(socket, 'SEND: ') - self.map_widget = urwid.Text('', wrap='clip') + self.map_widget = self.MapWidget() self.turn_widget = urwid.Text('') self.log_widget = urwid.Text('') - map_box = urwid.Padding(self.map_widget, width=50) - widget_pile = urwid.Pile([edit_widget, map_box, self.turn_widget, - self.log_widget]) - self.top = urwid.Filler(widget_pile, valign='top') + edit_map = urwid.AttrMap(edit_widget, 'foo') + turn_map = urwid.AttrMap(self.turn_widget, 'bar') + log_map = urwid.AttrMap(self.log_widget, 'baz') + widget_pile = urwid.Pile([('pack', edit_map), + ('pack', urwid.Divider()), + ('pack', turn_map), + ('pack', urwid.Divider()), + ('pack', log_map), + urwid.SolidFill(fill_char=' ')]) + self.top = urwid.Columns([(20, widget_pile), self.map_widget], + dividechars=1) + self.palette = [('foo', 'white', 'dark red'), + ('bar', 'white', 'dark blue'), + ('baz', 'white', 'dark green')] def draw_map(self): - """Draw map view from .game.terrain_map, .game.things.""" - map_lines = [] - map_size = len(self.game.terrain_map) - start_cut = 0 - while start_cut < map_size: - limit = start_cut + self.game.map_size[1] - map_lines += [self.game.terrain_map[start_cut:limit]] - start_cut = limit - for t in self.game.things: - line_as_list = list(map_lines[t.position[0]]) - line_as_list[t.position[1]] = t.symbol - map_lines[t.position[0]] = ''.join(line_as_list) - return "\n".join(map_lines) + """Draw map view from .game.map_.terrain, .game.things.""" + terrain_as_list = list(self.game.world.map_.terrain[:]) + for t in self.game.world.things: + pos_i = self.game.world.map_.get_position_index(t.position) + terrain_as_list[pos_i] = self.game.symbol_for_type(t.type_) + return self.game.world.map_.list_terrain_to_lines(terrain_as_list) + #text = self.game.world.map_.list_terrain_to_lines(terrain_as_list) + #new_map_text = [] + #for char in text: + # if char == '.': + # new_map_text += [('foo', char)] + # elif char in {'x', 'X', '#'}: + # new_map_text += [('bar', char)] + # elif char in {'@', 'm'}: + # new_map_text += [('baz', char)] + # else: + # new_map_text += [char] + #return new_map_text def update(self): """Redraw all non-edit widgets.""" - self.turn_widget.set_text('TURN: ' + str(self.game.turn)) + self.turn_widget.set_text('TURN: ' + str(self.game.world.turn)) self.log_widget.set_text(self.game.log_text) - self.map_widget.set_text(self.draw_map()) + self.map_widget.text = self.draw_map() + self.map_widget._invalidate() class EditToSocketWidget(urwid.Edit): """Extends urwid.Edit with socket to send input on 'enter' to.""" @@ -132,6 +159,27 @@ class WidgetManager: plom_socket_io.send(self.socket, self.edit_text) self.edit_text = '' + class MapWidget(urwid.Widget): + _sizing = frozenset(['box']) + text = [''] + + def render(self, size, focus=False): + maxcol, maxrow = size + content = [] + for y in range(len(self.text)): + if y < maxrow: + line = self.text[y] + if len(line) < maxcol: + line = line + '0' * (maxcol - len(line)) + else: + line = line[:maxcol] + content += [line.encode('utf-8')] + padding_y = maxrow - len(content) + if padding_y > 0: + for y in range(padding_y): + content += ['0'.encode('utf-8') * maxcol] + return urwid.TextCanvas(content) + class PlomRogueClient: @@ -162,7 +210,8 @@ class PlomRogueClient: self.socket = socket self.widget_manager = WidgetManager(self.socket, self.game) self.server_output = [] - self.urwid_loop = urwid.MainLoop(self.widget_manager.top) + self.urwid_loop = urwid.MainLoop(self.widget_manager.top, + self.widget_manager.palette) self.urwid_pipe_write_fd = self.urwid_loop.watch_pipe(self. handle_input) self.recv_loop_thread = threading.Thread(target=self.recv_loop)