Merge branch 'master' into tcg_random

config_build/config.json

@@ -20,6 +20,7 @@
     "update": "请更新游戏版本",
     "stop": false,
     "side_timeout": 3,
+    "tag_duel_surrender": true,
     "i18n": {
       "auto_pick": true,
       "default": "zh-cn",

config_tourney/config.json

@@ -20,6 +20,7 @@
     "update": "请更新游戏版本",
     "stop": false,
     "side_timeout": 3,
+    "tag_duel_surrender": true,
     "i18n": {
       "auto_pick": true,
       "default": "zh-cn",

data/default_config.json

@@ -20,6 +20,7 @@
     "update": "请更新游戏版本",
     "stop": false,
     "side_timeout": false,
+    "tag_duel_surrender": true,
     "i18n": {
       "auto_pick": false,
       "default": "zh-cn",

data/i18n.json

@@ -98,6 +98,8 @@
     "afk_warn_part1": "no opreation too long, will be disconnected after ",
     "afk_warn_part2": " seconds",
     "surrender_confirm": "Are you sure? Enter /surrender again to confirm.",
+    "surrender_confirm_tag": "Your partner started a surrender request, click Surrender Button or type /surrender to confirm.",
+    "surrender_confirm_sent": "Surrender request sent, waiting for partner to confirm.",
     "surrender_canceled": "Surrender canceled.",
     "surrender_denied": "Please don't surrender in the first 2 turns.",
     "unwelcome_warn_part1": "If you keep doing ",
@@ -420,6 +422,8 @@
     "afk_warn_part1": "已经很久没有操作了，若继续挂机，将于",
     "afk_warn_part2": "秒后被请出房间",
     "surrender_confirm": "确实要投降吗？再次输入 /投降 以确认。",
+    "surrender_confirm_tag": "您的队友发起了投降请求，点击投降按钮或输入 /投降 以确认。",
+    "surrender_confirm_sent": "已发起投降请求，请等待队友确认。",
     "surrender_canceled": "已取消投降，加油！",
     "surrender_denied": "为保证双方玩家的游戏体验，随机对战中3回合后才能投降。",
     "unwelcome_warn_part1": "如果您经常",

ygopro-server.coffee

@@ -576,9 +576,9 @@ release_disconnect = (dinfo, reconnected) ->
   return
 
 CLIENT_get_authorize_key = (client) ->
-  if settings.modules.vip.enabled and client.vip
+  if !settings.modules.mycard.enabled and client.vpass
     return client.name + "$" + client.vpass
-  if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local
+  else if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local
     return client.name
   else
     return client.ip + ":" + client.name
@@ -686,7 +686,7 @@ CLIENT_is_able_to_reconnect = (client, deckbuf) ->
 
 CLIENT_get_kick_reconnect_target = (client, deckbuf) ->
   for room in ROOM_all when room and room.started and !room.windbot
-    for player in room.get_playing_player() when !player.closed and player.name == client.name and player.pass == client.pass and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (settings.modules.vip.enabled and player.vip and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
+    for player in room.get_playing_player() when !player.closed and player.name == client.name and player.pass == client.pass and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (client.vpass and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
       return player
   return null
 
@@ -844,6 +844,24 @@ CLIENT_heartbeat_register = (client, send) ->
 CLIENT_is_banned_by_mc = (client) ->
   return client.ban_mc and client.ban_mc.banned and moment().isBefore(client.ban_mc.until)
 
+CLIENT_get_absolute_pos = (client) ->
+  room = ROOM_all[client.rid]
+  if room.hostinfo.mode != 2 or client.pos > 3
+    return client.pos
+  else if client.pos < 2
+    return 0
+  else
+    return 1
+
+CLIENT_get_partner = (client) ->
+  room = ROOM_all[client.rid]
+  if room.hostinfo.mode != 2 or client.pos > 3
+    return client
+  if client.pos < 2
+    return room.dueling_players[1 - client.pos]
+  else
+    return room.dueling_players[5 - client.pos]
+
 class Room
   constructor: (name, @hostinfo) ->
     @name = name
@@ -2133,15 +2151,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
           if room.dueling_players[0].lp != room.dueling_players[oppo_pos].lp and room.turn > 1
             win_pos = if room.dueling_players[0].lp > room.dueling_players[oppo_pos].lp then 0 else oppo_pos
             ygopro.stoc_send_chat_to_room(room, "${death_finish_part1}" + room.dueling_players[win_pos].name + "${death_finish_part2}", ygopro.constants.COLORS.BABYBLUE)
-            if room.hostinfo.mode == 2
-              room.finished_by_death = true
-              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')
-              room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1
-              CLIENT_kick(room.dueling_players[oppo_pos - win_pos])
-              CLIENT_kick(room.dueling_players[oppo_pos - win_pos + 1])
-            else
-              ygopro.ctos_send(room.dueling_players[oppo_pos - win_pos].server, 'SURRENDER')
+            ygopro.ctos_send(room.dueling_players[oppo_pos - win_pos].server, 'SURRENDER')
           else
             room.death = -1
             ygopro.stoc_send_chat_to_room(room, "${death_remain_final}", ygopro.constants.COLORS.BABYBLUE)
@@ -2158,15 +2168,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
       if room.dueling_players[0].lp != room.dueling_players[oppo_pos].lp
         win_pos = if room.dueling_players[0].lp > room.dueling_players[oppo_pos].lp then 0 else oppo_pos
         ygopro.stoc_send_chat_to_room(room, "${death_finish_part1}" + room.dueling_players[win_pos].name + "${death_finish_part2}", ygopro.constants.COLORS.BABYBLUE)
-        if room.hostinfo.mode == 2
-          room.finished_by_death = true
-          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')
-          room.scores[room.dueling_players[oppo_pos - win_pos].name] = -1
-          CLIENT_kick(room.dueling_players[oppo_pos - win_pos])
-          CLIENT_kick(room.dueling_players[oppo_pos - win_pos + 1])
-        else
-          ygopro.ctos_send(room.dueling_players[oppo_pos - win_pos].server, 'SURRENDER')
+        ygopro.ctos_send(room.dueling_players[oppo_pos - win_pos].server, 'SURRENDER')
       else
         room.death = -1
         ygopro.stoc_send_chat_to_room(room, "${death_remain_final}", ygopro.constants.COLORS.BABYBLUE)
@@ -2591,11 +2593,20 @@ ygopro.stoc_follow 'DUEL_START', false, (buffer, info, client, server)->
 ygopro.ctos_follow 'SURRENDER', true, (buffer, info, client, server)->
   room=ROOM_all[client.rid]
   return unless room
-  if !room.started or room.hostinfo.mode==2
+  if !room.started
     return true
   if room.random_type and room.turn < 3 and not client.flee_free
     ygopro.stoc_send_chat(client, "${surrender_denied}", ygopro.constants.COLORS.BABYBLUE)
     return true
+  if room.hostinfo.mode == 2
+    if !settings.modules.tag_duel_surrender
+      return true
+    else if !client.surrend_confirm and !CLIENT_get_partner(client).closed
+      sur_player = CLIENT_get_partner(client)
+      ygopro.stoc_send_chat(sur_player, "${surrender_confirm_tag}", ygopro.constants.COLORS.BABYBLUE)
+      ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE)
+      sur_player.surrend_confirm = true
+      return true
   return false
 
 report_to_big_brother = (roomname, sender, ip, level, content, match) ->
@@ -2628,7 +2639,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
   cmd = msg.split(' ')
   switch cmd[0]
     when '/投降', '/surrender'
-      if !room.started or room.hostinfo.mode==2
+      if !room.started or (room.hostinfo.mode==2 and !settings.modules.tag_duel_surrender)
         return cancel
       if room.random_type and room.turn < 3
         ygopro.stoc_send_chat(client, "${surrender_denied}", ygopro.constants.COLORS.BABYBLUE)
@@ -2636,8 +2647,15 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
       if client.surrend_confirm
         ygopro.ctos_send(client.server, 'SURRENDER')
       else
-        ygopro.stoc_send_chat(client, "${surrender_confirm}", ygopro.constants.COLORS.BABYBLUE)
-        client.surrend_confirm = true
+        sur_player = CLIENT_get_partner(client)
+        if sur_player.closed
+          sur_player = client
+        if room.hostinfo.mode==2 and sur_player != client
+          ygopro.stoc_send_chat(sur_player, "${surrender_confirm_tag}", ygopro.constants.COLORS.BABYBLUE)
+          ygopro.stoc_send_chat(client, "${surrender_confirm_sent}", ygopro.constants.COLORS.BABYBLUE)
+        else
+          ygopro.stoc_send_chat(client, "${surrender_confirm}", ygopro.constants.COLORS.BABYBLUE)
+        sur_player.surrend_confirm = true
 
     when '/help'
       ygopro.stoc_send_chat(client, "${chat_order_main}")