mahjong_engine 1.1.3 → 1.1.5

package/modules/tensuu/ScoreResult.ts

@@ -1,6 +1,15 @@
 import { FuDetail } from "./FuDetail.js";
 import { TensuuResult } from "./TensuuResult.js";
 
+interface ScoreDetails {
+    han: number,
+    fuBasic: number,
+    fuCeiled: number,
+    tensuu: TensuuResult,
+    hanName: string,
+    fuDetail: FuDetail[]
+}
+
 export class ScoreResult{
     public readonly han: number;
     public readonly fuBasic: number;
@@ -9,19 +18,13 @@ export class ScoreResult{
     public readonly hanName: string;
     public readonly fuDetail: FuDetail[];
 
-    constructor(
-        han: number,
-        fuBasic: number,
-        fuCeiled: number,
-        tensuu: TensuuResult,
-        hanName: string,
-        fuDetail: FuDetail[]
-    ){
-        this.han = han;
-        this.fuBasic = fuBasic;
-        this.fuCeiled = fuCeiled;
-        this.tensuu = tensuu;
-        this.hanName = hanName;
-        this.fuDetail = fuDetail;
+    constructor(details: ScoreDetails)
+    {
+        this.han = details.han;
+        this.fuBasic = details.fuBasic;
+        this.fuCeiled = details.fuCeiled;
+        this.tensuu = details.tensuu;
+        this.hanName = details.hanName;
+        this.fuDetail = details.fuDetail;
     }
 }

package/modules/tensuu/TensuuCalculator.ts

@@ -1,18 +1,22 @@
 import { TensuuResult } from './TensuuResult.js';
 
 export class TensuuCalculator{
-    static readonly BASE_LIMITS = [
+    static readonly BASE_LIMITS_YAKUMAN = [
         {han: 78, base: 48000, name: "六倍役満"},
         {han: 65, base: 40000, name: "五倍役満"},
         {han: 52, base: 32000, name: "四倍役満"},
         {han: 39, base: 24000, name: "三倍役満"},
         {han: 26, base: 16000, name: "二倍役満"},
-        {han: 13, base: 8000, name: "役満"},
+        {han: 13, base: 8000, name: "役満"}
+    ];
+    static readonly BASE_LIMITS_NORMAL = [
+        {han: 13, base: 8000, name: "数え役満"},
         {han: 11, base: 6000, name: "三倍満"},
         {han: 8,  base: 4000, name: "倍満"},
         {han: 6,  base: 3000, name: "跳満"},
         {han: 5,  base: 2000, name: "満貫"},
-    ];
+    ]
+    
 
     static calcBaseTensuu(han: number, fu: number): number{
         return Math.min(fu * Math.pow(2, han + 2), 2000);
@@ -35,8 +39,9 @@ export class TensuuCalculator{
         return new TensuuResult(base, ronOya, ronKo, tsumoOya, tsumoKo);
     }
 
-    static calcTensuu(han: number, fu: number): TensuuResult{
-        for(const limit of this.BASE_LIMITS){
+    static calcTensuu(han: number, fu: number, isYakuman: boolean): TensuuResult{
+        const limits = isYakuman ? this.BASE_LIMITS_YAKUMAN : this.BASE_LIMITS_NORMAL;
+        for(const limit of limits){
             if(han >= limit.han) return this.calcTensuuFromBase(limit.base);
         }
         return this.calcTensuuFromBase(this.calcBaseTensuu(han, fu));

package/modules/yaku/NormalYakuChecker.ts

@@ -1,5 +1,6 @@
 import { WinEvent } from '../MahjongConsts.js';
 import { YakuContext } from './YakuContext.js';
+import { YakuDetails } from './YakuDetails.js';
 import { NormalYakuCheckers } from './index.js';
 
 export class NormalYakuChecker{
@@ -10,22 +11,22 @@ export class NormalYakuChecker{
     }
 
     //役判定
-    check(): Map<string, number> {
-        const yaku_map: Map<string, number> = new Map();
+    check(): YakuDetails {
+        const yakuDetails: YakuDetails = new YakuDetails();
         for(const Checker of NormalYakuCheckers) {
             const checker = Checker(this.context);
-            if(checker.check()) yaku_map.set(checker.getName(), checker.getHan());
+            if(checker.check()) yakuDetails.add(checker.getName(), checker.getHan());
         }
         
-        if(this.context.ctx.event === WinEvent.RINSHAN) yaku_map.set("嶺上開花", 1);
-        if(this.context.ctx.event === WinEvent.CHANKAN) yaku_map.set("槍槓", 1);
-        if(this.context.ctx.event === WinEvent.HAITEI) yaku_map.set("海底摸月", 1);
-        if(this.context.ctx.event === WinEvent.HOUTEI) yaku_map.set("河底撈魚", 1);
+        if(this.context.ctx.event === WinEvent.RINSHAN) yakuDetails.add("嶺上開花", 1);
+        if(this.context.ctx.event === WinEvent.CHANKAN) yakuDetails.add("槍槓", 1);
+        if(this.context.ctx.event === WinEvent.HAITEI) yakuDetails.add("海底摸月", 1);
+        if(this.context.ctx.event === WinEvent.HOUTEI) yakuDetails.add("河底撈魚", 1);
 
-        if(yaku_map.size > 0 && this.context.ctx.dora > 0){
-            yaku_map.set("ドラ", this.context.ctx.dora);
+        if(yakuDetails.length > 0 && this.context.ctx.dora > 0){
+            yakuDetails.add("ドラ", this.context.ctx.dora);
         }
         
-        return yaku_map;
+        return yakuDetails;
     }
 }

package/modules/yaku/YakuChecker.ts

@@ -1,6 +1,7 @@
 import { YakumanChecker } from './YakumanChecker.js';
 import { YakuContext } from './YakuContext.js';
 import { NormalYakuChecker } from './NormalYakuChecker.js';
+import { YakuDetails } from './YakuDetails.js';
 
 export class YakuChecker {
     private context: YakuContext
@@ -9,18 +10,18 @@ export class YakuChecker {
         this.context = context;
     }
 
-    check(): Map<string, number> {
+    check(): YakuDetails {
         //手牌と鳴き（カンを考慮して鳴き一つを3と数える）が計14枚かどうか確認する
         const tehai_num = this.context.hais.length;
         const furo_num = this.context.melds.length;
-        if(tehai_num + furo_num * 3 !== 14) return new Map<string, number>();
+        if(tehai_num + furo_num * 3 !== 14) return new YakuDetails();
 
-        const yakuman_map = new YakumanChecker(this.context).check();
-        if(yakuman_map.size === 0){
+        const yakumanDetails: YakuDetails = new YakumanChecker(this.context).check();
+        if(yakumanDetails.length === 0){
             return new NormalYakuChecker(this.context).check();
         }
         else{
-            return yakuman_map;
+            return yakumanDetails;
         }
     }
 }

package/modules/yaku/YakuDetail.ts

@@ -0,0 +1,11 @@
+export class YakuDetail{
+    readonly yakuName: string;
+    readonly han: number;
+    readonly isYakuman: boolean;
+
+    constructor(yakuName: string, han: number, isYakuman?: boolean){
+        this.yakuName = yakuName;
+        this.han = han;
+        this.isYakuman = isYakuman ?? false;
+    }
+}

package/modules/yaku/YakuDetails.ts

@@ -0,0 +1,42 @@
+import { YakuDetail } from "./YakuDetail";
+
+export class YakuDetails{
+    private details: YakuDetail[];
+
+    constructor(details: YakuDetail[] = []) {
+        this.details = details;
+    }
+
+    add(yakuName: string, han: number, isYakuman?: boolean){
+        this.details.push(new YakuDetail(yakuName, han, isYakuman ?? false));
+    }
+
+    has(yakuName: string){
+        return this.details.some(detail => detail.yakuName === yakuName);
+    }
+
+    delete(yakuName: string){
+        this.details = this.details.filter(detail => detail.yakuName !== yakuName);
+    }
+
+    calcHonsuu(){
+        return this.details.reduce((sum, val) => sum + val.han, 0);
+    }
+
+    isIncludeYakuman(){
+        return this.details.some(detail => detail.isYakuman);
+    }
+
+    toMap(){
+        return new Map(
+            this.details.map(detail => [
+                detail.yakuName,
+                detail.han
+            ])
+        );
+    }
+
+    get length(){
+        return this.details.length;
+    }
+}

package/modules/yaku/YakumanChecker.ts

@@ -1,5 +1,7 @@
 import { WinEvent } from '../MahjongConsts.js';
 import { YakuContext } from './YakuContext.js';
+import { YakuDetail } from './YakuDetail.js';
+import { YakuDetails } from './YakuDetails.js';
 import { YakumanCheckers } from './index.js';
 
 export class YakumanChecker{
@@ -10,25 +12,25 @@ export class YakumanChecker{
     }
 
     //役判定
-    check(): Map<string, number> {
+    check(): YakuDetails {
         const excludes = [
             { main: "純正九蓮宝燈", sub: "九蓮宝燈"},
             { main: "四暗刻単騎", sub: "四暗刻"},
             { main: "国士無双13面待ち", sub: "国士無双"},
         ];
-        const yaku_map: Map<string, number> = new Map();
-        if(this.context.ctx.event === WinEvent.TENHO) yaku_map.set("天和", 13);
-        if(this.context.ctx.event === WinEvent.CHIHO) yaku_map.set("地和", 13);
+        const yakuDetails: YakuDetails = new YakuDetails();
+        if(this.context.ctx.event === WinEvent.TENHO) yakuDetails.add("天和", 13, true);
+        if(this.context.ctx.event === WinEvent.CHIHO) yakuDetails.add("地和", 13, true);
 
         for(const Checker of YakumanCheckers) {
             const checker = Checker(this.context);
-            if(checker.check()) yaku_map.set(checker.getName(), checker.getHan());
+            if(checker.check()) yakuDetails.add(checker.getName(), checker.getHan(), true);
         }
 
         for(const { main, sub } of excludes) {
-            if(yaku_map.has(main)) yaku_map.delete(sub);
+            if(yakuDetails.has(main)) yakuDetails.delete(sub);
         }
 
-        return yaku_map;
+        return yakuDetails;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mahjong_engine",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "mahjong",
   "homepage": "https://github.com/daicharn/IsTheOrderaMahjong#readme",
   "bugs": {

package/tests/hanName.test.ts

@@ -1,6 +1,7 @@
 import { hanNameCase } from "./testConsts";
 import { casesHanName } from './tensuu/hanName';
 import { BlockHaisList, Hai, PlayerContext, PlayerHand, ScoreResolver, TILE, YakuContext } from "../modules";
+import { YakuDetails } from "../modules/yaku/YakuDetails";
 
 const testcases: hanNameCase[] = casesHanName;
 
@@ -11,7 +12,7 @@ testcases.forEach(testcase => {
                 new PlayerHand([], []),
                 new PlayerContext({agariHai: new Hai(TILE.BACK), isTsumo: false, playerWind: TILE.WIND.EAST, roundWind: TILE.WIND.EAST}),
                 new BlockHaisList());
-            const result = new ScoreResolver(contextStub, new Map()).hanName(testcase.han);
+            const result = new ScoreResolver(contextStub, new YakuDetails()).hanName(testcase.han, testcase.isYakuman);
             expect(result).toEqual(testcase.expected);
         });
     });

package/tests/shanten/chitoitsu.ts

@@ -0,0 +1,42 @@
+export const casesChitoi = [
+  {
+    name: "chitoi_1",
+    hais: [1,1,4,4,9,9,13,13,17,17,21,21,28,28],
+    expected: -1
+  },
+  {
+    name: "chitoi_2",
+    hais: [1,1,4,4,9,9,13,13,17,17,21,21,28],
+    expected: 0
+  },
+  {
+    name: "chitoi_3",
+    hais: [2,2,2,6,6,9,9,14,14,19,19,21,21],
+    expected: 1
+  },
+  {
+    name: "chitoi_4",
+    hais: [2,2,2,5,7,9,9,14,14,19,19,21,21],
+    expected: 1
+  },
+  {
+    name: "chitoi_5",
+    hais: [1,1,1,5,5,9,9,13,13,18,18,23,23],
+    expected: 1
+  },
+  {
+    name: "chitoi_6",
+    hais: [2,2,2,2,7,9,9,14,14,19,19,21,21],
+    expected: 2
+  },
+  {
+    name: "chitoi_7",
+    hais: [2,2,2,2,7,9,11,14,14,19,19,21,21],
+    expected: 2
+  },
+  {
+    name: "chitoi_8",
+    hais: [1,4,9,11,14,19,21,23,24,28,29,30,31],
+    expected: 6
+  },
+]

package/tests/shanten/kokushi.ts

@@ -0,0 +1,23 @@
+
+export const casesKokushi = [
+  {
+    name: "kokushi_1",
+    hais: [1,9,10,18,19,27,28,29,30,31,32,33,34],
+    expected: 0
+  },
+  {
+    name: "kokushi_2",
+    hais: [1,9,10,10,19,27,28,29,30,31,32,33,34],
+    expected: 0
+  },
+  {
+    name: "kokushi_3",
+    hais: [1,9,10,17,19,27,28,29,30,31,32,33,34],
+    expected: 1
+  },
+  {
+    name: "kokushi_4",
+    hais: [1,9,10,10,10,27,28,29,30,31,32,33,34],
+    expected: 1
+  },
+]

package/tests/shanten/{test1.ts → normal.ts}

@@ -1,4 +1,4 @@
-export const cases1 = [
+export const casesNormal = [
   {
     name: "naki_1_1",
     hais: [1,2,3,4,5,6,7,8,10,11],
@@ -69,6 +69,11 @@ export const cases1 = [
     hais: [1,2,3,4,5,6,7,28,28,31,31,32,32],
     expected: 1
   },
+  {
+    name: "shanten1_5",
+    hais: [1,1,1,1,4,4,4,4,7,7,7,7,9],
+    expected: 1
+  },
   {
     name: "shanten2_1",
     hais: [1,1,1,2,5,11,12,12,13,14,15,17,18],
@@ -108,35 +113,5 @@ export const cases1 = [
     name: "shanten6_3",
     hais: [1,4,8,11,14,17,22,27,28,29,30,32,33],
     expected: 6
-  },
-  {
-    name: "chitoi_1",
-    hais: [1,1,4,4,9,9,13,13,17,17,21,21,28,28],
-    expected: -1
-  },
-  {
-    name: "chitoi_2",
-    hais: [1,1,4,4,9,9,13,13,17,17,21,21,28],
-    expected: 0
-  },
-  {
-    name: "kokushi_1",
-    hais: [1,9,10,18,19,27,28,29,30,31,32,33,34],
-    expected: 0
-  },
-  {
-    name: "kokushi_2",
-    hais: [1,9,10,10,19,27,28,29,30,31,32,33,34],
-    expected: 0
-  },
-  {
-    name: "kokushi_3",
-    hais: [1,9,10,17,19,27,28,29,30,31,32,33,34],
-    expected: 1
-  },
-  {
-    name: "kokushi_4",
-    hais: [1,9,10,10,10,27,28,29,30,31,32,33,34],
-    expected: 1
-  },
+  }
 ]

package/tests/shanten.test.ts

@@ -1,5 +1,7 @@
 import { Hai } from '../modules/Hai';
-import { cases1 } from './shanten/test1';
+import { casesNormal } from './shanten/normal';
+import { casesChitoi } from './shanten/chitoitsu';
+import { casesKokushi } from './shanten/kokushi';
 import { ShantenCalculator } from '../modules/ShantenCalculator';
 
 type ShantenCase = {
@@ -9,7 +11,9 @@ type ShantenCase = {
 };
 
 const testcases: Map<string, ShantenCase[]> = new Map();
-testcases.set("case1", cases1);
+testcases.set("normal", casesNormal);
+testcases.set("chitoitsu", casesChitoi);
+testcases.set("kokushi", casesKokushi);
 
 testcases.forEach((value, key) => {
     describe(key, () => {

package/tests/tensuu/fu.ts

@@ -61,10 +61,8 @@ export const caseFu: TehaiCase<FuSpec[][]>[] = [
     kuitan: true,
     melds: [
       {hai: 2, type: MeldType.CHI},
-      {hai: 4, type: MeldType.CHI},
-      {hai: 6, type: MeldType.CHI},
     ] as MeldSpec[],
-    hais: [12,13,14,16,16],
+    hais: [4,5,6,7,8,9,12,13,14,16,16],
     expected: [
       [{name: "喰い平和", fu: 30}]
     ] as FuSpec[][]
@@ -77,26 +75,8 @@ export const caseFu: TehaiCase<FuSpec[][]>[] = [
     kuitan: true,
     melds: [
       {hai: 1, type: MeldType.CHI},
-      {hai: 7, type: MeldType.CHI},
-      {hai: 10, type: MeldType.CHI},
-    ] as MeldSpec[],
-    hais: [16,17,18,27,27],
-    expected: [
-      [{name: "喰い平和", fu: 30}]
-    ] as FuSpec[][]
-  },
-  {
-    name: "kuipinfu_4",
-    desc: "喰い平和",
-    agariHai: 18,
-    isTsumo: false,
-    kuitan: true,
-    melds: [
-      {hai: 1, type: MeldType.CHI},
-      {hai: 7, type: MeldType.CHI},
-      {hai: 10, type: MeldType.CHI},
     ] as MeldSpec[],
-    hais: [16,17,18,29,29],
+    hais: [7,8,9,10,11,12,16,17,18,27,27],
     expected: [
       [{name: "喰い平和", fu: 30}]
     ] as FuSpec[][]

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);
         });
     });