X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Fplomrogue%2Fgame.py;h=5e33bc49cedc7a408fdb9f5a37415c5bf85346c9;hb=0bf56a0fb35d60fa2ade7ea661ed5a68f426fa66;hp=2d71ac3e5089beec9117ad84dd20513f6d06d9bc;hpb=40681bd38201ef0caf64a979c97318b090f5cbc0;p=plomrogue2-experiments

diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index 2d71ac3..5e33bc4 100755
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -3,10 +3,10 @@ from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
 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)
+                                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
 
 
@@ -14,7 +14,6 @@ from plomrogue.mapping import YX, MapGeometrySquare, Map
 class GameBase:
 
     def __init__(self):
-        pass
         self.turn = 0
         self.things = []
 
@@ -50,6 +49,7 @@ class Game(GameBase):
                          '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,
@@ -59,6 +59,7 @@ class Game(GameBase):
         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')
@@ -84,23 +85,33 @@ class Game(GameBase):
 
         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)))
+        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:
@@ -174,6 +185,8 @@ class Game(GameBase):
               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))