X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=client.py;h=6ff9c5a3aa81081cf6f78cfb802610b712e7914f;hb=b2615144de8ab4985d4b21fb8db29ddf0b6c9625;hp=0a25e4513bd0687b5731651b40de51bb585ec125;hpb=7a02f223961c532d9423433427c0e1b3e1cdb871;p=plomrogue2-experiments diff --git a/client.py b/client.py index 0a25e45..6ff9c5a 100755 --- a/client.py +++ b/client.py @@ -4,12 +4,62 @@ import plom_socket_io import socket import threading from parser import ArgError, Parser -from game_common import World, Commander +import game_common -class Game(Commander): - world = World() - log_text = '' +class MapSquare(game_common.Map): + + 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 "\n".join(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) + + +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.""" @@ -23,6 +73,11 @@ class Game(Commander): symbol = 'm' 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.)""" pass @@ -34,6 +89,10 @@ class Game(Commander): self.world.things = [] cmd_NEW_TURN.argtypes = 'int:nonneg' + 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: @@ -44,31 +103,44 @@ class WidgetManager: self.map_widget = urwid.Text('', wrap='clip') 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([edit_map, + urwid.Divider(), + turn_map, + urwid.Divider(), + log_map]) + widget_columns = urwid.Columns([(20, widget_pile), self.map_widget], + dividechars=1) + + self.top = urwid.Filler(widget_columns, valign='top') def draw_map(self): - """Draw map view from .game.terrain_map, .game.things.""" - map_lines = [] - map_size = len(self.game.world.terrain_map) - start_cut = 0 - while start_cut < map_size: - limit = start_cut + self.game.world.map_size[1] - map_lines += [self.game.world.terrain_map[start_cut:limit]] - start_cut = limit + """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: - line_as_list = list(map_lines[t.position[0]]) - line_as_list[t.position[1]] = self.game.symbol_for_type(t.type_) - map_lines[t.position[0]] = ''.join(line_as_list) - return "\n".join(map_lines) + 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) def update(self): """Redraw all non-edit widgets.""" 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()) + map_lines = self.draw_map() + new_map_text = [] + for char in map_lines: + 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] + self.map_widget.set_text(new_map_text) class EditToSocketWidget(urwid.Edit): """Extends urwid.Edit with socket to send input on 'enter' to.""" @@ -114,7 +186,10 @@ 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) + palette = [('foo', 'white', 'dark red'), + ('bar', 'white', 'dark blue'), + ('baz', 'white', 'dark green')] + self.urwid_loop = urwid.MainLoop(self.widget_manager.top, palette) self.urwid_pipe_write_fd = self.urwid_loop.watch_pipe(self. handle_input) self.recv_loop_thread = threading.Thread(target=self.recv_loop)