aboutsummaryrefslogtreecommitdiff
path: root/server/area_manager.py
diff options
context:
space:
mode:
authorCerapter <cerap@protonmail.com>2018-08-10 00:09:41 +0200
committerCerapter <cerap@protonmail.com>2018-08-10 00:09:41 +0200
commit84da730bcef71aeb0d0944261a44dc289949a74d (patch)
tree950351879eef599cfea17b9df1f17a2097a248d5 /server/area_manager.py
parent0280f42f6ea2443757f0aa483322d60a5b2c0b6f (diff)
Music changing now shows your custom showname, if set.
Diffstat (limited to 'server/area_manager.py')
-rw-r--r--server/area_manager.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/server/area_manager.py b/server/area_manager.py
index 3ed543d0..99b4efd8 100644
--- a/server/area_manager.py
+++ b/server/area_manager.py
@@ -116,6 +116,14 @@ class AreaManager:
if length > 0:
self.music_looper = asyncio.get_event_loop().call_later(length,
lambda: self.play_music(name, -1, length))
+
+ def play_music_shownamed(self, name, cid, showname, length=-1):
+ self.send_command('MC', name, cid, showname)
+ if self.music_looper:
+ self.music_looper.cancel()
+ if length > 0:
+ self.music_looper = asyncio.get_event_loop().call_later(length,
+ lambda: self.play_music(name, -1, length))
def can_send_message(self, client):
@@ -159,6 +167,10 @@ class AreaManager:
self.current_music_player = client.get_char_name()
self.current_music = name
+ def add_music_playing_shownamed(self, client, showname, name):
+ self.current_music_player = showname + " (" + client.get_char_name() + ")"
+ self.current_music = name
+
def get_evidence_list(self, client):
client.evi_list, evi_list = self.evi_list.create_evi_list(client)
return evi_list