import socket
import threading
from parser import ArgError, Parser
-from game_common import World, Commander
+import game_common
-class Game(Commander):
+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.game.world.map_.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)
+
+
+class World(game_common.World):
+
+ def __init__(self, *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.MapHex = MapHex
+ self.MapSquare = MapSquare
+ self.map_ = self.MapHex()
+
+
+class Game(game_common.CommonCommandsMixin):
world = World()
log_text = ''
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
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:
self.top = urwid.Filler(widget_pile, 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."""