rules

ygopro-server.coffee

@@ -1400,11 +1400,11 @@ class Room
         @hostinfo.lflist = 0
 
       if (rule.match /(^|，|,)(OR|OCGRANDOM)(，|,|$)/)
-        @hostinfo.rule = 2
+        @hostinfo.rule = 5
         @hostinfo.lflist = 0
 
       if (rule.match /(^|，|,)(CR|CCGRANDOM)(，|,|$)/)
-        @hostinfo.rule = 4
+        @hostinfo.rule = 2
         @hostinfo.lflist = -1
 
       if (rule.match /(^|，|,)(TOR|TCGONLYRANDOM)(，|,|$)/)
@@ -1412,7 +1412,7 @@ class Room
         @hostinfo.lflist = _.findIndex lflists, (list)-> list.tcg
 
       if (rule.match /(^|，|,)(TR|TCGRANDOM)(，|,|$)/)
-        @hostinfo.rule = 2
+        @hostinfo.rule = 5
         @hostinfo.lflist = _.findIndex lflists, (list)-> list.tcg
 
       if (rule.match /(^|，|,)(OOMR|OCGONLYMATCHRANDOM)(，|,|$)/)
@@ -1421,12 +1421,12 @@ class Room
         @hostinfo.mode = 1
 
       if (rule.match /(^|，|,)(OMR|OCGMATCHRANDOM)(，|,|$)/)
-        @hostinfo.rule = 2
+        @hostinfo.rule = 5
         @hostinfo.lflist = 0
         @hostinfo.mode = 1
 
       if (rule.match /(^|，|,)(CMR|CCGMATCHRANDOM)(，|,|$)/)
-        @hostinfo.rule = 4
+        @hostinfo.rule = 2
         @hostinfo.lflist = -1
         @hostinfo.mode = 1
 

ygopro-server.js

@@ -1813,11 +1813,11 @@
           this.hostinfo.lflist = 0;
         }
         if (rule.match(/(^|，|,)(OR|OCGRANDOM)(，|,|$)/)) {
-          this.hostinfo.rule = 2;
+          this.hostinfo.rule = 5;
           this.hostinfo.lflist = 0;
         }
         if (rule.match(/(^|，|,)(CR|CCGRANDOM)(，|,|$)/)) {
-          this.hostinfo.rule = 4;
+          this.hostinfo.rule = 2;
           this.hostinfo.lflist = -1;
         }
         if (rule.match(/(^|，|,)(TOR|TCGONLYRANDOM)(，|,|$)/)) {
@@ -1827,7 +1827,7 @@
           });
         }
         if (rule.match(/(^|，|,)(TR|TCGRANDOM)(，|,|$)/)) {
-          this.hostinfo.rule = 2;
+          this.hostinfo.rule = 5;
           this.hostinfo.lflist = _.findIndex(lflists, function(list) {
             return list.tcg;
           });
@@ -1838,12 +1838,12 @@
           this.hostinfo.mode = 1;
         }
         if (rule.match(/(^|，|,)(OMR|OCGMATCHRANDOM)(，|,|$)/)) {
-          this.hostinfo.rule = 2;
+          this.hostinfo.rule = 5;
           this.hostinfo.lflist = 0;
           this.hostinfo.mode = 1;
         }
         if (rule.match(/(^|，|,)(CMR|CCGMATCHRANDOM)(，|,|$)/)) {
-          this.hostinfo.rule = 4;
+          this.hostinfo.rule = 2;
           this.hostinfo.lflist = -1;
           this.hostinfo.mode = 1;
         }