import socket
import threading
from parser import ArgError, Parser
-from game_common import World
+from game_common import World, Commander
-class Thing:
- def __init__(self, id_, position, symbol):
- self.id_ = id_
- self.symbol = symbol
- self.position = position
-
-class Game:
+class Game(Commander):
world = World()
log_text = ''
"""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'
-
- 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_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.top = urwid.Filler(widget_pile, valign='top')
def draw_map(self):
- """Draw map view from .game.terrain_map, .game.things."""
+ """Draw map view from .game.map_.terrain, .game.things."""
map_lines = []
- map_size = len(self.game.world.terrain_map)
+ map_size = len(self.game.world.map_.terrain)
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]]
+ limit = start_cut + self.game.world.map_.size[1]
+ map_lines += [self.game.world.map_.terrain[start_cut:limit]]
start_cut = limit
for t in self.game.world.things:
line_as_list = list(map_lines[t.position[0]])
- line_as_list[t.position[1]] = t.symbol
+ 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)