X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Fplomrogue%2Fgame.py;h=0c09b01d07206e2b44c5c3c2b6bb6c9e6a924041;hb=1fcb132eabcaa1a95bf2b527dc18c92c15016d2a;hp=52e0d600e37b2f90fcc3209d704c2d0866f330e2;hpb=fee7032748faad3feab219c88c75ec79725ed62c;p=plomrogue2-experiments diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py index 52e0d60..0c09b01 100755 --- a/new2/plomrogue/game.py +++ b/new2/plomrogue/game.py @@ -1,11 +1,12 @@ from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_FLATTEN_SURROUNDINGS) -from plomrogue.errors import GameError -from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING, - cmd_TURN, cmd_MAP_LINE, cmd_MAP) +from plomrogue.errors import GameError, PlayError +from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING, cmd_MAP, + cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION, + cmd_ANNOTATE, cmd_PORTAL, 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 @@ -13,9 +14,9 @@ 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)) def get_thing(self, id_, create_unfound): # No default for create_unfound because every call to get_thing @@ -42,18 +43,23 @@ class Game(GameBase): '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, + 'PORTAL': cmd_PORTAL, + 'GET_GAMESTATE': cmd_GET_GAMESTATE, + 'ANNOTATE': cmd_ANNOTATE, 'MAP': cmd_MAP, 'PING': cmd_PING} 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') @@ -63,39 +69,54 @@ class Game(GameBase): for i in range(len(lines)): line = lines[i] print("FILE INPUT LINE %5s: %s" % (i, line), end='') - self.io.handle_input(line) + 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] + 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): to_delete = [] for connection_id in self.sessions: - if not connection_id in self.io.server.clients: + connection_id_found = False + for server in self.io.servers: + if connection_id in server.clients: + connection_id_found = True + break + if not connection_id_found: t = self.get_thing(self.sessions[connection_id], create_unfound=False) self.things.remove(t) to_delete += [connection_id] for connection_id in to_delete: del self.sessions[connection_id] - self.changed = True + self.changed = True for t in [t for t in self.things]: if t in self.things: try: @@ -104,6 +125,10 @@ class Game(GameBase): for connection_id in [c_id for c_id in self.sessions if self.sessions[c_id] == t.id_]: self.io.send('GAME_ERROR ' + quote(str(e)), connection_id) + except PlayError as e: + for connection_id in [c_id for c_id in self.sessions + if self.sessions[c_id] == t.id_]: + self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id) if self.changed: self.turn += 1 self.send_gamestate() @@ -160,10 +185,16 @@ class Game(GameBase): with open(self.io.save_file, 'w') as f: 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_map(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 = {}