merge

data/long_resolve_cards.json

+[
+  11110587,
+  32362575,
+  43040603,
+  58577036,
+  79106360
+]

ygopro-server.coffee

@@ -235,6 +235,9 @@ if settings.modules.cloud_replay.enabled
 if settings.modules.windbot.enabled
   windbots = loadJSON(settings.modules.windbot.botlist).windbots
 
+if settings.modules.heartbeat_detection.enabled
+  long_resolve_cards = loadJSON('./data/long_resolve_cards.json')
+
 # 组件
 ygopro = require './ygopro.js'
 roomlist = require './roomlist.js' if settings.modules.http.websocket_roomlist
@@ -671,7 +674,7 @@ CLIENT_heartbeat_unregister = (client) ->
   return true
 
 CLIENT_heartbeat_register = (client, send) ->
-  if !settings.modules.heartbeat_detection.enabled or client.closed or client.is_post_watcher or client.pre_reconnecting or client.reconnecting or client.pos > 3 or client.confirming_cards
+  if !settings.modules.heartbeat_detection.enabled or client.closed or client.is_post_watcher or client.pre_reconnecting or client.reconnecting or client.pos > 3 or client.heartbeat_protected
     return false
   if client.heartbeat_timeout
     CLIENT_heartbeat_unregister(client)
@@ -1953,7 +1956,9 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
     room.turn = 0
     if settings.modules.heartbeat_detection.enabled
       for player in room.players
-        player.confirming_cards = false
+        player.heartbeat_protected = false
+      delete room.long_resolve_card
+      delete room.long_resolve_chain
     if room and !room.finished and room.dueling_players[pos]
       room.winner_name = room.dueling_players[pos].name
       #log.info room.dueling_players, pos
@@ -2058,7 +2063,42 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
         break
     if check
       #console.log("Confirming cards:" + client.name)
-      client.confirming_cards = true
+      client.heartbeat_protected = true
+
+  # chain detection
+  if settings.modules.heartbeat_detection.enabled and client.pos == 0
+    if ygopro.constants.MSG[msg] == 'CHAINING'
+      card = buffer.readUInt32LE(1)
+      found = false
+      for id in long_resolve_cards when id == card
+        found = true
+        break
+      if found
+        room.long_resolve_card = card
+        # console.log(0,card)
+      else
+        delete room.long_resolve_card
+    else if ygopro.constants.MSG[msg] == 'CHAINED' and room.long_resolve_card
+      chain = buffer.readInt8(1)
+      if !room.long_resolve_chain
+        room.long_resolve_chain = []
+      room.long_resolve_chain[chain] = true
+      # console.log(1,chain)
+      delete room.long_resolve_card
+    else if ygopro.constants.MSG[msg] == 'CHAIN_SOLVING' and room.long_resolve_chain
+      chain = buffer.readInt8(1)
+      # console.log(2,chain)
+      if room.long_resolve_chain[chain]
+        for player in room.get_playing_player()
+          player.heartbeat_protected = true
+    else if (ygopro.constants.MSG[msg] == 'CHAIN_NEGATED' or ygopro.constants.MSG[msg] == 'CHAIN_DISABLED') and room.long_resolve_chain
+      chain = buffer.readInt8(1)
+      # console.log(3,chain)
+      delete room.long_resolve_chain[chain]
+    else if ygopro.constants.MSG[msg] == 'CHAIN_END'
+      # console.log(4,chain)
+      delete room.long_resolve_card
+      delete room.long_resolve_chain
 
   #登场台词
   if settings.modules.dialogues.enabled
@@ -2171,10 +2211,15 @@ ygopro.stoc_follow 'HS_PLAYER_CHANGE', false, (buffer, info, client, server)->
         setTimeout (()-> wait_room_start(ROOM_all[client.rid], 20);return), 1000
   return
 
+ygopro.ctos_follow 'REQUEST_FIELD', true, (buffer, info, client, server)->
+  return true
+
 ygopro.stoc_follow 'FIELD_FINISH', true, (buffer, info, client, server)->
   room=ROOM_all[client.rid]
   return unless room
   client.reconnecting = false
+  if settings.modules.heartbeat_detection.enabled
+    client.heartbeat_protected = true
   if !client.last_game_msg
     return true
   if client.last_game_msg_title != 'WAITING'
@@ -2621,7 +2666,7 @@ ygopro.ctos_follow 'TIME_CONFIRM', false, (buffer, info, client, server)->
   if settings.modules.reconnect.enabled
     client.time_confirm_required = false
   return unless settings.modules.heartbeat_detection.enabled
-  client.confirming_cards = false
+  client.heartbeat_protected = false
   client.heartbeat_responsed = true
   CLIENT_heartbeat_unregister(client)
   return

ygopro-server.js

 // Generated by CoffeeScript 1.12.7
 (function() {
-  var CLIENT_get_authorize_key, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_reconnect, CLIENT_is_player, CLIENT_kick, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, 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_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, _, addCallback, badwords, ban_user, bunyan, challonge, chat_color, config, cppversion, crypto, date, default_config, default_data, dialogues, disconnect_list, duel_log, e, exec, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, import_datas, j, l, len, len1, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, load_words, log, memory_usage, merge, moment, net, oldbadwords, oldconfig, olddialogues, oldduellog, oldtips, oldwords, options, os, path, pgClient, pg_client, pg_query, redis, redisdb, ref, ref1, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, tips, url, users_cache, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, windbots, words, ygopro, zlib;
+  var CLIENT_get_authorize_key, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_reconnect, CLIENT_is_player, CLIENT_kick, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, 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_players_banned, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, Room, SERVER_clear_disconnect, _, addCallback, badwords, ban_user, bunyan, challonge, chat_color, config, cppversion, crypto, date, default_config, default_data, dialogues, disconnect_list, duel_log, e, exec, execFile, fs, geoip, get_memory_usage, http, http_server, https, https_server, import_datas, j, l, len, len1, lflists, list, loadJSON, load_dialogues, load_dialogues_custom, load_tips, 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, release_disconnect, report_to_big_brother, request, requestListener, roomlist, setting_change, setting_save, settings, spawn, spawnSync, tips, url, users_cache, wait_room_start, wait_room_start_arena, windbot_bin, windbot_parameters, windbot_process, windbots, words, ygopro, zlib;
 
   net = require('net');
 
@@ -287,6 +287,10 @@
     windbots = loadJSON(settings.modules.windbot.botlist).windbots;
   }
 
+  if (settings.modules.heartbeat_detection.enabled) {
+    long_resolve_cards = loadJSON('./data/long_resolve_cards.json');
+  }
+
   ygopro = require('./ygopro.js');
 
   if (settings.modules.http.websocket_roomlist) {
@@ -860,7 +864,7 @@
   };
 
   CLIENT_heartbeat_register = function(client, send) {
-    if (!settings.modules.heartbeat_detection.enabled || client.closed || client.is_post_watcher || client.pre_reconnecting || client.reconnecting || client.pos > 3 || client.confirming_cards) {
+    if (!settings.modules.heartbeat_detection.enabled || client.closed || client.is_post_watcher || client.pre_reconnecting || client.reconnecting || client.pos > 3 || client.heartbeat_protected) {
       return false;
     }
     if (client.heartbeat_timeout) {
@@ -2213,7 +2217,7 @@
   }
 
   ygopro.stoc_follow('GAME_MSG', true, function(buffer, info, client, server) {
-    var card, check, count, cpos, deck_found, hint_type, i, len2, len3, len4, limbo_found, line, loc, m, max_loop, msg, n, o, oppo_pos, p, phase, player, playertype, pos, ppos, r_player, reason, ref2, ref3, ref4, ref5, ref6, ref7, room, trigger_location, val, win_pos;
+    var card, chain, check, count, cpos, deck_found, found, hint_type, i, id, len2, len3, len4, len5, len6, limbo_found, line, loc, m, max_loop, msg, n, o, oppo_pos, p, phase, player, playertype, pos, ppos, q, r, r_player, reason, ref2, ref3, ref4, ref5, ref6, ref7, ref8, room, trigger_location, val, win_pos;
     room = ROOM_all[client.rid];
     if (!(room && !client.reconnecting)) {
       return;
@@ -2356,8 +2360,10 @@
         ref2 = room.players;
         for (m = 0, len2 = ref2.length; m < len2; m++) {
           player = ref2[m];
-          player.confirming_cards = false;
+          player.heartbeat_protected = false;
         }
+        delete room.long_resolve_card;
+        delete room.long_resolve_chain;
       }
       if (room && !room.finished && room.dueling_players[pos]) {
         room.winner_name = room.dueling_players[pos].name;
@@ -2501,7 +2507,48 @@
         }
       }
       if (check) {
-        client.confirming_cards = true;
+        client.heartbeat_protected = true;
+      }
+    }
+    if (settings.modules.heartbeat_detection.enabled && client.pos === 0) {
+      if (ygopro.constants.MSG[msg] === 'CHAINING') {
+        card = buffer.readUInt32LE(1);
+        found = false;
+        for (o = 0, len3 = long_resolve_cards.length; o < len3; o++) {
+          id = long_resolve_cards[o];
+          if (!(id === card)) {
+            continue;
+          }
+          found = true;
+          break;
+        }
+        if (found) {
+          room.long_resolve_card = card;
+        } else {
+          delete room.long_resolve_card;
+        }
+      } else if (ygopro.constants.MSG[msg] === 'CHAINED' && room.long_resolve_card) {
+        chain = buffer.readInt8(1);
+        if (!room.long_resolve_chain) {
+          room.long_resolve_chain = [];
+        }
+        room.long_resolve_chain[chain] = true;
+        delete room.long_resolve_card;
+      } else if (ygopro.constants.MSG[msg] === 'CHAIN_SOLVING' && room.long_resolve_chain) {
+        chain = buffer.readInt8(1);
+        if (room.long_resolve_chain[chain]) {
+          ref6 = room.get_playing_player();
+          for (p = 0, len4 = ref6.length; p < len4; p++) {
+            player = ref6[p];
+            player.heartbeat_protected = true;
+          }
+        }
+      } else if ((ygopro.constants.MSG[msg] === 'CHAIN_NEGATED' || ygopro.constants.MSG[msg] === 'CHAIN_DISABLED') && room.long_resolve_chain) {
+        chain = buffer.readInt8(1);
+        delete room.long_resolve_chain[chain];
+      } else if (ygopro.constants.MSG[msg] === 'CHAIN_END') {
+        delete room.long_resolve_card;
+        delete room.long_resolve_chain;
       }
     }
     if (settings.modules.dialogues.enabled) {
@@ -2510,15 +2557,15 @@
         trigger_location = buffer.readUInt8(6);
         if (ygopro.constants.MSG[msg] !== 'CHAINING' || (trigger_location & 0x8) && client.ready_trap) {
           if (dialogues.dialogues[card]) {
-            ref6 = _.lines(dialogues.dialogues[card][Math.floor(Math.random() * dialogues.dialogues[card].length)]);
-            for (o = 0, len3 = ref6.length; o < len3; o++) {
-              line = ref6[o];
+            ref7 = _.lines(dialogues.dialogues[card][Math.floor(Math.random() * dialogues.dialogues[card].length)]);
+            for (q = 0, len5 = ref7.length; q < len5; q++) {
+              line = ref7[q];
               ygopro.stoc_send_chat(client, line, ygopro.constants.COLORS.PINK);
             }
           } else if (dialogues.dialogues_custom[card]) {
-            ref7 = _.lines(dialogues.dialogues_custom[card][Math.floor(Math.random() * dialogues.dialogues_custom[card].length)]);
-            for (p = 0, len4 = ref7.length; p < len4; p++) {
-              line = ref7[p];
+            ref8 = _.lines(dialogues.dialogues_custom[card][Math.floor(Math.random() * dialogues.dialogues_custom[card].length)]);
+            for (r = 0, len6 = ref8.length; r < len6; r++) {
+              line = ref8[r];
               ygopro.stoc_send_chat(client, line, ygopro.constants.COLORS.PINK);
             }
           }
@@ -2667,6 +2714,10 @@
     }
   });
 
+  ygopro.ctos_follow('REQUEST_FIELD', true, function(buffer, info, client, server) {
+    return true;
+  });
+
   ygopro.stoc_follow('FIELD_FINISH', true, function(buffer, info, client, server) {
     var room;
     room = ROOM_all[client.rid];
@@ -2674,6 +2725,9 @@
       return;
     }
     client.reconnecting = false;
+    if (settings.modules.heartbeat_detection.enabled) {
+      client.heartbeat_protected = true;
+    }
     if (!client.last_game_msg) {
       return true;
     }
@@ -3292,7 +3346,7 @@
     if (!settings.modules.heartbeat_detection.enabled) {
       return;
     }
-    client.confirming_cards = false;
+    client.heartbeat_protected = false;
     client.heartbeat_responsed = true;
     CLIENT_heartbeat_unregister(client);
   });