Also sit down if spawning over sittable.

[plomrogue2] / plomrogue / game.py

diff --git a/plomrogue/game.py b/plomrogue/game.py
index cfc4271935ba7ab2c420ef3cff296f36cdde3f06..95ea71dd71d4e5848924c33cd75f4d419f2eaa64 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -306,10 +306,7 @@ class Game(GameBase):
                                                            quote(t.thing_char)), c_id)
                     if hasattr(t, 'installable') and not t.portable:
                         self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
-                    if t.type_ == 'Hat':
-                        self.io.send('THING_HAT %s %s' % (t.id_,
-                                                          quote(t.design)), c_id)
-                    elif hasattr(t, 'design'):
+                    if hasattr(t, 'design'):
                         self.io.send('THING_DESIGN %s %s %s'
                                      % (t.id_, t.design_size, quote(t.design)),
                                      c_id)
@@ -349,6 +346,7 @@ class Game(GameBase):
             'thing_id': t.id_,
             'status': 'player'
         }
+        print('DEBUG LOGIN', t.name, len(self.sessions))
         self.io.send('PLAYER_ID %s' % t.id_, connection_id)
         self.io.send('LOGIN_OK', connection_id)
         self.io.send('CHAT ' + quote(t.name + ' entered the map.'))
@@ -358,6 +356,7 @@ class Game(GameBase):
             if s.temporary:
                 self.remove_thing(s)
                 break
+        t.try_to_sit()
 
     def run_tick(self):
 
@@ -376,6 +375,7 @@ class Game(GameBase):
                 spawn_point = self.add_thing('SpawnPoint', t.position)
                 spawn_point.temporary = True
                 spawn_point.name = t.name
+                print('DEBUG LEFT MAP', t.name)
                 self.remove_thing(t)
                 to_delete += [connection_id]
         for connection_id in to_delete:
@@ -559,13 +559,13 @@ class Game(GameBase):
                     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 hasattr(t, 'design'):
+                    if t.type_ != 'Hat':
+                        write(f, 'GOD_THING_DESIGN_SIZE %s %s' % (t.id_,
+                                                                  t.design_size))
+                    write(f, 'GOD_THING_DESIGN %s %s' % (t.id_, quote(t.design)))
                 if t.type_ == 'Door' and t.blocks_movement:
                     write(f, 'THING_DOOR_CLOSED %s %s' % (t.id_, int(t.locked)))
-                elif t.type_ == 'Hat':
-                    write(f, 'THING_HAT_DESIGN %s %s' % (t.id_,
-                                                         quote(t.design)))
-                elif hasattr(t, 'design'):
-                    write(f, 'GOD_THING_DESIGN %s %s' % (t.id_, quote(t.design)))
                 elif t.type_ == 'MusicPlayer':
                     write(f, 'THING_MUSICPLAYER_SETTINGS %s %s %s %s' %
                           (t.id_, int(t.playing), t.playlist_index, int(t.repeat)))