X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=c4951799002c3a2ec086bde6342cb07231c1c6f5;hb=a81ea397900267331c15c1cda5d349b22a49ea16;hp=3c927dbb7dc92e2718b08185f71e496f469694e1;hpb=0329d62bfc40ef8d54d9df8f5d9119515a871cf6;p=plomrogue2
diff --git a/plomrogue/game.py b/plomrogue/game.py
index 3c927db..c495179 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -202,8 +202,25 @@ class Game(GameBase):
def send_gamestate(self, connection_id=None):
"""Send out game state data relevant to clients."""
+ # TODO: limit to connection_id if provided
self.io.send('TURN ' + str(self.turn))
- for c_id in self.sessions:
+ from plomrogue.mapping import FovMap
+ import multiprocessing
+ pool = multiprocessing.Pool()
+ players = []
+ c_ids = [c_id for c_id in self.sessions]
+ for c_id in c_ids:
+ players += [self.get_player(c_id)]
+ player_fovs = []
+ for player in players:
+ player.prepare_multiprocessible_fov_stencil()
+ player_fovs += [player._fov]
+ new_fovs = pool.map(FovMap.init_terrain, [fov for fov in player_fovs])
+ for i in range(len(players)):
+ players[i]._fov = new_fovs[i]
+ pool.close()
+ pool.join()
+ for c_id in c_ids:
player = self.get_player(c_id)
visible_terrain = player.fov_stencil_map()
self.io.send('FOV %s' % quote(player.fov_stencil.terrain), c_id)
@@ -231,7 +248,9 @@ class Game(GameBase):
for little_yx in [little_yx for little_yx in self.annotations[big_yx]
if player.fov_test(big_yx, little_yx)]:
target_yx = player.fov_stencil.target_yx(big_yx, little_yx)
- self.io.send('ANNOTATION_HINT %s' % (target_yx,), c_id)
+ annotation = self.annotations[big_yx][little_yx]
+ self.io.send('ANNOTATION %s %s' % (target_yx,
+ quote(annotation)), c_id)
self.io.send('GAME_STATE_COMPLETE')
def run_tick(self):
@@ -265,6 +284,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 +373,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]))