X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=017580f24e4cb28ef98062f4d11026b2a02894ca;hb=c7a3af00680ba0449310bbb7336a187dd4ed6bcf;hp=a1c2ee641cc1dcfefd8797b284676095ab69e83b;hpb=722f6c3effe9aedf6c71678260a6976d30fb21ed;p=plomrogue2

diff --git a/plomrogue/game.py b/plomrogue/game.py
index a1c2ee6..017580f 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -121,6 +121,7 @@ class Game(GameBase):
         self.tasks = {}
         self.thing_types = {}
         self.sessions = {}
+        self.faces = {}
         self.maps = {}
         self.map_controls = {}
         self.map_control_passwords = {}
@@ -199,6 +200,14 @@ class Game(GameBase):
         player = self.get_thing(self.sessions[connection_id]['thing_id'])
         return player
 
+    def get_face(self, t):
+        if t.type_ == 'Player':
+            if t.name in self.faces:
+                return self.faces[t.name]
+            else:
+                return 'O O' + ' v ' + '>-<'
+        return None
+
     def send_gamestate(self, connection_id=None):
         """Send out game state data relevant to clients."""
 
@@ -231,13 +240,22 @@ class Game(GameBase):
             self.io.send('MAP_CONTROL %s' % quote(visible_control), c_id)
             for t in [t for t in self.things if player.fov_test(*t.position)]:
                 target_yx = player.fov_stencil.target_yx(*t.position)
-                self.io.send('THING %s %s %s %s' % (target_yx, t.type_,
-                                                    quote(t.protection), t.id_), c_id)
+                self.io.send('THING %s %s %s %s %s' % (target_yx, t.type_,
+                                                       quote(t.protection),
+                                                       t.id_, int(t.portable)),
+                             c_id)
                 if hasattr(t, 'name'):
                     self.io.send('THING_NAME %s %s' % (t.id_, quote(t.name)), c_id)
+                face = self.get_face(t)
+                if face:
+                    self.io.send('THING_FACE %s %s' % (t.id_, quote(face)), c_id)
                 if hasattr(t, 'thing_char'):
                     self.io.send('THING_CHAR %s %s' % (t.id_,
                                                        quote(t.thing_char)), c_id)
+                if hasattr(t, 'carrying') and t.carrying:
+                    self.io.send('THING_CARRYING %s' % (t.id_), c_id)
+                if hasattr(t, 'installable') and not t.portable:
+                    self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
             for big_yx in self.portals:
                 for little_yx in [little_yx for little_yx in self.portals[big_yx]
                                   if player.fov_test(big_yx, little_yx)]:
@@ -365,12 +383,17 @@ class Game(GameBase):
                                                    self.map_control_passwords[tile_class]))
             for pw in self.admin_passwords:
                 write(f, 'ADMIN_PASSWORD %s' % pw)
+            for name in self.faces:
+                write(f, 'GOD_PLAYER_FACE %s %s' % (quote(name),
+                                                    quote(self.faces[name])))
             for t in [t for t in self.things if not t.type_ == 'Player']:
                 write(f, 'THING %s %s %s %s' % (t.position[0],
                                                 t.position[1], t.type_, t.id_))
                 write(f, 'GOD_THING_PROTECTION %s %s' % (t.id_, quote(t.protection)))
                 if hasattr(t, 'name'):
                     write(f, 'GOD_THING_NAME %s %s' % (t.id_, quote(t.name)))
+                if hasattr(t, 'installable') and (not t.portable):
+                    write(f, 'THING_INSTALLED %s' % t.id_)
                 if t.type_ == 'Door' and t.blocking:
                     write(f, 'THING_DOOR_CLOSED %s' % t.id_)
                 elif t.type_ == 'MusicPlayer':