Merge branch 'master' into ai-play

data/default_config.json

@@ -66,14 +66,14 @@
     "tips": {
       "enabled": true,
       "split_zh": false,
-      "get": "https://api.moecube.com/biu-tips/tips.json",
+      "get": "https://sapi.moecube.com:444/biu-tips/tips.json",
       "get_zh": false,
       "interval": 30000,
       "interval_ingame": 120000
     },
     "dialogues": {
       "enabled": true,
-      "get_custom": "http://purerosefallen.github.io/ygopro-tips/dialogues-222.json",
+      "get_custom": "https://minio.momobako.com:9000/public/ygopro-tips/dialogues-222.json",
       "get": "http://mercury233.me/ygosrv233/dialogues.json"
     },
     "words": {

ygopro-server.coffee

@@ -1369,10 +1369,10 @@ class Room
       @hostinfo.time_limit = 0
       @hostinfo.no_check_deck = true
 
-    else if (param = name.match /^(\d)(\d)(T|F)(T|F)(T|F)(\d+),(\d+),(\d+)/i)
+    else if (param = name.match /^(\d)(\d)([12345TF])(T|F)(T|F)(\d+),(\d+),(\d+)/i)
       @hostinfo.rule = parseInt(param[1])
       @hostinfo.mode = parseInt(param[2])
-      @hostinfo.duel_rule = (if param[3] == 'T' then 3 else 4)
+      @hostinfo.duel_rule = (if parseInt(param[3]) then parseInt(param[3]) else (if param[3] == 'T' then 3 else 5))
       @hostinfo.no_check_deck = param[4] == 'T'
       @hostinfo.no_shuffle_deck = param[5] == 'T'
       @hostinfo.start_lp = parseInt(param[6])

ygopro-server.js

@@ -1788,10 +1788,10 @@
         this.hostinfo.lflist = -1;
         this.hostinfo.time_limit = 0;
         this.hostinfo.no_check_deck = true;
-      } else if ((param = name.match(/^(\d)(\d)(T|F)(T|F)(T|F)(\d+),(\d+),(\d+)/i))) {
+      } else if ((param = name.match(/^(\d)(\d)([12345TF])(T|F)(T|F)(\d+),(\d+),(\d+)/i))) {
         this.hostinfo.rule = parseInt(param[1]);
         this.hostinfo.mode = parseInt(param[2]);
-        this.hostinfo.duel_rule = (param[3] === 'T' ? 3 : 4);
+        this.hostinfo.duel_rule = (parseInt(param[3]) ? parseInt(param[3]) : (param[3] === 'T' ? 3 : 5));
         this.hostinfo.no_check_deck = param[4] === 'T';
         this.hostinfo.no_shuffle_deck = param[5] === 'T';
         this.hostinfo.start_lp = parseInt(param[6]);