Add music player.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index a92359eac8c2fcab197ea9ea42d2cd2de72b9a40..0638cb86e7517445511873a678feed95ad89d368 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -22,47 +22,10 @@ def cmd_TERRAINS(game, connection_id):
 cmd_TERRAINS.argtypes = ''
 
 def cmd_ALL(game, msg, connection_id):
-    from plomrogue.mapping import DijkstraMap
-
-    def lower_msg_by_volume(msg, volume, largest_audible_distance):
-        import random
-        factor = largest_audible_distance / 4
-        lowered_msg = ''
-        for c in msg:
-            c = c
-            while random.random() > volume * factor:
-                if c.isupper():
-                    c = c.lower()
-                elif c != '.' and c != ' ':
-                    c = '.'
-                else:
-                    c = ' '
-            lowered_msg += c
-        return lowered_msg
-
     speaker = game.get_player(connection_id)
     if not speaker:
         raise GameError('need to be logged in for this')
-    largest_audible_distance = 20
-    things = [t for t in game.things if t.type_ != 'Player']
-    dijkstra_map = DijkstraMap(things, game.maps, speaker.position,
-                               largest_audible_distance, game.get_map)
-    for c_id in game.sessions:
-        listener = game.get_player(c_id)
-        target_yx = dijkstra_map.target_yx(*listener.position, True)
-        if not target_yx:
-            continue
-        listener_distance = dijkstra_map[target_yx]
-        if listener_distance > largest_audible_distance:
-            continue
-        volume = 1 / max(1, listener_distance)
-        lowered_msg = lower_msg_by_volume(msg, volume, largest_audible_distance)
-        lowered_nick = lower_msg_by_volume(speaker.name, volume,
-                                           largest_audible_distance)
-        game.io.send('CHAT ' +
-                     quote('(volume: %.2f) %s: %s' % (volume, lowered_nick,
-                                                      lowered_msg)),
-                     c_id)
+    speaker.sound(speaker.name, msg)
 cmd_ALL.argtypes = 'string'
 
 def cmd_SPAWN_POINT(game, big_yx, little_yx):
@@ -322,3 +285,23 @@ def cmd_THING_DOOR_CLOSED(game, thing_id):
     t.portable = False
     t.thing_char = '#'
 cmd_THING_DOOR_CLOSED.argtypes = 'int:pos'
+
+def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat):
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    if not t.type_ == 'MusicPlayer':
+        raise GameError('thing of ID %s not music player' % thing_id)
+    t.playing = playing
+    t.playlist_index = index
+    t.repeat = repeat
+cmd_THING_MUSICPLAYER_SETTINGS.argtypes = 'int:pos bool int:nonneg bool'
+
+def cmd_THING_MUSICPLAYER_PLAYLIST_ITEM(game, thing_id, title, length):
+    t = game.get_thing(thing_id)
+    if not t:
+        raise GameError('thing of ID %s not found' % thing_id)
+    if not t.type_ == 'MusicPlayer':
+        raise GameError('thing of ID %s not music player' % thing_id)
+    t.playlist += [(title, length)]
+cmd_THING_MUSICPLAYER_PLAYLIST_ITEM.argtypes = 'int:pos string int:pos'