Merge branch 'master' into tcg_random

config_tourney/config.json

 {
   "file": "./config/config.json",
-  "port": 1262,
+  "port": 514,
   "version": 4930,
   "hostinfo": {
     "lflist": 0,
@@ -68,6 +68,9 @@
       "enabled": false,
       "get": false
     },
+    "koishi_roomlist": {
+      "enabled": false
+    },
     "vip": {
       "enabled": false,
       "generate_count": 500
@@ -162,7 +165,7 @@
       "show_ip": true,
       "show_info": true,
       "log_save_path": "./config/",
-      "port": 1264
+      "port": 5142
     },
     "test_mode": {
       "watch_public_hand": false,
@@ -285,9 +288,9 @@
       ]
     },
     "http": {
-      "port": 1263,
+      "port": 5141,
       "websocket_roomlist": false,
-      "public_roomlist": true,
+      "public_roomlist": false,
       "show_ip": true,
       "show_info": true,
       "quick_death_rule": 2,

data/default_config.json

@@ -13,7 +13,9 @@
     "start_lp": 8000,
     "start_hand": 5,
     "draw_count": 1,
-    "time_limit": 180
+    "time_limit": 180,
+    "no_watch": false,
+    "auto_death": false
   },
   "modules": {
     "welcome": "MyCard YGOPro Server",
@@ -164,7 +166,12 @@
       "ready_time": 30,
       "check_permit": "https://api.mycard.moe/ygopro/match/permit",
       "post_score": false,
-      "get_score": false
+      "get_score": false,
+      "init_post": {
+        "enabled": false,
+        "url": "https://api.mycard.moe/ygopro/match/clear",
+        "accesskey": "momobako"
+      }
     },
     "tournament_mode": {
       "enabled": false,
@@ -299,7 +306,7 @@
       "public_roomlist": false,
       "show_ip": false,
       "show_info": true,
-      "quick_death_rule": false,
+      "quick_death_rule": 2,
       "ssl": {
         "enabled": false,
         "port": 7923,

data/i18n.json

@@ -192,6 +192,8 @@
     "invalid_side_rule": "Illegal cards are contained in your side deck.",
     "arena_wait_hint": "If you opponent does not appear within 25 seconds, you may quit without any penalty.",
     "arena_wait_timeout": "Your opponent did not appear, you may quit without any penalty.",
+    "auto_death_part1": "This room is an auto-extra-duel room. The Extra Duel will begin after ",
+    "auto_death_part2": " minutes.",
     "athletic_arena_tip": "During an athletic match, a game quit behavior is regarded as a surrender."
   },
   "es-es": {
@@ -531,6 +533,8 @@
     "invalid_side_rule": "副卡组中包含不允许换入副卡组的卡。",
     "arena_wait_hint": "若对手在25秒内不进入游戏，您退房时不会进行扣分。",
     "arena_wait_timeout": "由于对手未能在30秒内进入游戏，此时您退出游戏不会扣分。",
+    "auto_death_part1": "本房间为自动加时赛房间。比赛开始",
+    "auto_death_part2": "分钟后，将自动进入加时赛。",
     "athletic_arena_tip": "在竞技匹配中，比赛开始前退出游戏也会视为投降。"
   },
  "ko-kr": {