Merge branch 'replay_delay' into replay_delay_koishi

data/default_config.json

@@ -21,6 +21,7 @@
     "stop": false,
     "side_timeout": false,
     "tag_duel_surrender": true,
+    "replay_delay": false,
     "i18n": {
       "auto_pick": false,
       "default": "zh-cn",

data/i18n.json

@@ -186,6 +186,8 @@
     "vip_set_victory": "Your victory word have been set.",
     "vip_password_changed": "Password changed.",
     "vip_player_name_too_long": "Your username or password is too long to log in. Please change your username and try again.",
+    "replay_hint_part1": "Sending the replay of the duel number ",
+    "replay_hint_part2": ".",
     "athletic_arena_tip": "During an athletic match, a game quit behavior is regarded as a surrender."
   },
   "es-es": {
@@ -519,6 +521,8 @@
     "vip_set_victory": "已设置胜利台词。",
     "vip_password_changed": "密码修改成功。",
     "vip_player_name_too_long": "你的用户名或设置的密码太长，使用此用户名可能会无法登陆。请更换用户名重试。",
+    "replay_hint_part1": "正在发送第",
+    "replay_hint_part2": "局决斗的录像。",
     "athletic_arena_tip": "在竞技匹配中，比赛开始前退出游戏也会视为投降。"
   },
  "ko-kr": {

ygopro-server.coffee

@@ -981,6 +981,15 @@ CLIENT_get_partner = (client) ->
   else
     return room.dueling_players[5 - client.pos]
 
+CLIENT_send_replays = (client, room) ->
+  return false unless settings.modules.replay_delay and room.replays.length and room.hostinfo.mode == 1
+  i = 0
+  for buffer in room.replays
+    ++i
+    ygopro.stoc_send_chat(client, "${replay_hint_part1}" + i + "${replay_hint_part2}", ygopro.constants.COLORS.BABYBLUE)
+    ygopro.stoc_send(client, "REPLAY", buffer)
+  return true
+
 class Room
   constructor: (name, @hostinfo) ->
     @name = name
@@ -1001,6 +1010,8 @@ class Room
     @duel_count = 0
     @death = 0
     @turn = 0
+    if settings.modules.replay_delay
+      @replays = []
     ROOM_all.push this
 
     @hostinfo ||= JSON.parse(JSON.stringify(settings.hostinfo))
@@ -1010,7 +1021,6 @@ class Room
         @hostinfo.lflist = _.findIndex lflists, (list)-> list.tcg
     else
       @hostinfo.lflist =  -1
-    @hostinfo.replay_mode = if settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe then 1 else 0
 
     if name[0...2] == 'M#'
       @hostinfo.mode = 1
@@ -1100,6 +1110,8 @@ class Room
       if (rule.match /(^|，|,)(NOWATCH|NW)(，|,|$)/)
         @no_watch = true
 
+    @hostinfo.replay_mode = if settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe or @hostinfo.mode == 1 and settings.modules.replay_delay then 1 else 0
+
     param = [0, @hostinfo.lflist, @hostinfo.rule, @hostinfo.mode, (if @hostinfo.enable_priority then 'T' else 'F'),
       (if @hostinfo.no_check_deck then 'T' else 'F'), (if @hostinfo.no_shuffle_deck then 'T' else 'F'),
       @hostinfo.start_lp, @hostinfo.start_hand, @hostinfo.draw_count, @hostinfo.time_limit, @hostinfo.replay_mode]
@@ -1309,6 +1321,14 @@ class Room
         challonge_duel_log.scoresCsv = "0-0"
     return challonge_duel_log
 
+  send_replays: () ->
+    return false unless settings.modules.replay_delay and @replays.length and @hostinfo.mode == 1
+    for player in @players
+      CLIENT_send_replays(player, this)
+    for player in @watchers
+      CLIENT_send_replays(player, this)
+    return true
+
   add_windbot: (botdata)->
     @windbot = botdata
     request
@@ -1453,6 +1473,8 @@ net.createServer (client) ->
       return
     unless server.client.closed
       ygopro.stoc_send_chat(server.client, "${server_closed}", ygopro.constants.COLORS.RED)
+      if room and settings.modules.replay_delay
+        room.send_replays()
       CLIENT_kick(server.client)
       SERVER_clear_disconnect(server)
     return
@@ -1467,6 +1489,8 @@ net.createServer (client) ->
       return
     unless server.client.closed
       ygopro.stoc_send_chat(server.client, "${server_error}: #{error}", ygopro.constants.COLORS.RED)
+      if room and settings.modules.replay_delay
+        room.send_replays()
       CLIENT_kick(server.client)
       SERVER_clear_disconnect(server)
     return
@@ -2318,6 +2342,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
       if settings.modules.retry_handle.max_retry_count and client.retry_count >= settings.modules.retry_handle.max_retry_count
         ygopro.stoc_send_chat_to_room(room, client.name + "${retry_too_much_room_part1}" + settings.modules.retry_handle.max_retry_count + "${retry_too_much_room_part2}", ygopro.constants.COLORS.BABYBLUE)
         ygopro.stoc_send_chat(client, "${retry_too_much_part1}" + settings.modules.retry_handle.max_retry_count + "${retry_too_much_part2}", ygopro.constants.COLORS.RED)
+        CLIENT_send_replays(client, room)
         CLIENT_kick(client)
         return true
       if client.last_game_msg
@@ -3062,6 +3087,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
       ygopro.stoc_send_chat(client, "${banned_duel_tip}", ygopro.constants.COLORS.RED)
       ROOM_ban_player(client.name, client.ip, "${random_ban_reason_abuse}")
       ROOM_ban_player(client.name, client.ip, "${random_ban_reason_abuse}", 3)
+      CLIENT_send_replays(client, room)
       CLIENT_kick(client)
       return true
     else
@@ -3156,6 +3182,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server)->
     win_pos = if room.scores[room.dueling_players[0].name_vpass] > room.scores[room.dueling_players[oppo_pos].name_vpass] then 0 else oppo_pos
     room.finished_by_death = true
     ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE)
+    CLIENT_send_replays(room.dueling_players[oppo_pos - win_pos], room) if room.hostinfo.mode == 1
     ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END')
     ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') if room.hostinfo.mode == 2
     room.scores[room.dueling_players[oppo_pos - win_pos].name_vpass] = -1
@@ -3354,6 +3381,7 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
         ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE)
         ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED)
         #room.scores[client.name_vpass] = -9
+        CLIENT_send_replays(client, room)
         CLIENT_kick(client)
         clearInterval sinterval
       else
@@ -3385,9 +3413,11 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
 
 ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server)->
   room=ROOM_all[client.rid]
-  return settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe and settings.modules.tournament_mode.block_replay_to_player unless room
+  return settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe and settings.modules.tournament_mode.block_replay_to_player or settings.modules.replay_delay and room.hostinfo.mode == 1 unless room
   if settings.modules.cloud_replay.enabled and room.random_type
     Cloud_replay_ids.push room.cloud_replay_id
+  if settings.modules.replay_delay and room.hostinfo.mode == 1 and client.pos == 0 and not (settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe and settings.modules.tournament_mode.block_replay_to_player)
+    room.replays.push(buffer)
   if settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe
     if client.pos == 0
       dueltime=moment().format('YYYY-MM-DD HH-mm-ss')
@@ -3418,9 +3448,9 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server)->
       )
     if settings.modules.cloud_replay.enabled
       ygopro.stoc_send_chat(client, "${cloud_replay_delay_part1}R##{room.cloud_replay_id}${cloud_replay_delay_part2}", ygopro.constants.COLORS.BABYBLUE)
-    return settings.modules.tournament_mode.block_replay_to_player
+    return settings.modules.tournament_mode.block_replay_to_player or settings.modules.replay_delay and room.hostinfo.mode == 1
   else
-    return false
+    return settings.modules.replay_delay and room.hostinfo.mode == 1
 
 if settings.modules.random_duel.enabled
   setInterval ()->
@@ -3433,6 +3463,7 @@ if settings.modules.random_duel.enabled
         room.scores[room.waiting_for_player.name_vpass] = -9
         #log.info room.waiting_for_player.name, room.scores[room.waiting_for_player.name_vpass]
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${kicked_by_system}", ygopro.constants.COLORS.RED)
+        CLIENT_send_replays(room.waiting_for_player, room)
         CLIENT_kick(room.waiting_for_player)
       else if time_passed >= (settings.modules.random_duel.hang_timeout - 20) and not (time_passed % 10)
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${afk_warn_part1}#{settings.modules.random_duel.hang_timeout - time_passed}${afk_warn_part2}", ygopro.constants.COLORS.RED)
@@ -3450,6 +3481,7 @@ if settings.modules.mycard.enabled
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${kicked_by_system}", ygopro.constants.COLORS.RED)
         room.scores[room.waiting_for_player.name_vpass] = -9
         #log.info room.waiting_for_player.name, room.scores[room.waiting_for_player.name_vpass]
+        CLIENT_send_replays(room.waiting_for_player, room)
         CLIENT_kick(room.waiting_for_player)
       else if time_passed >= (settings.modules.random_duel.hang_timeout - 20) and not (time_passed % 10)
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${afk_warn_part1}#{settings.modules.random_duel.hang_timeout - time_passed}${afk_warn_part2}", ygopro.constants.COLORS.RED)
@@ -3738,6 +3770,7 @@ if settings.modules.http
                   win_pos = if room.scores[room.dueling_players[0].name_vpass] > room.scores[room.dueling_players[oppo_pos].name_vpass] then 0 else oppo_pos
                   room.finished_by_death = true
                   ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE)
+                  CLIENT_send_replays(room.dueling_players[oppo_pos - win_pos], room) if room.hostinfo.mode == 1
                   ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END')
                   ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END') if room.hostinfo.mode == 2
                   room.scores[room.dueling_players[oppo_pos - win_pos].name_vpass] = -1

ygopro-server.js

 // Generated by CoffeeScript 1.12.7
 (function() {
-  var CLIENT_check_vip, CLIENT_get_absolute_pos, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_get_partner, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_kick_reconnect, CLIENT_is_able_to_reconnect, CLIENT_is_banned_by_mc, CLIENT_is_player, CLIENT_kick, CLIENT_kick_reconnect, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, CLIENT_send_vip_status, CLIENT_use_cdkey, Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_clear_disconnect, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_player_flee, ROOM_player_get_score, ROOM_player_lose, ROOM_player_win, ROOM_players_banned, ROOM_players_oppentlist, ROOM_players_scores, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, VIP_generate_cdkeys, _, addCallback, badwords, ban_user, bunyan, challonge, challonge_cache, challonge_queue_callbacks, chat_color, concat_name, config, cppversion, crypto, date, default_config, default_data, dialogues, disconnect_list, duel_log, e, exec, execFile, fs, geoip, get_callback, get_memory_usage, http, http_server, https, https_server, import_datas, imported, is_requesting, j, k, l, len, len1, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, load_tips_zh, load_words, log, long_resolve_cards, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, oldwords, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, ref, ref1, ref2, refresh_challonge_cache, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, spawn_windbot, tips, url, users_cache, v, vip_info, wait_room_start, wait_room_start_arena, windbot_looplimit, windbots, words, ygopro, zlib;
+  var CLIENT_check_vip, CLIENT_get_absolute_pos, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_get_partner, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_kick_reconnect, CLIENT_is_able_to_reconnect, CLIENT_is_banned_by_mc, CLIENT_is_player, CLIENT_kick, CLIENT_kick_reconnect, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, CLIENT_send_replays, CLIENT_send_vip_status, CLIENT_use_cdkey, Cloud_replay_ids, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_clear_disconnect, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_player_flee, ROOM_player_get_score, ROOM_player_lose, ROOM_player_win, ROOM_players_banned, ROOM_players_oppentlist, ROOM_players_scores, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, VIP_generate_cdkeys, _, addCallback, badwords, ban_user, bunyan, challonge, challonge_cache, challonge_queue_callbacks, chat_color, concat_name, config, cppversion, crypto, date, default_config, default_data, dialogues, disconnect_list, duel_log, e, exec, execFile, fs, geoip, get_callback, get_memory_usage, http, http_server, https, https_server, import_datas, imported, is_requesting, j, k, l, len, len1, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, load_tips_zh, load_words, log, long_resolve_cards, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, oldwords, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, ref, ref1, ref2, refresh_challonge_cache, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, spawn_windbot, tips, url, users_cache, v, vip_info, wait_room_start, wait_room_start_arena, windbot_looplimit, windbots, words, ygopro, zlib;
 
   net = require('net');
 
@@ -1275,6 +1275,22 @@
     }
   };
 
+  CLIENT_send_replays = function(client, room) {
+    var buffer, i, len2, m, ref3;
+    if (!(settings.modules.replay_delay && room.replays.length && room.hostinfo.mode === 1)) {
+      return false;
+    }
+    i = 0;
+    ref3 = room.replays;
+    for (m = 0, len2 = ref3.length; m < len2; m++) {
+      buffer = ref3[m];
+      ++i;
+      ygopro.stoc_send_chat(client, "${replay_hint_part1}" + i + "${replay_hint_part2}", ygopro.constants.COLORS.BABYBLUE);
+      ygopro.stoc_send(client, "REPLAY", buffer);
+    }
+    return true;
+  };
+
   Room = (function() {
     function Room(name, hostinfo) {
       var draw_count, lflist, param, rule, start_hand, start_lp, time_limit;
@@ -1297,6 +1313,9 @@
       this.duel_count = 0;
       this.death = 0;
       this.turn = 0;
+      if (settings.modules.replay_delay) {
+        this.replays = [];
+      }
       ROOM_all.push(this);
       this.hostinfo || (this.hostinfo = JSON.parse(JSON.stringify(settings.hostinfo)));
       delete this.hostinfo.comment;
@@ -1309,7 +1328,6 @@
       } else {
         this.hostinfo.lflist = -1;
       }
-      this.hostinfo.replay_mode = settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe ? 1 : 0;
       if (name.slice(0, 2) === 'M#') {
         this.hostinfo.mode = 1;
       } else if (name.slice(0, 2) === 'T#') {
@@ -1414,6 +1432,7 @@
           this.no_watch = true;
         }
       }
+      this.hostinfo.replay_mode = settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe || this.hostinfo.mode === 1 && settings.modules.replay_delay ? 1 : 0;
       param = [0, this.hostinfo.lflist, this.hostinfo.rule, this.hostinfo.mode, (this.hostinfo.enable_priority ? 'T' : 'F'), (this.hostinfo.no_check_deck ? 'T' : 'F'), (this.hostinfo.no_shuffle_deck ? 'T' : 'F'), this.hostinfo.start_lp, this.hostinfo.start_hand, this.hostinfo.draw_count, this.hostinfo.time_limit, this.hostinfo.replay_mode];
       try {
         this.process = spawn('./ygopro', param, {
@@ -1707,6 +1726,24 @@
       return challonge_duel_log;
     };
 
+    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)) {
+        return false;
+      }
+      ref3 = this.players;
+      for (m = 0, len2 = ref3.length; m < len2; m++) {
+        player = ref3[m];
+        CLIENT_send_replays(player, this);
+      }
+      ref4 = this.watchers;
+      for (n = 0, len3 = ref4.length; n < len3; n++) {
+        player = ref4[n];
+        CLIENT_send_replays(player, this);
+      }
+      return true;
+    };
+
     Room.prototype.add_windbot = function(botdata) {
       this.windbot = botdata;
       request({
@@ -1884,6 +1921,9 @@
       }
       if (!server.client.closed) {
         ygopro.stoc_send_chat(server.client, "${server_closed}", ygopro.constants.COLORS.RED);
+        if (room && settings.modules.replay_delay) {
+          room.send_replays();
+        }
         CLIENT_kick(server.client);
         SERVER_clear_disconnect(server);
       }
@@ -1900,6 +1940,9 @@
       }
       if (!server.client.closed) {
         ygopro.stoc_send_chat(server.client, "${server_error}: " + error, ygopro.constants.COLORS.RED);
+        if (room && settings.modules.replay_delay) {
+          room.send_replays();
+        }
         CLIENT_kick(server.client);
         SERVER_clear_disconnect(server);
       }
@@ -2879,6 +2922,7 @@
         if (settings.modules.retry_handle.max_retry_count && client.retry_count >= settings.modules.retry_handle.max_retry_count) {
           ygopro.stoc_send_chat_to_room(room, client.name + "${retry_too_much_room_part1}" + settings.modules.retry_handle.max_retry_count + "${retry_too_much_room_part2}", ygopro.constants.COLORS.BABYBLUE);
           ygopro.stoc_send_chat(client, "${retry_too_much_part1}" + settings.modules.retry_handle.max_retry_count + "${retry_too_much_part2}", ygopro.constants.COLORS.RED);
+          CLIENT_send_replays(client, room);
           CLIENT_kick(client);
           return true;
         }
@@ -3904,6 +3948,7 @@
         ygopro.stoc_send_chat(client, "${banned_duel_tip}", ygopro.constants.COLORS.RED);
         ROOM_ban_player(client.name, client.ip, "${random_ban_reason_abuse}");
         ROOM_ban_player(client.name, client.ip, "${random_ban_reason_abuse}", 3);
+        CLIENT_send_replays(client, room);
         CLIENT_kick(client);
         return true;
       } else {
@@ -4024,6 +4069,9 @@
       win_pos = room.scores[room.dueling_players[0].name_vpass] > room.scores[room.dueling_players[oppo_pos].name_vpass] ? 0 : oppo_pos;
       room.finished_by_death = true;
       ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE);
+      if (room.hostinfo.mode === 1) {
+        CLIENT_send_replays(room.dueling_players[oppo_pos - win_pos], room);
+      }
       ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END');
       if (room.hostinfo.mode === 2) {
         ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END');
@@ -4303,6 +4351,7 @@
         if (client.side_tcount === 1) {
           ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE);
           ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED);
+          CLIENT_send_replays(client, room);
           CLIENT_kick(client);
           return clearInterval(sinterval);
         } else {
@@ -4342,11 +4391,14 @@
     var duellog, dueltime, i, len2, len3, m, n, player, ref3, ref4, replay_filename, room;
     room = ROOM_all[client.rid];
     if (!room) {
-      return settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe && settings.modules.tournament_mode.block_replay_to_player;
+      return settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe && settings.modules.tournament_mode.block_replay_to_player || settings.modules.replay_delay && room.hostinfo.mode === 1;
     }
     if (settings.modules.cloud_replay.enabled && room.random_type) {
       Cloud_replay_ids.push(room.cloud_replay_id);
     }
+    if (settings.modules.replay_delay && room.hostinfo.mode === 1 && client.pos === 0 && !(settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe && settings.modules.tournament_mode.block_replay_to_player)) {
+      room.replays.push(buffer);
+    }
     if (settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe) {
       if (client.pos === 0) {
         dueltime = moment().format('YYYY-MM-DD HH-mm-ss');
@@ -4397,9 +4449,9 @@
       if (settings.modules.cloud_replay.enabled) {
         ygopro.stoc_send_chat(client, "${cloud_replay_delay_part1}R#" + room.cloud_replay_id + "${cloud_replay_delay_part2}", ygopro.constants.COLORS.BABYBLUE);
       }
-      return settings.modules.tournament_mode.block_replay_to_player;
+      return settings.modules.tournament_mode.block_replay_to_player || settings.modules.replay_delay && room.hostinfo.mode === 1;
     } else {
-      return false;
+      return settings.modules.replay_delay && room.hostinfo.mode === 1;
     }
   });
 
@@ -4417,6 +4469,7 @@
           ROOM_ban_player(room.waiting_for_player.name, room.waiting_for_player.ip, "${random_ban_reason_AFK}");
           room.scores[room.waiting_for_player.name_vpass] = -9;
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${kicked_by_system}", ygopro.constants.COLORS.RED);
+          CLIENT_send_replays(room.waiting_for_player, room);
           CLIENT_kick(room.waiting_for_player);
         } else if (time_passed >= (settings.modules.random_duel.hang_timeout - 20) && !(time_passed % 10)) {
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${afk_warn_part1}" + (settings.modules.random_duel.hang_timeout - time_passed) + "${afk_warn_part2}", ygopro.constants.COLORS.RED);
@@ -4439,6 +4492,7 @@
           room.last_active_time = moment();
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${kicked_by_system}", ygopro.constants.COLORS.RED);
           room.scores[room.waiting_for_player.name_vpass] = -9;
+          CLIENT_send_replays(room.waiting_for_player, room);
           CLIENT_kick(room.waiting_for_player);
         } else if (time_passed >= (settings.modules.random_duel.hang_timeout - 20) && !(time_passed % 10)) {
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${afk_warn_part1}" + (settings.modules.random_duel.hang_timeout - time_passed) + "${afk_warn_part2}", ygopro.constants.COLORS.RED);
@@ -4810,6 +4864,9 @@
                     win_pos = room.scores[room.dueling_players[0].name_vpass] > room.scores[room.dueling_players[oppo_pos].name_vpass] ? 0 : oppo_pos;
                     room.finished_by_death = true;
                     ygopro.stoc_send_chat_to_room(room, "${death2_finish_part1}" + room.dueling_players[win_pos].name + "${death2_finish_part2}", ygopro.constants.COLORS.BABYBLUE);
+                    if (room.hostinfo.mode === 1) {
+                      CLIENT_send_replays(room.dueling_players[oppo_pos - win_pos], room);
+                    }
                     ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos], 'DUEL_END');
                     if (room.hostinfo.mode === 2) {
                       ygopro.stoc_send(room.dueling_players[oppo_pos - win_pos + 1], 'DUEL_END');