mahjong_engine 1.1.4 → 1.1.5

package/tests/tensuu/hanName.ts

@@ -5,114 +5,147 @@ export const casesHanName: hanNameCase[] = [
         name: "hon1",
         desc: "なし",
         han: 1,
+        isYakuman: false,
         expected: ""
     },
     {
         name: "hon2",
         desc: "なし",
         han: 2,
+        isYakuman: false,
         expected: ""
     },
     {
         name: "hon3",
         desc: "なし",
         han: 3,
+        isYakuman: false,
         expected: ""
     },
     {
         name: "hon4",
         desc: "なし",
         han: 4,
+        isYakuman: false,
         expected: ""
     },
     {
         name: "hon5",
         desc: "満貫",
         han: 5,
+        isYakuman: false,
         expected: "満貫"
     },
     {
         name: "hon6",
         desc: "跳満",
         han: 6,
+        isYakuman: false,
         expected: "跳満"
     },
     {
         name: "hon7",
         desc: "跳満",
         han: 7,
+        isYakuman: false,
         expected: "跳満"
     },
     {
         name: "hon8",
         desc: "跳満",
         han: 8,
+        isYakuman: false,
         expected: "倍満"
     },
     {
         name: "hon9",
         desc: "倍満",
         han: 9,
+        isYakuman: false,
         expected: "倍満"
     },
     {
         name: "hon10",
         desc: "倍満",
         han: 10,
+        isYakuman: false,
         expected: "倍満"
     },
     {
         name: "hon11",
         desc: "三倍満",
         han: 11,
+        isYakuman: false,
         expected: "三倍満"
     },
     {
         name: "hon12",
         desc: "三倍満",
         han: 12,
+        isYakuman: false,
         expected: "三倍満"
     },
     {
         name: "hon13",
         desc: "役満以上",
         han: 13,
+        isYakuman: false,
+        expected: "数え役満"
+    },
+    {
+        name: "hon13",
+        desc: "役満以上",
+        han: 13,
+        isYakuman: true,
         expected: "役満"
     },
     {
         name: "hon26",
         desc: "役満以上",
         han: 26,
+        isYakuman: false,
+        expected: "数え役満"
+    },
+    {
+        name: "hon26",
+        desc: "役満以上",
+        han: 26,
+        isYakuman: true,
         expected: "二倍役満"
     },
     {
         name: "hon39",
         desc: "役満以上",
         han: 39,
+        isYakuman: true,
         expected: "三倍役満"
     },
     {
         name: "hon52",
         desc: "役満以上",
         han: 52,
+        isYakuman: true,
         expected: "四倍役満"
     },
     {
         name: "hon65",
         desc: "役満以上",
         han: 65,
+        isYakuman: true,
         expected: "五倍役満"
     },
     {
         name: "hon78",
         desc: "役満以上",
         han: 78,
+        isYakuman: true,
         expected: "六倍役満"
     },
     {
         name: "hon79",
         desc: "役満以上",
         han: 79,
+        isYakuman: true,
         expected: "六倍役満"
     },
 ]

package/tests/tensuu/tensuuNum.ts

@@ -282,11 +282,27 @@ export const caseNum: TensuuNumCase[] = [
     fusuu: 20,
     expected: new TensuuResult(8000, 48000, 32000, 16000, {oya:16000, ko:8000})
   },
+  {
+    name: "hon13",
+    desc: "13翻",
+    honsuu: 13,
+    fusuu: 20,
+    isYakuman: true,
+    expected: new TensuuResult(8000, 48000, 32000, 16000, {oya:16000, ko:8000})
+  },
+  {
+    name: "hon26",
+    desc: "26翻",
+    honsuu: 26,
+    fusuu: 20,
+    expected: new TensuuResult(8000, 48000, 32000, 16000, {oya:16000, ko:8000})
+  },
   {
     name: "hon26",
     desc: "26翻",
     honsuu: 26,
     fusuu: 20,
+    isYakuman: true,
     expected: new TensuuResult(16000, 96000, 64000, 32000, {oya:32000, ko:16000})
   },
   {
@@ -294,6 +310,7 @@ export const caseNum: TensuuNumCase[] = [
     desc: "39翻",
     honsuu: 39,
     fusuu: 20,
+    isYakuman: true,
     expected: new TensuuResult(24000, 144000, 96000, 48000, {oya:48000, ko:24000})
   },
   {
@@ -301,6 +318,7 @@ export const caseNum: TensuuNumCase[] = [
     desc: "52翻",
     honsuu: 52,
     fusuu: 20,
+    isYakuman: true,
     expected: new TensuuResult(32000, 192000, 128000, 64000, {oya:64000, ko:32000})
   },
   {
@@ -308,6 +326,7 @@ export const caseNum: TensuuNumCase[] = [
     desc: "65翻",
     honsuu: 65,
     fusuu: 20,
+    isYakuman: true,
     expected: new TensuuResult(40000, 240000, 160000, 80000, {oya:80000, ko:40000})
   },
   {
@@ -315,6 +334,7 @@ export const caseNum: TensuuNumCase[] = [
     desc: "78翻",
     honsuu: 78,
     fusuu: 20,
+    isYakuman: true,
     expected: new TensuuResult(48000, 288000, 192000, 96000, {oya:96000, ko:48000})
   },
 ];

package/tests/tensuuFromNum.test.ts

@@ -8,7 +8,7 @@ caseNum.forEach(casenum => testcases.push(casenum));
 testcases.forEach(testcase => {
     describe(testcase.desc, () => {
         test(testcase.name, () => {
-            const expected = TensuuCalculator.calcTensuu(testcase.honsuu, testcase.fusuu);
+            const expected = TensuuCalculator.calcTensuu(testcase.honsuu, testcase.fusuu, testcase.isYakuman ?? false);
             expect(testcase.expected).toEqual(expected);
         });
     });

package/tests/testConsts.ts

@@ -37,7 +37,8 @@ export type TensuuNumCase = {
     name: string,
     desc: string,
     honsuu: number,
-    fusuu: number
+    fusuu: number,
+    isYakuman?: boolean,
     expected: TensuuResult;
 }
 
@@ -45,6 +46,7 @@ export type hanNameCase = {
     name: string,
     desc: string,
     han: number,
+    isYakuman: boolean,
     expected: string
 }
 

package/tests/yaku.test.ts

@@ -4,6 +4,8 @@ import { casesNormal } from './yaku/normal';
 import { TehaiCase } from './testConsts';
 import { YakuContext } from '../modules/yaku/YakuContext';
 import { TehaiCaseRunner } from './tehaiCaseRunner';
+import { YakuDetails } from "../modules/yaku/YakuDetails";
+import { BlockHaisList } from "../modules";
 
 type yakuMaps = Map<number, Map<string, number>>;
 
@@ -14,13 +16,13 @@ casesNormal.forEach(casenormal => testcases.push(casenormal));
 testcases.forEach(testcase => {
     describe(testcase.desc, () => {
         test(testcase.name, () => {
-            const yakuMaps: yakuMaps = new Map<number, Map<string, number>>();
+            const yakuMaps: yakuMaps = new Map();
             const runner: TehaiCaseRunner<yakuMaps> = new TehaiCaseRunner(testcase);
-            const blocks = runner.blocks;
+            const blocks:BlockHaisList[] = runner.blocks;
             blocks.forEach((block, index) => {
-                const context = new YakuContext(runner.hand, runner.ctx, block);
-                const yakuMap = new YakuChecker(context).check();
-                if(yakuMap.size > 0) yakuMaps.set(index, yakuMap);
+                const context: YakuContext = new YakuContext(runner.hand, runner.ctx, block);
+                const details: YakuDetails = new YakuChecker(context).check();
+                if(details.length > 0) yakuMaps.set(index, details.toMap());
             });
             expect(yakuMaps).toEqual(testcase.expected);
         });