mahjong_engine 1.1.4 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/dist/modules/index.d.ts +2 -0
  2. package/dist/modules/index.d.ts.map +1 -1
  3. package/dist/modules/index.js +2 -0
  4. package/dist/modules/index.js.map +1 -1
  5. package/dist/modules/tensuu/FuCalculator.d.ts +2 -1
  6. package/dist/modules/tensuu/FuCalculator.d.ts.map +1 -1
  7. package/dist/modules/tensuu/FuCalculator.js.map +1 -1
  8. package/dist/modules/tensuu/ScoreResolver.d.ts +3 -3
  9. package/dist/modules/tensuu/ScoreResolver.d.ts.map +1 -1
  10. package/dist/modules/tensuu/ScoreResolver.js +10 -10
  11. package/dist/modules/tensuu/ScoreResolver.js.map +1 -1
  12. package/dist/modules/tensuu/TensuuCalculator.d.ts +7 -2
  13. package/dist/modules/tensuu/TensuuCalculator.d.ts.map +1 -1
  14. package/dist/modules/tensuu/TensuuCalculator.js +8 -4
  15. package/dist/modules/tensuu/TensuuCalculator.js.map +1 -1
  16. package/dist/modules/yaku/NormalYakuChecker.d.ts +2 -1
  17. package/dist/modules/yaku/NormalYakuChecker.d.ts.map +1 -1
  18. package/dist/modules/yaku/NormalYakuChecker.js +10 -9
  19. package/dist/modules/yaku/NormalYakuChecker.js.map +1 -1
  20. package/dist/modules/yaku/YakuChecker.d.ts +2 -1
  21. package/dist/modules/yaku/YakuChecker.d.ts.map +1 -1
  22. package/dist/modules/yaku/YakuChecker.js +5 -4
  23. package/dist/modules/yaku/YakuChecker.js.map +1 -1
  24. package/dist/modules/yaku/YakuDetail.d.ts +7 -0
  25. package/dist/modules/yaku/YakuDetail.d.ts.map +1 -0
  26. package/dist/modules/yaku/YakuDetail.js +11 -0
  27. package/dist/modules/yaku/YakuDetail.js.map +1 -0
  28. package/dist/modules/yaku/YakuDetails.d.ts +13 -0
  29. package/dist/modules/yaku/YakuDetails.d.ts.map +1 -0
  30. package/dist/modules/yaku/YakuDetails.js +32 -0
  31. package/dist/modules/yaku/YakuDetails.js.map +1 -0
  32. package/dist/modules/yaku/YakumanChecker.d.ts +2 -1
  33. package/dist/modules/yaku/YakumanChecker.d.ts.map +1 -1
  34. package/dist/modules/yaku/YakumanChecker.js +8 -7
  35. package/dist/modules/yaku/YakumanChecker.js.map +1 -1
  36. package/dist/tests/hanName.test.js +2 -1
  37. package/dist/tests/hanName.test.js.map +1 -1
  38. package/dist/tests/tensuu/hanName.d.ts.map +1 -1
  39. package/dist/tests/tensuu/hanName.js +33 -0
  40. package/dist/tests/tensuu/hanName.js.map +1 -1
  41. package/dist/tests/tensuu/tensuuNum.d.ts.map +1 -1
  42. package/dist/tests/tensuu/tensuuNum.js +20 -0
  43. package/dist/tests/tensuu/tensuuNum.js.map +1 -1
  44. package/dist/tests/tensuuFromNum.test.js +1 -1
  45. package/dist/tests/tensuuFromNum.test.js.map +1 -1
  46. package/dist/tests/testConsts.d.ts +2 -0
  47. package/dist/tests/testConsts.d.ts.map +1 -1
  48. package/dist/tests/yaku.test.js +3 -3
  49. package/dist/tests/yaku.test.js.map +1 -1
  50. package/modules/index.ts +2 -0
  51. package/modules/tensuu/FuCalculator.ts +3 -2
  52. package/modules/tensuu/ScoreResolver.ts +13 -13
  53. package/modules/tensuu/TensuuCalculator.ts +10 -5
  54. package/modules/yaku/NormalYakuChecker.ts +11 -10
  55. package/modules/yaku/YakuChecker.ts +6 -5
  56. package/modules/yaku/YakuDetail.ts +11 -0
  57. package/modules/yaku/YakuDetails.ts +42 -0
  58. package/modules/yaku/YakumanChecker.ts +9 -7
  59. package/package.json +1 -1
  60. package/tests/hanName.test.ts +2 -1
  61. package/tests/tensuu/hanName.ts +33 -0
  62. package/tests/tensuu/tensuuNum.ts +20 -0
  63. package/tests/tensuuFromNum.test.ts +1 -1
  64. package/tests/testConsts.ts +3 -1
  65. package/tests/yaku.test.ts +7 -5
@@ -14,6 +14,8 @@ export { ScoreResult } from './tensuu/ScoreResult.js';
14
14
  export { MachiCalculator } from './MachiCalculator.js';
15
15
  export { BlockHaisList } from './BlockHaisList.js';
16
16
  export { ShantenCalculator } from './ShantenCalculator.js';
17
+ export { YakuDetail } from './yaku/YakuDetail.js';
18
+ export { YakuDetails } from './yaku/YakuDetails.js';
17
19
  export * from './MahjongConsts.js';
18
20
  export type * from './tileDefs.js';
19
21
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,cAAc,oBAAoB,CAAC;AACnC,mBAAmB,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,cAAc,oBAAoB,CAAC;AACnC,mBAAmB,eAAe,CAAC"}
@@ -14,5 +14,7 @@ export { ScoreResult } from './tensuu/ScoreResult.js';
14
14
  export { MachiCalculator } from './MachiCalculator.js';
15
15
  export { BlockHaisList } from './BlockHaisList.js';
16
16
  export { ShantenCalculator } from './ShantenCalculator.js';
17
+ export { YakuDetail } from './yaku/YakuDetail.js';
18
+ export { YakuDetails } from './yaku/YakuDetails.js';
17
19
  export * from './MahjongConsts.js';
18
20
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,cAAc,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,cAAc,oBAAoB,CAAC"}
@@ -1,9 +1,10 @@
1
1
  import { YakuContext } from '../yaku/YakuContext.js';
2
+ import { YakuDetails } from '../yaku/YakuDetails.js';
2
3
  import { FuDetail } from './FuDetail.js';
3
4
  export declare class FuCalculator {
4
5
  private readonly context;
5
6
  private readonly yaku;
6
- constructor(context: YakuContext, yaku: Map<string, number>);
7
+ constructor(context: YakuContext, yaku: YakuDetails);
7
8
  private calcSpecialFu;
8
9
  private calcBaseFu;
9
10
  private calcMachuFu;
@@ -1 +1 @@
1
- {"version":3,"file":"FuCalculator.d.ts","sourceRoot":"","sources":["../../../modules/tensuu/FuCalculator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AA0BzC,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;gBAE/B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAK3D,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,YAAY;IAgBpB,MAAM,IAAI,QAAQ,EAAE;IAgBpB,OAAO,CAAC,aAAa;CAIxB"}
1
+ {"version":3,"file":"FuCalculator.d.ts","sourceRoot":"","sources":["../../../modules/tensuu/FuCalculator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AA0BzC,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;gBAEvB,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW;IAKnD,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,YAAY;IAgBpB,MAAM,IAAI,QAAQ,EAAE;IAgBpB,OAAO,CAAC,aAAa;CAIxB"}
@@ -1 +1 @@
1
- {"version":3,"file":"FuCalculator.js","sourceRoot":"","sources":["../../../modules/tensuu/FuCalculator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FuCalculator.js","sourceRoot":"","sources":["../../../modules/tensuu/FuCalculator.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,14 @@
1
1
  import { YakuContext } from '../yaku/YakuContext.js';
2
2
  import { ScoreResult } from './ScoreResult.js';
3
+ import { YakuDetails } from '../yaku/YakuDetails.js';
3
4
  export declare class ScoreResolver {
4
5
  private readonly context;
5
6
  private readonly yaku;
6
- constructor(context: YakuContext, yaku: Map<string, number>);
7
- private calcHonsuu;
7
+ constructor(context: YakuContext, yaku: YakuDetails);
8
8
  private countFusuu;
9
9
  private ceilFusuu;
10
10
  private getHanName;
11
- hanName(han: number): string;
11
+ hanName(han: number, isYakuman: boolean): string;
12
12
  resolve(): ScoreResult;
13
13
  }
14
14
  //# sourceMappingURL=ScoreResolver.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ScoreResolver.d.ts","sourceRoot":"","sources":["../../../modules/tensuu/ScoreResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,aAAa;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;gBAC/B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAK3D,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,OAAO;CAgBV"}
1
+ {"version":3,"file":"ScoreResolver.d.ts","sourceRoot":"","sources":["../../../modules/tensuu/ScoreResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,qBAAa,aAAa;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;gBACvB,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW;IAKnD,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO;IAIvC,OAAO;CAgBV"}
@@ -8,32 +8,32 @@ export class ScoreResolver {
8
8
  this.context = context;
9
9
  this.yaku = yaku;
10
10
  }
11
- calcHonsuu() {
12
- return [...this.yaku.values()].reduce((sum, val) => sum + val, 0);
13
- }
14
11
  countFusuu(detail) {
15
12
  return detail.reduce((sum, val) => sum + val.fu, 0);
16
13
  }
17
14
  ceilFusuu(fu) {
18
15
  return fu === 25 ? 25 : Math.ceil(fu / 10) * 10;
19
16
  }
20
- getHanName(han) {
21
- for (const limit of TensuuCalculator.BASE_LIMITS) {
17
+ getHanName(han, isYakuman) {
18
+ const limits = isYakuman
19
+ ? TensuuCalculator.BASE_LIMITS_YAKUMAN
20
+ : TensuuCalculator.BASE_LIMITS_NORMAL;
21
+ for (const limit of limits) {
22
22
  if (han >= limit.han)
23
23
  return limit.name;
24
24
  }
25
25
  return "";
26
26
  }
27
- hanName(han) {
28
- return this.getHanName(han);
27
+ hanName(han, isYakuman) {
28
+ return this.getHanName(han, isYakuman);
29
29
  }
30
30
  resolve() {
31
- const han = this.calcHonsuu();
31
+ const han = this.yaku.calcHonsuu();
32
32
  const fuDetail = new FuCalculator(this.context, this.yaku).calcFu();
33
33
  const fuBasic = this.countFusuu(fuDetail);
34
34
  const fuCeiled = this.ceilFusuu(fuBasic);
35
- const hanName = this.getHanName(han);
36
- const tensuu = TensuuCalculator.calcTensuu(han, fuCeiled);
35
+ const hanName = this.getHanName(han, this.yaku.isIncludeYakuman());
36
+ const tensuu = TensuuCalculator.calcTensuu(han, fuCeiled, this.yaku.isIncludeYakuman());
37
37
  return new ScoreResult({
38
38
  han: han,
39
39
  fuBasic: fuBasic,
@@ -1 +1 @@
1
- {"version":3,"file":"ScoreResolver.js","sourceRoot":"","sources":["../../../modules/tensuu/ScoreResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,OAAO,aAAa;IACL,OAAO,CAAc;IACrB,IAAI,CAAsB;IAC3C,YAAY,OAAoB,EAAE,IAAyB;QACvD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAEO,UAAU;QACd,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAEO,UAAU,CAAC,MAAkB;QACjC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IAEO,SAAS,CAAC,EAAU;QACxB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;IACpD,CAAC;IAEO,UAAU,CAAC,GAAW;QAC1B,KAAI,MAAM,KAAK,IAAI,gBAAgB,CAAC,WAAW,EAAC,CAAC;YAC7C,IAAG,GAAG,IAAI,KAAK,CAAC,GAAG;gBAAE,OAAO,KAAK,CAAC,IAAI,CAAC;QAC3C,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,CAAC,GAAW;QACf,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,OAAO;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC1D,OAAO,IAAI,WAAW,CAAC;YACnB,GAAG,EAAE,GAAG;YACR,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;SACrB,CAAC,CAAC;IACP,CAAC;CACJ"}
1
+ {"version":3,"file":"ScoreResolver.js","sourceRoot":"","sources":["../../../modules/tensuu/ScoreResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,MAAM,OAAO,aAAa;IACL,OAAO,CAAc;IACrB,IAAI,CAAc;IACnC,YAAY,OAAoB,EAAE,IAAiB;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAEO,UAAU,CAAC,MAAkB;QACjC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IAEO,SAAS,CAAC,EAAU;QACxB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;IACpD,CAAC;IAEO,UAAU,CAAC,GAAW,EAAE,SAAkB;QAC9C,MAAM,MAAM,GAAG,SAAS;YACpB,CAAC,CAAC,gBAAgB,CAAC,mBAAmB;YACtC,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,CAAC;QAC1C,KAAI,MAAM,KAAK,IAAI,MAAM,EAAC,CAAC;YACvB,IAAG,GAAG,IAAI,KAAK,CAAC,GAAG;gBAAE,OAAO,KAAK,CAAC,IAAI,CAAC;QAC3C,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,SAAkB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACxF,OAAO,IAAI,WAAW,CAAC;YACnB,GAAG,EAAE,GAAG;YACR,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;SACrB,CAAC,CAAC;IACP,CAAC;CACJ"}
@@ -1,6 +1,11 @@
1
1
  import { TensuuResult } from './TensuuResult.js';
2
2
  export declare class TensuuCalculator {
3
- static readonly BASE_LIMITS: {
3
+ static readonly BASE_LIMITS_YAKUMAN: {
4
+ han: number;
5
+ base: number;
6
+ name: string;
7
+ }[];
8
+ static readonly BASE_LIMITS_NORMAL: {
4
9
  han: number;
5
10
  base: number;
6
11
  name: string;
@@ -9,6 +14,6 @@ export declare class TensuuCalculator {
9
14
  static calcRonTensuu(base: number, multi: number): number;
10
15
  static calcdividedTensuu(ronTensuu: number, divide: number): number;
11
16
  static calcTensuuFromBase(base: number): TensuuResult;
12
- static calcTensuu(han: number, fu: number): TensuuResult;
17
+ static calcTensuu(han: number, fu: number, isYakuman: boolean): TensuuResult;
13
18
  }
14
19
  //# sourceMappingURL=TensuuCalculator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"TensuuCalculator.d.ts","sourceRoot":"","sources":["../../../modules/tensuu/TensuuCalculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,qBAAa,gBAAgB;IACzB,MAAM,CAAC,QAAQ,CAAC,WAAW;;;;QAWzB;IAEF,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAItD,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzD,MAAM,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAI1D,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IASrD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,YAAY;CAM3D"}
1
+ {"version":3,"file":"TensuuCalculator.d.ts","sourceRoot":"","sources":["../../../modules/tensuu/TensuuCalculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,qBAAa,gBAAgB;IACzB,MAAM,CAAC,QAAQ,CAAC,mBAAmB;;;;QAOjC;IACF,MAAM,CAAC,QAAQ,CAAC,kBAAkB;;;;QAMjC;IAGD,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAItD,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAIzD,MAAM,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAI1D,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IASrD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,YAAY;CAO/E"}
@@ -1,12 +1,15 @@
1
1
  import { TensuuResult } from './TensuuResult.js';
2
2
  export class TensuuCalculator {
3
- static BASE_LIMITS = [
3
+ static BASE_LIMITS_YAKUMAN = [
4
4
  { han: 78, base: 48000, name: "六倍役満" },
5
5
  { han: 65, base: 40000, name: "五倍役満" },
6
6
  { han: 52, base: 32000, name: "四倍役満" },
7
7
  { han: 39, base: 24000, name: "三倍役満" },
8
8
  { han: 26, base: 16000, name: "二倍役満" },
9
- { han: 13, base: 8000, name: "役満" },
9
+ { han: 13, base: 8000, name: "役満" }
10
+ ];
11
+ static BASE_LIMITS_NORMAL = [
12
+ { han: 13, base: 8000, name: "数え役満" },
10
13
  { han: 11, base: 6000, name: "三倍満" },
11
14
  { han: 8, base: 4000, name: "倍満" },
12
15
  { han: 6, base: 3000, name: "跳満" },
@@ -28,8 +31,9 @@ export class TensuuCalculator {
28
31
  const tsumoKo = { oya: this.calcdividedTensuu(ronKo, 2), ko: this.calcdividedTensuu(ronKo, 4) };
29
32
  return new TensuuResult(base, ronOya, ronKo, tsumoOya, tsumoKo);
30
33
  }
31
- static calcTensuu(han, fu) {
32
- for (const limit of this.BASE_LIMITS) {
34
+ static calcTensuu(han, fu, isYakuman) {
35
+ const limits = isYakuman ? this.BASE_LIMITS_YAKUMAN : this.BASE_LIMITS_NORMAL;
36
+ for (const limit of limits) {
33
37
  if (han >= limit.han)
34
38
  return this.calcTensuuFromBase(limit.base);
35
39
  }
@@ -1 +1 @@
1
- {"version":3,"file":"TensuuCalculator.js","sourceRoot":"","sources":["../../../modules/tensuu/TensuuCalculator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TensuuCalculator.js","sourceRoot":"","sources":["../../../modules/tensuu/TensuuCalculator.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  import { YakuContext } from './YakuContext.js';
2
+ import { YakuDetails } from './YakuDetails.js';
2
3
  export declare class NormalYakuChecker {
3
4
  protected readonly context: YakuContext;
4
5
  constructor(context: YakuContext);
5
- check(): Map<string, number>;
6
+ check(): YakuDetails;
6
7
  }
7
8
  //# sourceMappingURL=NormalYakuChecker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"NormalYakuChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/NormalYakuChecker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;gBAE5B,OAAO,EAAE,WAAW;IAKhC,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAkB/B"}
1
+ {"version":3,"file":"NormalYakuChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/NormalYakuChecker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;gBAE5B,OAAO,EAAE,WAAW;IAKhC,KAAK,IAAI,WAAW;CAkBvB"}
@@ -1,4 +1,5 @@
1
1
  import { WinEvent } from '../MahjongConsts.js';
2
+ import { YakuDetails } from './YakuDetails.js';
2
3
  import { NormalYakuCheckers } from './index.js';
3
4
  export class NormalYakuChecker {
4
5
  context;
@@ -7,24 +8,24 @@ export class NormalYakuChecker {
7
8
  }
8
9
  //役判定
9
10
  check() {
10
- const yaku_map = new Map();
11
+ const yakuDetails = new YakuDetails();
11
12
  for (const Checker of NormalYakuCheckers) {
12
13
  const checker = Checker(this.context);
13
14
  if (checker.check())
14
- yaku_map.set(checker.getName(), checker.getHan());
15
+ yakuDetails.add(checker.getName(), checker.getHan());
15
16
  }
16
17
  if (this.context.ctx.event === WinEvent.RINSHAN)
17
- yaku_map.set("嶺上開花", 1);
18
+ yakuDetails.add("嶺上開花", 1);
18
19
  if (this.context.ctx.event === WinEvent.CHANKAN)
19
- yaku_map.set("槍槓", 1);
20
+ yakuDetails.add("槍槓", 1);
20
21
  if (this.context.ctx.event === WinEvent.HAITEI)
21
- yaku_map.set("海底摸月", 1);
22
+ yakuDetails.add("海底摸月", 1);
22
23
  if (this.context.ctx.event === WinEvent.HOUTEI)
23
- yaku_map.set("河底撈魚", 1);
24
- if (yaku_map.size > 0 && this.context.ctx.dora > 0) {
25
- yaku_map.set("ドラ", this.context.ctx.dora);
24
+ yakuDetails.add("河底撈魚", 1);
25
+ if (yakuDetails.length > 0 && this.context.ctx.dora > 0) {
26
+ yakuDetails.add("ドラ", this.context.ctx.dora);
26
27
  }
27
- return yaku_map;
28
+ return yakuDetails;
28
29
  }
29
30
  }
30
31
  //# sourceMappingURL=NormalYakuChecker.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"NormalYakuChecker.js","sourceRoot":"","sources":["../../../modules/yaku/NormalYakuChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,OAAO,iBAAiB;IACP,OAAO,CAAc;IAExC,YAAY,OAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK;IACL,KAAK;QACD,MAAM,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;QAChD,KAAI,MAAM,OAAO,IAAI,kBAAkB,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,IAAG,OAAO,CAAC,KAAK,EAAE;gBAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,OAAO;YAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,OAAO;YAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACtE,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,MAAM;YAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACvE,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,MAAM;YAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAEvE,IAAG,QAAQ,CAAC,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,EAAC,CAAC;YAC/C,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}
1
+ {"version":3,"file":"NormalYakuChecker.js","sourceRoot":"","sources":["../../../modules/yaku/NormalYakuChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,OAAO,iBAAiB;IACP,OAAO,CAAc;IAExC,YAAY,OAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK;IACL,KAAK;QACD,MAAM,WAAW,GAAgB,IAAI,WAAW,EAAE,CAAC;QACnD,KAAI,MAAM,OAAO,IAAI,kBAAkB,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,IAAG,OAAO,CAAC,KAAK,EAAE;gBAAE,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,OAAO;YAAE,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC3E,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,OAAO;YAAE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzE,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,MAAM;YAAE,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,MAAM;YAAE,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAE1E,IAAG,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,EAAC,CAAC;YACpD,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ"}
@@ -1,7 +1,8 @@
1
1
  import { YakuContext } from './YakuContext.js';
2
+ import { YakuDetails } from './YakuDetails.js';
2
3
  export declare class YakuChecker {
3
4
  private context;
4
5
  constructor(context: YakuContext);
5
- check(): Map<string, number>;
6
+ check(): YakuDetails;
6
7
  }
7
8
  //# sourceMappingURL=YakuChecker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"YakuChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/YakuChecker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,qBAAa,WAAW;IACpB,OAAO,CAAC,OAAO,CAAa;gBAEhB,OAAO,EAAE,WAAW;IAIhC,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAc/B"}
1
+ {"version":3,"file":"YakuChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/YakuChecker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,WAAW;IACpB,OAAO,CAAC,OAAO,CAAa;gBAEhB,OAAO,EAAE,WAAW;IAIhC,KAAK,IAAI,WAAW;CAcvB"}
@@ -1,5 +1,6 @@
1
1
  import { YakumanChecker } from './YakumanChecker.js';
2
2
  import { NormalYakuChecker } from './NormalYakuChecker.js';
3
+ import { YakuDetails } from './YakuDetails.js';
3
4
  export class YakuChecker {
4
5
  context;
5
6
  constructor(context) {
@@ -10,13 +11,13 @@ export class YakuChecker {
10
11
  const tehai_num = this.context.hais.length;
11
12
  const furo_num = this.context.melds.length;
12
13
  if (tehai_num + furo_num * 3 !== 14)
13
- return new Map();
14
- const yakuman_map = new YakumanChecker(this.context).check();
15
- if (yakuman_map.size === 0) {
14
+ return new YakuDetails();
15
+ const yakumanDetails = new YakumanChecker(this.context).check();
16
+ if (yakumanDetails.length === 0) {
16
17
  return new NormalYakuChecker(this.context).check();
17
18
  }
18
19
  else {
19
- return yakuman_map;
20
+ return yakumanDetails;
20
21
  }
21
22
  }
22
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"YakuChecker.js","sourceRoot":"","sources":["../../../modules/yaku/YakuChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,OAAO,WAAW;IACZ,OAAO,CAAa;IAE5B,YAAY,OAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK;QACD,uCAAuC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;QAC3C,IAAG,SAAS,GAAG,QAAQ,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,IAAI,GAAG,EAAkB,CAAC;QAErE,MAAM,WAAW,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7D,IAAG,WAAW,CAAC,IAAI,KAAK,CAAC,EAAC,CAAC;YACvB,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;QACvD,CAAC;aACG,CAAC;YACD,OAAO,WAAW,CAAC;QACvB,CAAC;IACL,CAAC;CACJ"}
1
+ {"version":3,"file":"YakuChecker.js","sourceRoot":"","sources":["../../../modules/yaku/YakuChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,OAAO,WAAW;IACZ,OAAO,CAAa;IAE5B,YAAY,OAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK;QACD,uCAAuC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;QAC3C,IAAG,SAAS,GAAG,QAAQ,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,IAAI,WAAW,EAAE,CAAC;QAE7D,MAAM,cAAc,GAAgB,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7E,IAAG,cAAc,CAAC,MAAM,KAAK,CAAC,EAAC,CAAC;YAC5B,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;QACvD,CAAC;aACG,CAAC;YACD,OAAO,cAAc,CAAC;QAC1B,CAAC;IACL,CAAC;CACJ"}
@@ -0,0 +1,7 @@
1
+ export declare class YakuDetail {
2
+ readonly yakuName: string;
3
+ readonly han: number;
4
+ readonly isYakuman: boolean;
5
+ constructor(yakuName: string, han: number, isYakuman?: boolean);
6
+ }
7
+ //# sourceMappingURL=YakuDetail.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"YakuDetail.d.ts","sourceRoot":"","sources":["../../../modules/yaku/YakuDetail.ts"],"names":[],"mappings":"AAAA,qBAAa,UAAU;IACnB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;gBAEhB,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO;CAKjE"}
@@ -0,0 +1,11 @@
1
+ export class YakuDetail {
2
+ yakuName;
3
+ han;
4
+ isYakuman;
5
+ constructor(yakuName, han, isYakuman) {
6
+ this.yakuName = yakuName;
7
+ this.han = han;
8
+ this.isYakuman = isYakuman ?? false;
9
+ }
10
+ }
11
+ //# sourceMappingURL=YakuDetail.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"YakuDetail.js","sourceRoot":"","sources":["../../../modules/yaku/YakuDetail.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,UAAU;IACV,QAAQ,CAAS;IACjB,GAAG,CAAS;IACZ,SAAS,CAAU;IAE5B,YAAY,QAAgB,EAAE,GAAW,EAAE,SAAmB;QAC1D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,KAAK,CAAC;IACxC,CAAC;CACJ"}
@@ -0,0 +1,13 @@
1
+ import { YakuDetail } from "./YakuDetail";
2
+ export declare class YakuDetails {
3
+ private details;
4
+ constructor(details?: YakuDetail[]);
5
+ add(yakuName: string, han: number, isYakuman?: boolean): void;
6
+ has(yakuName: string): boolean;
7
+ delete(yakuName: string): void;
8
+ calcHonsuu(): number;
9
+ isIncludeYakuman(): boolean;
10
+ toMap(): Map<string, number>;
11
+ get length(): number;
12
+ }
13
+ //# sourceMappingURL=YakuDetails.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"YakuDetails.d.ts","sourceRoot":"","sources":["../../../modules/yaku/YakuDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,WAAW;IACpB,OAAO,CAAC,OAAO,CAAe;gBAElB,OAAO,GAAE,UAAU,EAAO;IAItC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO;IAItD,GAAG,CAAC,QAAQ,EAAE,MAAM;IAIpB,MAAM,CAAC,QAAQ,EAAE,MAAM;IAIvB,UAAU;IAIV,gBAAgB;IAIhB,KAAK;IASL,IAAI,MAAM,WAET;CACJ"}
@@ -0,0 +1,32 @@
1
+ import { YakuDetail } from "./YakuDetail";
2
+ export class YakuDetails {
3
+ details;
4
+ constructor(details = []) {
5
+ this.details = details;
6
+ }
7
+ add(yakuName, han, isYakuman) {
8
+ this.details.push(new YakuDetail(yakuName, han, isYakuman ?? false));
9
+ }
10
+ has(yakuName) {
11
+ return this.details.some(detail => detail.yakuName === yakuName);
12
+ }
13
+ delete(yakuName) {
14
+ this.details = this.details.filter(detail => detail.yakuName !== yakuName);
15
+ }
16
+ calcHonsuu() {
17
+ return this.details.reduce((sum, val) => sum + val.han, 0);
18
+ }
19
+ isIncludeYakuman() {
20
+ return this.details.some(detail => detail.isYakuman);
21
+ }
22
+ toMap() {
23
+ return new Map(this.details.map(detail => [
24
+ detail.yakuName,
25
+ detail.han
26
+ ]));
27
+ }
28
+ get length() {
29
+ return this.details.length;
30
+ }
31
+ }
32
+ //# sourceMappingURL=YakuDetails.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"YakuDetails.js","sourceRoot":"","sources":["../../../modules/yaku/YakuDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,OAAO,WAAW;IACZ,OAAO,CAAe;IAE9B,YAAY,UAAwB,EAAE;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,QAAgB,EAAE,GAAW,EAAE,SAAmB;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,GAAG,CAAC,QAAgB;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,QAAgB;QACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IAC/E,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAED,KAAK;QACD,OAAO,IAAI,GAAG,CACV,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACvB,MAAM,CAAC,QAAQ;YACf,MAAM,CAAC,GAAG;SACb,CAAC,CACL,CAAC;IACN,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;CACJ"}
@@ -1,7 +1,8 @@
1
1
  import { YakuContext } from './YakuContext.js';
2
+ import { YakuDetails } from './YakuDetails.js';
2
3
  export declare class YakumanChecker {
3
4
  protected readonly context: YakuContext;
4
5
  constructor(context: YakuContext);
5
- check(): Map<string, number>;
6
+ check(): YakuDetails;
6
7
  }
7
8
  //# sourceMappingURL=YakumanChecker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"YakumanChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/YakumanChecker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,qBAAa,cAAc;IACvB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;gBAE5B,OAAO,EAAE,WAAW;IAKhC,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAqB/B"}
1
+ {"version":3,"file":"YakumanChecker.d.ts","sourceRoot":"","sources":["../../../modules/yaku/YakumanChecker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,qBAAa,cAAc;IACvB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;gBAE5B,OAAO,EAAE,WAAW;IAKhC,KAAK,IAAI,WAAW;CAqBvB"}
@@ -1,4 +1,5 @@
1
1
  import { WinEvent } from '../MahjongConsts.js';
2
+ import { YakuDetails } from './YakuDetails.js';
2
3
  import { YakumanCheckers } from './index.js';
3
4
  export class YakumanChecker {
4
5
  context;
@@ -12,21 +13,21 @@ export class YakumanChecker {
12
13
  { main: "四暗刻単騎", sub: "四暗刻" },
13
14
  { main: "国士無双13面待ち", sub: "国士無双" },
14
15
  ];
15
- const yaku_map = new Map();
16
+ const yakuDetails = new YakuDetails();
16
17
  if (this.context.ctx.event === WinEvent.TENHO)
17
- yaku_map.set("天和", 13);
18
+ yakuDetails.add("天和", 13, true);
18
19
  if (this.context.ctx.event === WinEvent.CHIHO)
19
- yaku_map.set("地和", 13);
20
+ yakuDetails.add("地和", 13, true);
20
21
  for (const Checker of YakumanCheckers) {
21
22
  const checker = Checker(this.context);
22
23
  if (checker.check())
23
- yaku_map.set(checker.getName(), checker.getHan());
24
+ yakuDetails.add(checker.getName(), checker.getHan(), true);
24
25
  }
25
26
  for (const { main, sub } of excludes) {
26
- if (yaku_map.has(main))
27
- yaku_map.delete(sub);
27
+ if (yakuDetails.has(main))
28
+ yakuDetails.delete(sub);
28
29
  }
29
- return yaku_map;
30
+ return yakuDetails;
30
31
  }
31
32
  }
32
33
  //# sourceMappingURL=YakumanChecker.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"YakumanChecker.js","sourceRoot":"","sources":["../../../modules/yaku/YakumanChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,cAAc;IACJ,OAAO,CAAc;IAExC,YAAY,OAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK;IACL,KAAK;QACD,MAAM,QAAQ,GAAG;YACb,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAC;YAC9B,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAC;YAC5B,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAC;SACpC,CAAC;QACF,MAAM,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;QAChD,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK;YAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrE,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK;YAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAErE,KAAI,MAAM,OAAO,IAAI,eAAe,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,IAAG,OAAO,CAAC,KAAK,EAAE;gBAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,KAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC;YAClC,IAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}
1
+ {"version":3,"file":"YakumanChecker.js","sourceRoot":"","sources":["../../../modules/yaku/YakumanChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,cAAc;IACJ,OAAO,CAAc;IAExC,YAAY,OAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK;IACL,KAAK;QACD,MAAM,QAAQ,GAAG;YACb,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAC;YAC9B,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAC;YAC5B,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAC;SACpC,CAAC;QACF,MAAM,WAAW,GAAgB,IAAI,WAAW,EAAE,CAAC;QACnD,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK;YAAE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC9E,IAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK;YAAE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAE9E,KAAI,MAAM,OAAO,IAAI,eAAe,EAAE,CAAC;YACnC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,IAAG,OAAO,CAAC,KAAK,EAAE;gBAAE,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;QACnF,CAAC;QAED,KAAI,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC;YAClC,IAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ"}
@@ -1,11 +1,12 @@
1
1
  import { casesHanName } from './tensuu/hanName';
2
2
  import { BlockHaisList, Hai, PlayerContext, PlayerHand, ScoreResolver, TILE, YakuContext } from "../modules";
3
+ import { YakuDetails } from "../modules/yaku/YakuDetails";
3
4
  const testcases = casesHanName;
4
5
  testcases.forEach(testcase => {
5
6
  describe(testcase.desc, () => {
6
7
  test(testcase.name, () => {
7
8
  const contextStub = new YakuContext(new PlayerHand([], []), new PlayerContext({ agariHai: new Hai(TILE.BACK), isTsumo: false, playerWind: TILE.WIND.EAST, roundWind: TILE.WIND.EAST }), new BlockHaisList());
8
- const result = new ScoreResolver(contextStub, new Map()).hanName(testcase.han);
9
+ const result = new ScoreResolver(contextStub, new YakuDetails()).hanName(testcase.han, testcase.isYakuman);
9
10
  expect(result).toEqual(testcase.expected);
10
11
  });
11
12
  });
@@ -1 +1 @@
1
- {"version":3,"file":"hanName.test.js","sourceRoot":"","sources":["../../tests/hanName.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE7G,MAAM,SAAS,GAAkB,YAAY,CAAC;AAE9C,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;IACzB,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;QACzB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;YACrB,MAAM,WAAW,GAAG,IAAI,WAAW,CAC/B,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,EACtB,IAAI,aAAa,CAAC,EAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAC,CAAC,EACxH,IAAI,aAAa,EAAE,CAAC,CAAC;YACzB,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,WAAW,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC/E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"hanName.test.js","sourceRoot":"","sources":["../../tests/hanName.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7G,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,MAAM,SAAS,GAAkB,YAAY,CAAC;AAE9C,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;IACzB,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;QACzB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;YACrB,MAAM,WAAW,GAAG,IAAI,WAAW,CAC/B,IAAI,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,EACtB,IAAI,aAAa,CAAC,EAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAC,CAAC,EACxH,IAAI,aAAa,EAAE,CAAC,CAAC;YACzB,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,WAAW,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC3G,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"hanName.d.ts","sourceRoot":"","sources":["../../../tests/tensuu/hanName.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,eAAO,MAAM,YAAY,EAAE,WAAW,EAmHrC,CAAA"}
1
+ {"version":3,"file":"hanName.d.ts","sourceRoot":"","sources":["../../../tests/tensuu/hanName.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,eAAO,MAAM,YAAY,EAAE,WAAW,EAoJrC,CAAA"}