Merge branch 'mc'

ygopro-server.coffee

@@ -2682,6 +2682,9 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
       room.winner_name = room.dueling_players[pos].name_vpass
       #log.info room.dueling_players, pos
       room.scores[room.winner_name] = room.scores[room.winner_name] + 1
+      if room.match_kill
+        room.match_kill = false
+        room.scores[room.winner_name] = 99
       if settings.modules.vip.enabled and room.dueling_players[pos].vip and vip_info.players[room.dueling_players[pos].name].victory
         for line in _.lines vip_info.players[room.dueling_players[pos].name].victory
           ygopro.stoc_send_chat_to_room(room, line, ygopro.constants.COLORS.PINK)
@@ -2694,6 +2697,9 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
       else
         room.death = 5
 
+  if ygopro.constants.MSG[msg] == 'MATCH_KILL' and client.pos == 0
+    room.match_kill = true
+
   #lp跟踪
   if ygopro.constants.MSG[msg] == 'DAMAGE' and client.pos == 0
     pos = buffer.readUInt8(1)

ygopro-server.js

@@ -3343,6 +3343,10 @@
       if (room && !room.finished && room.dueling_players[pos]) {
         room.winner_name = room.dueling_players[pos].name_vpass;
         room.scores[room.winner_name] = room.scores[room.winner_name] + 1;
+        if (room.match_kill) {
+          room.match_kill = false;
+          room.scores[room.winner_name] = 99;
+        }
         if (settings.modules.vip.enabled && room.dueling_players[pos].vip && vip_info.players[room.dueling_players[pos].name].victory) {
           ref4 = _.lines(vip_info.players[room.dueling_players[pos].name].victory);
           for (n = 0, len4 = ref4.length; n < len4; n++) {
@@ -3365,6 +3369,9 @@
         }
       }
     }
+    if (ygopro.constants.MSG[msg] === 'MATCH_KILL' && client.pos === 0) {
+      room.match_kill = true;
+    }
     if (ygopro.constants.MSG[msg] === 'DAMAGE' && client.pos === 0) {
       pos = buffer.readUInt8(1);
       if (!client.is_first) {