Restructuring

1 files changed, 19 insertions, 0 deletions

diff --git a/aux/set/CardSet.java b/aux/set/CardSet.java
index 56a998d..edea88a 100644
--- a/aux/set/CardSet.java
+++ b/aux/set/CardSet.java
@@ -72,6 +72,25 @@ public class CardSet {
     {
         //cnt=0;
         int res=calTing(0,cardRem[0],0,0,mian);
+
+        // 7 pairs
+        int pairs=0;
+        for (int i:cardRem)
+            if (i>0) ++pairs;
+        res = Math.min(7 - pairs, res);
+
+        // Musou
+        int types=0;
+        pairs=0;
+        for (int i=0;i<cardTypeTotal;++i)
+            if (new Card(id2OrdLut[i]).is19())
+            {
+                ++types;
+                if (cardRem[i]>0)
+                    ++pairs;
+            }
+        res = Math.min(14-(((pairs>0)?1:0)+types),res);
+
         //System.out.println(cnt);
         return res;
     }