Merge branch 'mc'

roomlist.coffee

@@ -9,7 +9,7 @@ room_data = (room)->
   title: room.title,
   user: {username: room.username}
   users: ({username: client.name, position: client.pos} for client in room.players),
-  options: room.hostinfo,
+  options: room.get_old_hostinfo(), # Should be updated when MyCard client updates
   arena: settings.modules.arena_mode.enabled && room.arena && settings.modules.arena_mode.mode
 
 init = (http_server, ROOM_all)->

roomlist.js

@@ -31,7 +31,7 @@
         }
         return results;
       })(),
-      options: room.hostinfo,
+      options: room.get_old_hostinfo(),
       arena: settings.modules.arena_mode.enabled && room.arena && settings.modules.arena_mode.mode
     };
   };

ygopro-server.coffee

@@ -1453,6 +1453,11 @@ class Room
         challonge_duel_log.scoresCsv = "0-0"
     return challonge_duel_log
 
+  get_old_hostinfo: () -> # Just for supporting websocket roomlist in old MyCard client....
+    ret = _.clone(@hostinfo)
+    ret.enable_priority = (@hostinfo.duel_rule == 4)
+    return ret
+
   send_replays: () ->
     return false unless settings.modules.replay_delay and @replays.length and @hostinfo.mode == 1
     for player in @players

ygopro-server.js

@@ -1896,6 +1896,13 @@
       return challonge_duel_log;
     };
 
+    Room.prototype.get_old_hostinfo = function() {
+      var ret;
+      ret = _.clone(this.hostinfo);
+      ret.enable_priority = this.hostinfo.duel_rule === 4;
+      return ret;
+    };
+
     Room.prototype.send_replays = function() {
       var len2, len3, m, n, player, ref3, ref4;
       if (!(settings.modules.replay_delay && this.replays.length && this.hostinfo.mode === 1)) {