Merge branch 'master' into tcg_random

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

@@ -1489,6 +1489,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
@@ -3150,7 +3155,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)->
   return unless room
   msg = _.trim(info.msg)
   cancel = _.startsWith(msg, "/")
-  room.last_active_time = moment() unless cancel or not (room.random_type or room.arena)
+  room.last_active_time = moment() unless cancel or not (room.random_type or room.arena) or room.duel_stage == ygopro.constants.DUEL_STAGE.FINGER or room.duel_stage == ygopro.constants.DUEL_STAGE.FIRSTGO or room.duel_stage == ygopro.constants.DUEL_STAGE.SIDING
   cmd = msg.split(' ')
   switch cmd[0]
     when '/投降', '/surrender'
@@ -3718,7 +3723,7 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server, datas)->
 
 if settings.modules.random_duel.enabled
   setInterval ()->
-    for room in ROOM_all when room and room.duel_stage != ygopro.constants.DUEL_STAGE.BEGIN and room.random_type and room.last_active_time and room.waiting_for_player and room.get_disconnected_count() == 0
+    for room in ROOM_all when room and room.duel_stage != ygopro.constants.DUEL_STAGE.BEGIN and room.random_type and room.last_active_time and room.waiting_for_player and room.get_disconnected_count() == 0 and (!settings.modules.side_timeout or room.duel_stage != ygopro.constants.DUEL_STAGE.SIDING)
       time_passed = Math.floor((moment() - room.last_active_time) / 1000)
       #log.info time_passed
       if time_passed >= settings.modules.random_duel.hang_timeout
@@ -3737,7 +3742,7 @@ if settings.modules.random_duel.enabled
 
 if settings.modules.mycard.enabled
   setInterval ()->
-    for room in ROOM_all when room and room.duel_stage != ygopro.constants.DUEL_STAGE.BEGIN and room.arena and room.last_active_time and room.waiting_for_player and room.get_disconnected_count() == 0
+    for room in ROOM_all when room and room.duel_stage != ygopro.constants.DUEL_STAGE.BEGIN and room.arena and room.last_active_time and room.waiting_for_player and room.get_disconnected_count() == 0 and (!settings.modules.side_timeout or room.duel_stage != ygopro.constants.DUEL_STAGE.SIDING)
       time_passed = Math.floor((moment() - room.last_active_time) / 1000)
       #log.info time_passed
       if time_passed >= settings.modules.random_duel.hang_timeout

ygopro-server.js

@@ -1940,6 +1940,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)) {
@@ -4066,7 +4073,7 @@
     }
     msg = _.trim(info.msg);
     cancel = _.startsWith(msg, "/");
-    if (!(cancel || !(room.random_type || room.arena))) {
+    if (!(cancel || !(room.random_type || room.arena) || room.duel_stage === ygopro.constants.DUEL_STAGE.FINGER || room.duel_stage === ygopro.constants.DUEL_STAGE.FIRSTGO || room.duel_stage === ygopro.constants.DUEL_STAGE.SIDING)) {
       room.last_active_time = moment();
     }
     cmd = msg.split(' ');
@@ -4847,7 +4854,7 @@
       var len2, m, room, time_passed;
       for (m = 0, len2 = ROOM_all.length; m < len2; m++) {
         room = ROOM_all[m];
-        if (!(room && room.duel_stage !== ygopro.constants.DUEL_STAGE.BEGIN && room.random_type && room.last_active_time && room.waiting_for_player && room.get_disconnected_count() === 0)) {
+        if (!(room && room.duel_stage !== ygopro.constants.DUEL_STAGE.BEGIN && room.random_type && room.last_active_time && room.waiting_for_player && room.get_disconnected_count() === 0 && (!settings.modules.side_timeout || room.duel_stage !== ygopro.constants.DUEL_STAGE.SIDING))) {
           continue;
         }
         time_passed = Math.floor((moment() - room.last_active_time) / 1000);
@@ -4871,7 +4878,7 @@
       var len2, len3, m, n, player, room, time_passed, waited_time;
       for (m = 0, len2 = ROOM_all.length; m < len2; m++) {
         room = ROOM_all[m];
-        if (!(room && room.duel_stage !== ygopro.constants.DUEL_STAGE.BEGIN && room.arena && room.last_active_time && room.waiting_for_player && room.get_disconnected_count() === 0)) {
+        if (!(room && room.duel_stage !== ygopro.constants.DUEL_STAGE.BEGIN && room.arena && room.last_active_time && room.waiting_for_player && room.get_disconnected_count() === 0 && (!settings.modules.side_timeout || room.duel_stage !== ygopro.constants.DUEL_STAGE.SIDING))) {
           continue;
         }
         time_passed = Math.floor((moment() - room.last_active_time) / 1000);