import socket
import threading
from parser import ArgError, Parser
-from game import World
+import game_common
-class Thing:
- def __init__(self, id_, position, symbol):
- self.id_ = id_
- self.symbol = symbol
- self.position = position
+class MapSquare(game_common.Map):
-class Game:
- world = World()
- log_text = ''
+ 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."""
self.log_text = msg + '\n' + self.log_text
- def cmd_THING_TYPE(self, i, type_):
- t = self.world.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.world.get_thing(i)
- t.position = list(yx)
- cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
+ return symbol
- def cmd_THING_POS(self, i, yx):
- t = self.world.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."""
- self.world.set_map_size(yx)
- cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
+ 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.)"""
self.world.things = []
cmd_NEW_TURN.argtypes = 'int:nonneg'
- def cmd_TERRAIN_LINE(self, y, terrain_line):
- self.world.set_map_line(y, terrain_line)
- 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:
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')
+ 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.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]] = t.symbol
- 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_)
+ 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.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)
projects / plomrogue2-experiments / blobdiff