mahjong_engine 1.1.2 → 1.1.4

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/yaku/NormalYakuChecker.ts

@@ -17,7 +17,6 @@ export class NormalYakuChecker{
             if(checker.check()) yaku_map.set(checker.getName(), checker.getHan());
         }
         
-        if(this.context.ctx.ippatsu) yaku_map.set("一発", 1);
         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);

package/modules/yaku/YakumanChecker.ts

@@ -17,6 +17,9 @@ export class YakumanChecker{
             { 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);
+
         for(const Checker of YakumanCheckers) {
             const checker = Checker(this.context);
             if(checker.check()) yaku_map.set(checker.getName(), checker.getHan());
@@ -26,9 +29,6 @@ export class YakumanChecker{
             if(yaku_map.has(main)) yaku_map.delete(sub);
         }
 
-        if(this.context.ctx.event === WinEvent.TENHO) yaku_map.set("天和", 13);
-        if(this.context.ctx.event === WinEvent.CHIHO) yaku_map.set("地和", 13);
-
         return yaku_map;
     }
 }

package/modules/yaku/index.ts

@@ -37,51 +37,56 @@ import { YakuhaiChecker } from './normal/YakuhaiChecker.js';
 import { KazehaiChecker } from './normal/KazehaiChecker.js';
 import { RiichiChecker } from './normal/RiichiChecker.js';
 import { DaburiiChecker } from './normal/DaburiiChecker.js';
+import { IppatsuChecker } from './normal/IppatsuChecker.js';
 
 export type YakuCheckerFactory =
     (context: YakuContext) => YakuCheckerBase;
 
 export const YakumanCheckers: YakuCheckerFactory[] = [
+    ctx => new DaisangenChecker(ctx),
+    ctx => new SuankoChecker(ctx),
     ctx => new TsuisoChecker(ctx),
-    ctx => new ChinrotoChecker(ctx),
     ctx => new RyuisoChecker(ctx),
+    ctx => new ChinrotoChecker(ctx),
+    ctx => new KokushiChecker(ctx),
+    ctx => new ShosushiChecker(ctx),
     ctx => new SukantsuChecker(ctx),
     ctx => new ChurenChecker(ctx),
-    ctx => new Churen9Checker(ctx),
-    ctx => new SuankoChecker(ctx),
+
     ctx => new SuankoTankiChecker(ctx),
-    ctx => new KokushiChecker(ctx),
     ctx => new Kokushi13Checker(ctx),
+    ctx => new Churen9Checker(ctx),
     ctx => new DaisushiChecker(ctx),
-    ctx => new ShosushiChecker(ctx),
-    ctx => new DaisangenChecker(ctx),
 ];
 
 export const NormalYakuCheckers: YakuCheckerFactory[] = [
+    ctx => new RiichiChecker(ctx),
+    ctx => new DaburiiChecker(ctx),
+    ctx => new IppatsuChecker(ctx),
+    ctx => new MenzenTsumoChecker(ctx),
+    ctx => new PinfuChecker(ctx),
+    ctx => new TanyaoChecker(ctx),
+
     ctx => new ChinitsuChecker(ctx),
     ctx => new HonitsuChecker(ctx),
     ctx => new JunchanChecker(ctx),
-    ctx => new HonchanChecker(ctx),
-    ctx => new HonrotoChecker(ctx),
     ctx => new RyanpekoChecker(ctx),
     ctx => new ChitoitsuChecker(ctx),
-    ctx => new SanankoChecker(ctx),
-    ctx => new ToitoiChecker(ctx),
-    ctx => new IipekoChecker(ctx),
-    ctx => new ShosangenChecker(ctx),
+    ctx => new HonchanChecker(ctx),
+    ctx => new HonrotoChecker(ctx),
     ctx => new SanshokuChecker(ctx),
     ctx => new DoukouChecker(ctx),
-    ctx => new IttsuuChecker(ctx),
-    ctx => new TanyaoChecker(ctx),
     ctx => new SankantsuChecker(ctx),
-    ctx => new MenzenTsumoChecker(ctx),
-    ctx => new PinfuChecker(ctx),
+    ctx => new ToitoiChecker(ctx),
+    ctx => new SanankoChecker(ctx),
+    ctx => new ShosangenChecker(ctx),
+    ctx => new IttsuuChecker(ctx),
+    ctx => new IipekoChecker(ctx),
+
     ctx => new RenpuuhaiChecker(ctx),
     ctx => new KazehaiChecker(ctx, "自風牌", ctx.ctx.playerWind, ctx.ctx.roundWind),
     ctx => new KazehaiChecker(ctx, "場風牌", ctx.ctx.roundWind, ctx.ctx.playerWind),
     ctx => new YakuhaiChecker(ctx, 32, "白"),
     ctx => new YakuhaiChecker(ctx, 33, "發"),
     ctx => new YakuhaiChecker(ctx, 34, "中"),
-    ctx => new RiichiChecker(ctx),
-    ctx => new DaburiiChecker(ctx),
 ];

package/modules/yaku/normal/IppatsuChecker.ts

@@ -0,0 +1,15 @@
+import { YakuContext } from '../YakuContext.js';
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+
+export class IppatsuChecker extends YakuCheckerBase{
+    protected yakuName: string = "一発";
+
+    constructor(context: YakuContext){
+        super(context);
+        this.hanMenzen = 1;
+    }
+
+    protected isSatisfied(): boolean {
+        return this.isMenzen() && this.context.ctx.ippatsu;
+    }
+}

package/package.json

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

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

@@ -38,6 +38,49 @@ export const caseFu: TehaiCase<FuSpec[][]>[] = [
       [{name: "七対子", fu: 25}]
     ] as FuSpec[][]
   },
+  {
+    name: "kuipinfu_1",
+    desc: "喰い平和",
+    agariHai: 12,
+    isTsumo: false,
+    melds: [
+      {hai: 1, type: MeldType.CHI},
+      {hai: 4, type: MeldType.CHI},
+      {hai: 7, type: MeldType.CHI},
+    ] as MeldSpec[],
+    hais: [12,13,14,16,16],
+    expected: [
+      [{name: "喰い平和", fu: 30}]
+    ] as FuSpec[][]
+  },
+  {
+    name: "kuipinfu_2",
+    desc: "喰い平和",
+    agariHai: 12,
+    isTsumo: false,
+    kuitan: true,
+    melds: [
+      {hai: 2, type: MeldType.CHI},
+    ] as MeldSpec[],
+    hais: [4,5,6,7,8,9,12,13,14,16,16],
+    expected: [
+      [{name: "喰い平和", fu: 30}]
+    ] as FuSpec[][]
+  },
+  {
+    name: "kuipinfu_3",
+    desc: "喰い平和",
+    agariHai: 18,
+    isTsumo: false,
+    kuitan: true,
+    melds: [
+      {hai: 1, type: MeldType.CHI},
+    ] as MeldSpec[],
+    hais: [7,8,9,10,11,12,16,17,18,27,27],
+    expected: [
+      [{name: "喰い平和", fu: 30}]
+    ] as FuSpec[][]
+  },
   {
     name: "machi_tanki",
     desc: "待ちの形",