Turn Consumable into Bottle that may be full or empty.

[plomrogue2] / plomrogue / game.py

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 3c927dbb7dc92e2718b08185f71e496f469694e1..453ee30dd84f968b6f3555b09f6d428722bb31c3 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -265,6 +265,8 @@ class Game(GameBase):
                         self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id)
         if self.changed:
             self.turn += 1
+            # send_gamestate() can be rather expensive, due to among other reasons
+            # re-calculating each player's FOV, so don't send it out too often
             if self.last_send_gamestate < \
                datetime.datetime.now() -self.send_gamestate_interval:
                 self.send_gamestate()
@@ -352,6 +354,14 @@ class Game(GameBase):
                     write(f, 'GOD_THING_NAME %s %s' % (t.id_, quote(t.name)))
                 if t.type_ == 'Door' and t.blocking:
                     write(f, 'THING_DOOR_CLOSED %s' % t.id_)
+                elif t.type_ == 'MusicPlayer':
+                    write(f, 'THING_MUSICPLAYER_SETTINGS %s %s %s %s' %
+                          (t.id_, int(t.playing), t.playlist_index, int(t.repeat)))
+                    for item in t.playlist:
+                        write(f, 'THING_MUSICPLAYER_PLAYLIST_ITEM %s %s %s' %
+                              (t.id_, quote(item[0]), item[1]))
+                elif t.type_ == 'Bottle' and not t.full:
+                    write(f, 'THING_BOTTLE_EMPTY %s' % t.id_)
             write(f, 'SPAWN_POINT %s %s' % (self.spawn_point[0],
                                             self.spawn_point[1]))