revert

i18n.json

@@ -94,6 +94,8 @@
     "death_start": "Over-time match has begun, player with higher LP will win the single game after 4 turns.",
     "death_start_siding": "Extra time match starts, player with higher LP will win the single game after 4 turns.",
     "death_start_quick": "Extra time match starts, you are getting into sudden-death match next round. The Duel continues until the first change in LP happens.",
+    "death_start_final": "You are getting into sudden-death match, the Duel continues until the first change in LP happens.",
+    "death_start_extra": "The Duel is counted as extra duel which will end in 4 turns, player with higher LP will win.",
     "death_remain_part1": "The Duel will be ended in ",
     "death_remain_part2": " turns. At the end of that turn, player with higher LP wins.",
     "death_remain_final": "The Duel will continue until the first change in LP (and increase or a decrease), and at the end of the turn, the player with the highest LP total becomes the winner.",
@@ -198,6 +200,8 @@
     "death_start": "加时赛开始，从本回合开始计算4回合，基本分高的玩家获得本次决斗的胜利。",
     "death_start_siding": "加时赛开始，下次决斗的第4回合结束时，基本分高的玩家决斗胜利。",
     "death_start_quick": "加时赛开始，下次决斗将进入猝死赛，基本分发生变动的回合结束时将决出胜负。",
+    "death_start_final": "本次决斗将进入猝死赛，基本分发生变动的回合结束时，基本分高的玩家将获得本次决斗的胜利。",
+    "death_start_extra": "本次决斗为额外决斗，第4回合结束时，基本分高的玩家获得本次决斗的胜利。",
     "death_remain_part1": "本次决斗将在",
     "death_remain_part2": "回合后结束，基本分高的玩家将获得本次决斗的胜利。",
     "death_remain_final": "若本回合基本分发生变动，在该回合结束时决斗即告结束，生命值多的玩家获得本场决斗的胜利。",

ygopro-server.coffee

@@ -1250,6 +1250,11 @@ ygopro.stoc_follow 'GAME_MSG', false, (buffer, info, client, server)->
     if client.pos == 0
       room.turn = 0
       room.duel_count = room.duel_count + 1
+      if room.death and room.duel_count > 1
+        if room.death == -1
+          ygopro.stoc_send_chat_to_room(room, "${death_start_final}", ygopro.constants.COLORS.BABYBLUE)
+        else
+          ygopro.stoc_send_chat_to_room(room, "${death_start_extra}", ygopro.constants.COLORS.BABYBLUE)
 
   #ygopro.stoc_send_chat_to_room(room, "LP跟踪调试信息: #{client.name} 初始LP #{client.lp}")
 

ygopro-server.js

@@ -1495,6 +1495,13 @@
       if (client.pos === 0) {
         room.turn = 0;
         room.duel_count = room.duel_count + 1;
+        if (room.death && room.duel_count > 1) {
+          if (room.death === -1) {
+            ygopro.stoc_send_chat_to_room(room, "${death_start_final}", ygopro.constants.COLORS.BABYBLUE);
+          } else {
+            ygopro.stoc_send_chat_to_room(room, "${death_start_extra}", ygopro.constants.COLORS.BABYBLUE);
+          }
+        }
       }
     }
     if (ygopro.constants.MSG[msg] === 'NEW_TURN') {