X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Fplomrogue%2Fgame.py;h=68bcb65ccd98ff456512a97071b541addc637b6f;hb=HEAD;hp=d90aa0b0f8a47350536244d7f3fab39ffdb01fce;hpb=61e7b58cf8be7a0c24d78a1336e54fdbf088deea;p=plomrogue2-experiments diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py index d90aa0b..68bcb65 100755 --- a/new2/plomrogue/game.py +++ b/new2/plomrogue/game.py @@ -1,12 +1,9 @@ from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_FLATTEN_SURROUNDINGS) from plomrogue.errors import GameError, PlayError -from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING, - cmd_TURN, cmd_MAP_LINE, cmd_MAP, cmd_GET_ANNOTATION, - cmd_ANNOTATE, cmd_GET_GAMESTATE) from plomrogue.io import GameIO from plomrogue.misc import quote -from plomrogue.things import Thing, ThingPlayer +from plomrogue.things import Thing, ThingPlayer from plomrogue.mapping import YX, MapGeometrySquare, Map @@ -14,9 +11,10 @@ from plomrogue.mapping import YX, MapGeometrySquare, Map class GameBase: def __init__(self): - pass self.turn = 0 self.things = [] + self.map_geometry = MapGeometrySquare(YX(24, 40)) + self.commands = {} def get_thing(self, id_, create_unfound): # No default for create_unfound because every call to get_thing @@ -30,65 +28,78 @@ class GameBase: return t return None + def register_command(self, command): + prefix = 'cmd_' + if not command.__name__.startswith(prefix): + raise GameError('illegal command object name: %s' % command.__name__) + command_name = command.__name__[len(prefix):] + self.commands[command_name] = command + +import os class Game(GameBase): def __init__(self, save_file, *args, **kwargs): - import os super().__init__(*args, **kwargs) self.changed = True self.io = GameIO(self, save_file) - self.tasks = {'WAIT': Task_WAIT, - 'MOVE': Task_MOVE, - 'WRITE': Task_WRITE, - 'FLATTEN_SURROUNDINGS': Task_FLATTEN_SURROUNDINGS} - self.map_geometry = MapGeometrySquare(YX(24, 40)) - self.commands = {'QUERY': cmd_QUERY, - 'ALL': cmd_ALL, - 'LOGIN': cmd_LOGIN, - 'TURN': cmd_TURN, - 'MAP_LINE': cmd_MAP_LINE, - 'GET_ANNOTATION': cmd_GET_ANNOTATION, - 'GET_GAMESTATE': cmd_GET_GAMESTATE, - 'ANNOTATE': cmd_ANNOTATE, - 'MAP': cmd_MAP, - 'PING': cmd_PING} + self.tasks = {} self.thing_type = Thing self.thing_types = {'player': ThingPlayer} self.sessions = {} self.map = Map(self.map_geometry.size) self.annotations = {} + self.portals = {} if os.path.exists(self.io.save_file): if not os.path.isfile(self.io.save_file): raise GameError('save file path refers to non-file') - else: - with open(self.io.save_file, 'r') as f: - lines = f.readlines() - for i in range(len(lines)): - line = lines[i] - print("FILE INPUT LINE %5s: %s" % (i, line), end='') - self.io.handle_input(line, god_mode=True) + + def register_task(self, task): + prefix = 'Task_' + if not task.__name__.startswith(prefix): + raise GameError('illegal task object name: %s' % task.__name__) + task_name = task.__name__[len(prefix):] + self.tasks[task_name] = task + + def read_savefile(self): + if os.path.exists(self.io.save_file): + with open(self.io.save_file, 'r') as f: + lines = f.readlines() + for i in range(len(lines)): + line = lines[i] + print("FILE INPUT LINE %5s: %s" % (i, line), end='') + self.io.handle_input(line, god_mode=True) def get_string_options(self, string_option_type): import string if string_option_type == 'direction': return self.map_geometry.get_directions() - if string_option_type == 'char': + elif string_option_type == 'char': return [c for c in string.digits + string.ascii_letters + string.punctuation + ' '] + elif string_option_type == 'map_geometry': + return ['Hex', 'Square'] return None + def get_map_geometry_shape(self): + return self.map_geometry.__class__.__name__[len('MapGeometry'):] + def send_gamestate(self, connection_id=None): """Send out game state data relevant to clients.""" def send_thing(thing): self.io.send('THING_POS %s %s' % (thing.id_, t.position)) + if hasattr(thing, 'nickname'): + self.io.send('THING_NAME %s %s' % (thing.id_, quote(t.nickname))) self.io.send('TURN ' + str(self.turn)) for t in self.things: send_thing(t) - self.io.send('MAP %s %s' % (self.map_geometry.size, quote(self.map.terrain))) + self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(), + self.map_geometry.size, quote(self.map.terrain))) + for yx in self.portals: + self.io.send('PORTAL %s %s' % (yx, quote(self.portals[yx]))) self.io.send('GAME_STATE_COMPLETE') def run_tick(self): @@ -101,6 +112,8 @@ class Game(GameBase): break if not connection_id_found: t = self.get_thing(self.sessions[connection_id], create_unfound=False) + if hasattr(t, 'nickname'): + self.io.send('CHAT ' + quote(t.nickname + ' left the map.')) self.things.remove(t) to_delete += [connection_id] for connection_id in to_delete: @@ -173,14 +186,18 @@ class Game(GameBase): f.write(msg + '\n') with open(self.io.save_file, 'w') as f: + # TODO: save tasks write(f, 'TURN %s' % self.turn) - write(f, 'MAP %s' % (self.map_geometry.size,)) + map_geometry_shape = self.get_map_geometry_shape() + write(f, 'MAP %s %s' % (map_geometry_shape, self.map_geometry.size,)) for y, line in self.map.lines(): write(f, 'MAP_LINE %5s %s' % (y, quote(line))) for yx in self.annotations: write(f, 'ANNOTATE %s %s' % (yx, quote(self.annotations[yx]))) + for yx in self.portals: + write(f, 'PORTAL %s %s' % (yx, quote(self.portals[yx]))) - def new_world(self, size): - self.map_geometry = MapGeometrySquare(YX(size.y, size.x)) + def new_world(self, map_geometry): + self.map_geometry = map_geometry self.map = Map(self.map_geometry.size) self.annotations = {}