mahjong_engine 1.1.3 → 1.1.4

package/dist/yaku/yakuman/ExtendedYakumanChecker.d.ts

@@ -0,0 +1,9 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+import { YakuContext } from '../YakuContext.js';
+export declare abstract class ExtendedYakumanChecker extends YakuCheckerBase {
+    protected abstract baseChecker: YakuCheckerBase;
+    protected abstract requiredMachiCount: number;
+    constructor(context: YakuContext);
+    isSatisfied(): boolean;
+}
+//# sourceMappingURL=ExtendedYakumanChecker.d.ts.map

package/dist/yaku/yakuman/ExtendedYakumanChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExtendedYakumanChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/ExtendedYakumanChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,8BAAsB,sBAAuB,SAAQ,eAAe;IAChE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;gBAElC,OAAO,EAAE,WAAW;IAMzB,WAAW,IAAI,OAAO;CAIhC"}

package/dist/yaku/yakuman/ExtendedYakumanChecker.js

@@ -0,0 +1,14 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export class ExtendedYakumanChecker extends YakuCheckerBase {
+    constructor(context) {
+        super(context);
+        this.hanMenzen = 26;
+        this.hanFuro = 26;
+    }
+    isSatisfied() {
+        if (!this.baseChecker.check())
+            return false;
+        return this.calculateMachiCount() === this.requiredMachiCount;
+    }
+}
+//# sourceMappingURL=ExtendedYakumanChecker.js.map

package/dist/yaku/yakuman/ExtendedYakumanChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExtendedYakumanChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/ExtendedYakumanChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,OAAgB,sBAAuB,SAAQ,eAAe;IAIhE,YAAY,OAAoB;QAC5B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACtB,CAAC;IAEM,WAAW;QACd,IAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC;QAC3C,OAAO,IAAI,CAAC,mBAAmB,EAAE,KAAK,IAAI,CAAC,kBAAkB,CAAC;IAClE,CAAC;CACJ"}

package/dist/yaku/yakuman/Kokushi13Checker.d.ts

@@ -0,0 +1,10 @@
+import { ExtendedYakumanChecker } from './ExtendedYakumanChecker.js';
+import { YakuContext } from '../YakuContext.js';
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export declare class Kokushi13Checker extends ExtendedYakumanChecker {
+    protected yakuName: string;
+    protected baseChecker: YakuCheckerBase;
+    protected requiredMachiCount: number;
+    constructor(context: YakuContext);
+}
+//# sourceMappingURL=Kokushi13Checker.d.ts.map

package/dist/yaku/yakuman/Kokushi13Checker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Kokushi13Checker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/Kokushi13Checker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,qBAAa,gBAAiB,SAAQ,sBAAsB;IACxD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAe;IACzC,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IACvC,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC;gBAEzB,OAAO,EAAE,WAAW;CAKnC"}

package/dist/yaku/yakuman/Kokushi13Checker.js

@@ -0,0 +1,13 @@
+import { ExtendedYakumanChecker } from './ExtendedYakumanChecker.js';
+import { KokushiChecker } from './KokushiChecker.js';
+export class Kokushi13Checker extends ExtendedYakumanChecker {
+    yakuName = "国士無双13面待ち";
+    baseChecker;
+    requiredMachiCount;
+    constructor(context) {
+        super(context);
+        this.baseChecker = new KokushiChecker(context);
+        this.requiredMachiCount = 13;
+    }
+}
+//# sourceMappingURL=Kokushi13Checker.js.map

package/dist/yaku/yakuman/Kokushi13Checker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Kokushi13Checker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/Kokushi13Checker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD,MAAM,OAAO,gBAAiB,SAAQ,sBAAsB;IAC9C,QAAQ,GAAW,WAAW,CAAC;IAC/B,WAAW,CAAkB;IAC7B,kBAAkB,CAAS;IAErC,YAAY,OAAoB;QAC5B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IACjC,CAAC;CACJ"}

package/dist/yaku/yakuman/KokushiChecker.d.ts

@@ -0,0 +1,7 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export declare class KokushiChecker extends YakuCheckerBase {
+    protected yakuName: string;
+    protected isSatisfied(): boolean;
+    isKokushi(): boolean;
+}
+//# sourceMappingURL=KokushiChecker.d.ts.map

package/dist/yaku/yakuman/KokushiChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"KokushiChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/KokushiChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,qBAAa,cAAe,SAAQ,eAAe;IAC/C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAU;IAEpC,SAAS,CAAC,WAAW,IAAI,OAAO;IAKzB,SAAS,IAAI,OAAO;CAG9B"}

package/dist/yaku/yakuman/KokushiChecker.js

@@ -0,0 +1,14 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+import { BlockType } from '../../MahjongConsts.js';
+export class KokushiChecker extends YakuCheckerBase {
+    yakuName = "国士無双";
+    isSatisfied() {
+        if (!this.isMenzen())
+            return false;
+        return this.context.block.getBlockHais().some(b => b.getType() === BlockType.KOKUSHI);
+    }
+    isKokushi() {
+        return this.isSatisfied();
+    }
+}
+//# sourceMappingURL=KokushiChecker.js.map

package/dist/yaku/yakuman/KokushiChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"KokushiChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/KokushiChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,OAAO,cAAe,SAAQ,eAAe;IACrC,QAAQ,GAAW,MAAM,CAAC;IAE1B,WAAW;QACjB,IAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;YAAE,OAAO,KAAK,CAAC;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,SAAS,CAAC,OAAO,CAAC,CAAC;IAC1F,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;CACJ"}

package/dist/yaku/yakuman/RyuisoChecker.d.ts

@@ -0,0 +1,6 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export declare class RyuisoChecker extends YakuCheckerBase {
+    protected yakuName: string;
+    protected isSatisfied(): boolean;
+}
+//# sourceMappingURL=RyuisoChecker.d.ts.map

package/dist/yaku/yakuman/RyuisoChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RyuisoChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/RyuisoChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,qBAAa,aAAc,SAAQ,eAAe;IAC9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAS;IAEnC,SAAS,CAAC,WAAW,IAAI,OAAO;CAUnC"}

package/dist/yaku/yakuman/RyuisoChecker.js

@@ -0,0 +1,13 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export class RyuisoChecker extends YakuCheckerBase {
+    yakuName = "緑一色";
+    isSatisfied() {
+        const greenNums = new Set([20, 21, 22, 24, 26, 33]);
+        const allTiles = [
+            ...this.context.hais,
+            ...this.context.melds.flatMap(m => m.getHais())
+        ];
+        return allTiles.every(h => greenNums.has(h.getId()));
+    }
+}
+//# sourceMappingURL=RyuisoChecker.js.map

package/dist/yaku/yakuman/RyuisoChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RyuisoChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/RyuisoChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,OAAO,aAAc,SAAQ,eAAe;IACpC,QAAQ,GAAW,KAAK,CAAC;IAEzB,WAAW;QACjB,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAEpD,MAAM,QAAQ,GAAG;YACb,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI;YACpB,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;SAClD,CAAC;QAEF,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;CACJ"}

package/dist/yaku/yakuman/ShosushiChecker.d.ts

@@ -0,0 +1,6 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export declare class ShosushiChecker extends YakuCheckerBase {
+    protected yakuName: string;
+    protected isSatisfied(): boolean;
+}
+//# sourceMappingURL=ShosushiChecker.d.ts.map

package/dist/yaku/yakuman/ShosushiChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ShosushiChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/ShosushiChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,qBAAa,eAAgB,SAAQ,eAAe;IAChD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAS;IAEnC,SAAS,CAAC,WAAW,IAAI,OAAO;CAOnC"}

package/dist/yaku/yakuman/ShosushiChecker.js

@@ -0,0 +1,11 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export class ShosushiChecker extends YakuCheckerBase {
+    yakuName = "小四喜";
+    isSatisfied() {
+        const { foundTargets, mentsuCount, jantoCount } = this.countTargetBlocks(this.context.block, [28, 29, 30, 31]);
+        if (foundTargets.size !== 4)
+            return false;
+        return mentsuCount === 3 && jantoCount === 1;
+    }
+}
+//# sourceMappingURL=ShosushiChecker.js.map

package/dist/yaku/yakuman/ShosushiChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ShosushiChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/ShosushiChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,OAAO,eAAgB,SAAQ,eAAe;IACtC,QAAQ,GAAW,KAAK,CAAC;IAEzB,WAAW;QACjB,MAAM,EAAC,YAAY,EAAE,WAAW,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,EAAC,EAAE,EAAC,EAAE,EAAC,EAAE,CAAC,CAAC,CAAC;QAE1G,IAAG,YAAY,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAEzC,OAAO,WAAW,KAAK,CAAC,IAAI,UAAU,KAAK,CAAC,CAAC;IACjD,CAAC;CACJ"}

package/dist/yaku/yakuman/SuankoChecker.d.ts

@@ -0,0 +1,7 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export declare class SuankoChecker extends YakuCheckerBase {
+    protected yakuName: string;
+    protected isSatisfied(): boolean;
+    isSuanko(): boolean;
+}
+//# sourceMappingURL=SuankoChecker.d.ts.map

package/dist/yaku/yakuman/SuankoChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SuankoChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/SuankoChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,qBAAa,aAAc,SAAQ,eAAe;IAC9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAS;IAEnC,SAAS,CAAC,WAAW,IAAI,OAAO;IAKzB,QAAQ,IAAI,OAAO;CAG7B"}

package/dist/yaku/yakuman/SuankoChecker.js

@@ -0,0 +1,13 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export class SuankoChecker extends YakuCheckerBase {
+    yakuName = "四暗刻";
+    isSatisfied() {
+        if (!this.isMenzen())
+            return false;
+        return this.countAnko() === 4;
+    }
+    isSuanko() {
+        return this.isSatisfied();
+    }
+}
+//# sourceMappingURL=SuankoChecker.js.map

package/dist/yaku/yakuman/SuankoChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SuankoChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/SuankoChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,OAAO,aAAc,SAAQ,eAAe;IACpC,QAAQ,GAAW,KAAK,CAAC;IAEzB,WAAW;QACjB,IAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;YAAE,OAAO,KAAK,CAAC;QAClC,OAAO,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;CACJ"}

package/dist/yaku/yakuman/SuankoTankiChecker.d.ts

@@ -0,0 +1,8 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+import { YakuContext } from '../YakuContext.js';
+export declare class SuankoTankiChecker extends YakuCheckerBase {
+    protected yakuName: string;
+    constructor(context: YakuContext);
+    protected isSatisfied(): boolean;
+}
+//# sourceMappingURL=SuankoTankiChecker.d.ts.map

package/dist/yaku/yakuman/SuankoTankiChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SuankoTankiChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/SuankoTankiChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,kBAAmB,SAAQ,eAAe;IACnD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAW;gBAEzB,OAAO,EAAE,WAAW;IAMhC,SAAS,CAAC,WAAW,IAAI,OAAO;CAYnC"}

package/dist/yaku/yakuman/SuankoTankiChecker.js

@@ -0,0 +1,24 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+import { BlockType } from '../../MahjongConsts.js';
+import { SuankoChecker } from './SuankoChecker.js';
+export class SuankoTankiChecker extends YakuCheckerBase {
+    yakuName = "四暗刻単騎";
+    constructor(context) {
+        super(context);
+        this.hanMenzen = 26;
+        this.hanFuro = 26;
+    }
+    isSatisfied() {
+        const base = new SuankoChecker(this.context);
+        if (!base.isSuanko())
+            return false;
+        for (const blockhais of this.context.block) {
+            if (blockhais.getType() === BlockType.JANTO) {
+                if (blockhais.getHais().some(h => h.getId() == this.context.ctx.agariHai.getId()))
+                    return true;
+            }
+        }
+        return false;
+    }
+}
+//# sourceMappingURL=SuankoTankiChecker.js.map

package/dist/yaku/yakuman/SuankoTankiChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SuankoTankiChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/SuankoTankiChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,OAAO,kBAAmB,SAAQ,eAAe;IACzC,QAAQ,GAAW,OAAO,CAAC;IAErC,YAAY,OAAoB;QAC5B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACtB,CAAC;IAES,WAAW;QACjB,MAAM,IAAI,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC5C,IAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;YAAE,OAAO,KAAK,CAAC;QAElC,KAAI,MAAM,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,CAAC;YACvC,IAAG,SAAS,CAAC,OAAO,EAAE,KAAK,SAAS,CAAC,KAAK,EAAC,CAAC;gBACxC,IAAG,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;oBAAE,OAAO,IAAI,CAAC;YAClG,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}

package/dist/yaku/yakuman/SukantsuChecker.d.ts

@@ -0,0 +1,6 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export declare class SukantsuChecker extends YakuCheckerBase {
+    protected yakuName: string;
+    protected isSatisfied(): boolean;
+}
+//# sourceMappingURL=SukantsuChecker.d.ts.map

package/dist/yaku/yakuman/SukantsuChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SukantsuChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/SukantsuChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,qBAAa,eAAgB,SAAQ,eAAe;IAChD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAS;IAEnC,SAAS,CAAC,WAAW,IAAI,OAAO;CAGnC"}

package/dist/yaku/yakuman/SukantsuChecker.js

@@ -0,0 +1,8 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export class SukantsuChecker extends YakuCheckerBase {
+    yakuName = "四槓子";
+    isSatisfied() {
+        return this.countKantsu() === 4;
+    }
+}
+//# sourceMappingURL=SukantsuChecker.js.map

package/dist/yaku/yakuman/SukantsuChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SukantsuChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/SukantsuChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,OAAO,eAAgB,SAAQ,eAAe;IACtC,QAAQ,GAAW,KAAK,CAAC;IAEzB,WAAW;QACjB,OAAO,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;CACJ"}

package/dist/yaku/yakuman/TsuisoChecker.d.ts

@@ -0,0 +1,6 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export declare class TsuisoChecker extends YakuCheckerBase {
+    protected yakuName: string;
+    protected isSatisfied(): boolean;
+}
+//# sourceMappingURL=TsuisoChecker.d.ts.map

package/dist/yaku/yakuman/TsuisoChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TsuisoChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/yakuman/TsuisoChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,qBAAa,aAAc,SAAQ,eAAe;IAC9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAS;IAEnC,SAAS,CAAC,WAAW,IAAI,OAAO;CAInC"}

package/dist/yaku/yakuman/TsuisoChecker.js

@@ -0,0 +1,9 @@
+import { YakuCheckerBase } from '../YakuCheckerBase.js';
+export class TsuisoChecker extends YakuCheckerBase {
+    yakuName = "字一色";
+    isSatisfied() {
+        const allTiles = this.getAllTiles();
+        return allTiles.every(h => h.isJihai());
+    }
+}
+//# sourceMappingURL=TsuisoChecker.js.map

package/dist/yaku/yakuman/TsuisoChecker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TsuisoChecker.js","sourceRoot":"","sources":["../../../modules/yaku/yakuman/TsuisoChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,OAAO,aAAc,SAAQ,eAAe;IACpC,QAAQ,GAAW,KAAK,CAAC;IAEzB,WAAW;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5C,CAAC;CACJ"}

package/modules/ShantenCalculator.ts

@@ -41,7 +41,7 @@ export class ShantenCalculator {
         return new BlockDivider(this.hais).divide().length > 0;
     }
 
-    private calculateNormal(): number {
+    public calculateNormal(): number {
         if(this.isAgari()) return -1;
         if(this.isTenpai()) return 0;
 
@@ -123,13 +123,13 @@ export class ShantenCalculator {
         return minShanten;
     }
     
-    private calculateChitoitsu(): number {
+    public calculateChitoitsu(): number {
         const haiNumsSet = [...new Set(this.hais.map(h => h.getId()))];
-        const toitsuCount = haiNumsSet.filter(n => this.counts[n - 1] === 2).length;
-        return 6 - toitsuCount;
+        const toitsuCount = haiNumsSet.filter(n => this.counts[n - 1] >= 2).length;
+        return 6 - toitsuCount + Math.max(0, 7 - haiNumsSet.length);
     }
 
-    private calculateKokushi(): number {
+    public calculateKokushi(): number {
         const yaochuHais = this.hais.filter(h => h.isYaochuHai());
         const hasToitsu = yaochuHais.some(h => this.counts[h.getId() - 1] >= 2);
         const yaochuCount = [...new Set(yaochuHais.map(h => h.getId()))].length;

package/modules/tensuu/ScoreResolver.ts

@@ -43,6 +43,13 @@ export class ScoreResolver{
         const fuCeiled = this.ceilFusuu(fuBasic);
         const hanName = this.getHanName(han);
         const tensuu = TensuuCalculator.calcTensuu(han, fuCeiled);
-        return new ScoreResult(han, fuBasic, fuCeiled, tensuu, hanName, fuDetail);
+        return new ScoreResult({
+            han: han, 
+            fuBasic: fuBasic,
+            fuCeiled: fuCeiled,
+            tensuu: tensuu,
+            hanName: hanName,
+            fuDetail: fuDetail
+        });
     }
 }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mahjong_engine",
-  "version": "1.1.3",
+  "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

@@ -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[][]