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.
- package/dist/modules/index.d.ts +2 -0
- package/dist/modules/index.d.ts.map +1 -1
- package/dist/modules/index.js +2 -0
- package/dist/modules/index.js.map +1 -1
- package/dist/modules/tensuu/FuCalculator.d.ts +2 -1
- package/dist/modules/tensuu/FuCalculator.d.ts.map +1 -1
- package/dist/modules/tensuu/FuCalculator.js.map +1 -1
- package/dist/modules/tensuu/ScoreResolver.d.ts +3 -3
- package/dist/modules/tensuu/ScoreResolver.d.ts.map +1 -1
- package/dist/modules/tensuu/ScoreResolver.js +10 -10
- package/dist/modules/tensuu/ScoreResolver.js.map +1 -1
- package/dist/modules/tensuu/TensuuCalculator.d.ts +7 -2
- package/dist/modules/tensuu/TensuuCalculator.d.ts.map +1 -1
- package/dist/modules/tensuu/TensuuCalculator.js +8 -4
- package/dist/modules/tensuu/TensuuCalculator.js.map +1 -1
- package/dist/modules/yaku/NormalYakuChecker.d.ts +2 -1
- package/dist/modules/yaku/NormalYakuChecker.d.ts.map +1 -1
- package/dist/modules/yaku/NormalYakuChecker.js +10 -9
- package/dist/modules/yaku/NormalYakuChecker.js.map +1 -1
- package/dist/modules/yaku/YakuChecker.d.ts +2 -1
- package/dist/modules/yaku/YakuChecker.d.ts.map +1 -1
- package/dist/modules/yaku/YakuChecker.js +5 -4
- package/dist/modules/yaku/YakuChecker.js.map +1 -1
- package/dist/modules/yaku/YakuDetail.d.ts +7 -0
- package/dist/modules/yaku/YakuDetail.d.ts.map +1 -0
- package/dist/modules/yaku/YakuDetail.js +11 -0
- package/dist/modules/yaku/YakuDetail.js.map +1 -0
- package/dist/modules/yaku/YakuDetails.d.ts +13 -0
- package/dist/modules/yaku/YakuDetails.d.ts.map +1 -0
- package/dist/modules/yaku/YakuDetails.js +32 -0
- package/dist/modules/yaku/YakuDetails.js.map +1 -0
- package/dist/modules/yaku/YakumanChecker.d.ts +2 -1
- package/dist/modules/yaku/YakumanChecker.d.ts.map +1 -1
- package/dist/modules/yaku/YakumanChecker.js +8 -7
- package/dist/modules/yaku/YakumanChecker.js.map +1 -1
- package/dist/tests/hanName.test.js +2 -1
- package/dist/tests/hanName.test.js.map +1 -1
- package/dist/tests/tensuu/hanName.d.ts.map +1 -1
- package/dist/tests/tensuu/hanName.js +33 -0
- package/dist/tests/tensuu/hanName.js.map +1 -1
- package/dist/tests/tensuu/tensuuNum.d.ts.map +1 -1
- package/dist/tests/tensuu/tensuuNum.js +20 -0
- package/dist/tests/tensuu/tensuuNum.js.map +1 -1
- package/dist/tests/tensuuFromNum.test.js +1 -1
- package/dist/tests/tensuuFromNum.test.js.map +1 -1
- package/dist/tests/testConsts.d.ts +2 -0
- package/dist/tests/testConsts.d.ts.map +1 -1
- package/dist/tests/yaku.test.js +3 -3
- package/dist/tests/yaku.test.js.map +1 -1
- package/modules/index.ts +2 -0
- package/modules/tensuu/FuCalculator.ts +3 -2
- package/modules/tensuu/ScoreResolver.ts +13 -13
- package/modules/tensuu/TensuuCalculator.ts +10 -5
- package/modules/yaku/NormalYakuChecker.ts +11 -10
- package/modules/yaku/YakuChecker.ts +6 -5
- package/modules/yaku/YakuDetail.ts +11 -0
- package/modules/yaku/YakuDetails.ts +42 -0
- package/modules/yaku/YakumanChecker.ts +9 -7
- package/package.json +1 -1
- package/tests/hanName.test.ts +2 -1
- package/tests/tensuu/hanName.ts +33 -0
- package/tests/tensuu/tensuuNum.ts +20 -0
- package/tests/tensuuFromNum.test.ts +1 -1
- package/tests/testConsts.ts +3 -1
- package/tests/yaku.test.ts +7 -5
|
@@ -3,114 +3,147 @@ export const casesHanName = [
|
|
|
3
3
|
name: "hon1",
|
|
4
4
|
desc: "なし",
|
|
5
5
|
han: 1,
|
|
6
|
+
isYakuman: false,
|
|
6
7
|
expected: ""
|
|
7
8
|
},
|
|
8
9
|
{
|
|
9
10
|
name: "hon2",
|
|
10
11
|
desc: "なし",
|
|
11
12
|
han: 2,
|
|
13
|
+
isYakuman: false,
|
|
12
14
|
expected: ""
|
|
13
15
|
},
|
|
14
16
|
{
|
|
15
17
|
name: "hon3",
|
|
16
18
|
desc: "なし",
|
|
17
19
|
han: 3,
|
|
20
|
+
isYakuman: false,
|
|
18
21
|
expected: ""
|
|
19
22
|
},
|
|
20
23
|
{
|
|
21
24
|
name: "hon4",
|
|
22
25
|
desc: "なし",
|
|
23
26
|
han: 4,
|
|
27
|
+
isYakuman: false,
|
|
24
28
|
expected: ""
|
|
25
29
|
},
|
|
26
30
|
{
|
|
27
31
|
name: "hon5",
|
|
28
32
|
desc: "満貫",
|
|
29
33
|
han: 5,
|
|
34
|
+
isYakuman: false,
|
|
30
35
|
expected: "満貫"
|
|
31
36
|
},
|
|
32
37
|
{
|
|
33
38
|
name: "hon6",
|
|
34
39
|
desc: "跳満",
|
|
35
40
|
han: 6,
|
|
41
|
+
isYakuman: false,
|
|
36
42
|
expected: "跳満"
|
|
37
43
|
},
|
|
38
44
|
{
|
|
39
45
|
name: "hon7",
|
|
40
46
|
desc: "跳満",
|
|
41
47
|
han: 7,
|
|
48
|
+
isYakuman: false,
|
|
42
49
|
expected: "跳満"
|
|
43
50
|
},
|
|
44
51
|
{
|
|
45
52
|
name: "hon8",
|
|
46
53
|
desc: "跳満",
|
|
47
54
|
han: 8,
|
|
55
|
+
isYakuman: false,
|
|
48
56
|
expected: "倍満"
|
|
49
57
|
},
|
|
50
58
|
{
|
|
51
59
|
name: "hon9",
|
|
52
60
|
desc: "倍満",
|
|
53
61
|
han: 9,
|
|
62
|
+
isYakuman: false,
|
|
54
63
|
expected: "倍満"
|
|
55
64
|
},
|
|
56
65
|
{
|
|
57
66
|
name: "hon10",
|
|
58
67
|
desc: "倍満",
|
|
59
68
|
han: 10,
|
|
69
|
+
isYakuman: false,
|
|
60
70
|
expected: "倍満"
|
|
61
71
|
},
|
|
62
72
|
{
|
|
63
73
|
name: "hon11",
|
|
64
74
|
desc: "三倍満",
|
|
65
75
|
han: 11,
|
|
76
|
+
isYakuman: false,
|
|
66
77
|
expected: "三倍満"
|
|
67
78
|
},
|
|
68
79
|
{
|
|
69
80
|
name: "hon12",
|
|
70
81
|
desc: "三倍満",
|
|
71
82
|
han: 12,
|
|
83
|
+
isYakuman: false,
|
|
72
84
|
expected: "三倍満"
|
|
73
85
|
},
|
|
74
86
|
{
|
|
75
87
|
name: "hon13",
|
|
76
88
|
desc: "役満以上",
|
|
77
89
|
han: 13,
|
|
90
|
+
isYakuman: false,
|
|
91
|
+
expected: "数え役満"
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
name: "hon13",
|
|
95
|
+
desc: "役満以上",
|
|
96
|
+
han: 13,
|
|
97
|
+
isYakuman: true,
|
|
78
98
|
expected: "役満"
|
|
79
99
|
},
|
|
80
100
|
{
|
|
81
101
|
name: "hon26",
|
|
82
102
|
desc: "役満以上",
|
|
83
103
|
han: 26,
|
|
104
|
+
isYakuman: false,
|
|
105
|
+
expected: "数え役満"
|
|
106
|
+
},
|
|
107
|
+
{
|
|
108
|
+
name: "hon26",
|
|
109
|
+
desc: "役満以上",
|
|
110
|
+
han: 26,
|
|
111
|
+
isYakuman: true,
|
|
84
112
|
expected: "二倍役満"
|
|
85
113
|
},
|
|
86
114
|
{
|
|
87
115
|
name: "hon39",
|
|
88
116
|
desc: "役満以上",
|
|
89
117
|
han: 39,
|
|
118
|
+
isYakuman: true,
|
|
90
119
|
expected: "三倍役満"
|
|
91
120
|
},
|
|
92
121
|
{
|
|
93
122
|
name: "hon52",
|
|
94
123
|
desc: "役満以上",
|
|
95
124
|
han: 52,
|
|
125
|
+
isYakuman: true,
|
|
96
126
|
expected: "四倍役満"
|
|
97
127
|
},
|
|
98
128
|
{
|
|
99
129
|
name: "hon65",
|
|
100
130
|
desc: "役満以上",
|
|
101
131
|
han: 65,
|
|
132
|
+
isYakuman: true,
|
|
102
133
|
expected: "五倍役満"
|
|
103
134
|
},
|
|
104
135
|
{
|
|
105
136
|
name: "hon78",
|
|
106
137
|
desc: "役満以上",
|
|
107
138
|
han: 78,
|
|
139
|
+
isYakuman: true,
|
|
108
140
|
expected: "六倍役満"
|
|
109
141
|
},
|
|
110
142
|
{
|
|
111
143
|
name: "hon79",
|
|
112
144
|
desc: "役満以上",
|
|
113
145
|
han: 79,
|
|
146
|
+
isYakuman: true,
|
|
114
147
|
expected: "六倍役満"
|
|
115
148
|
},
|
|
116
149
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hanName.js","sourceRoot":"","sources":["../../../tests/tensuu/hanName.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,YAAY,GAAkB;IACvC;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,EAAE;KACf;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,EAAE;KACf;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,EAAE;KACf;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,EAAE;KACf;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,IAAI;KACjB;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,IAAI;KACjB;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,IAAI;KACjB;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,IAAI;KACjB;IACD;QACI,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,IAAI;KACjB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,IAAI;KACjB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,KAAK;KAClB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,KAAK;KAClB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,IAAI;KACjB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,MAAM;KACnB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,MAAM;KACnB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,MAAM;KACnB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,MAAM;KACnB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,MAAM;KACnB;IACD;QACI,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,MAAM;KACnB;CACJ,CAAA"}
|
|
1
|
+
{"version":3,"file":"hanName.js","sourceRoot":"","sources":["../../../tests/tensuu/hanName.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tensuuNum.d.ts","sourceRoot":"","sources":["../../../tests/tensuu/tensuuNum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"tensuuNum.d.ts","sourceRoot":"","sources":["../../../tests/tensuu/tensuuNum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,OAAO,EAAE,aAAa,EAgVlC,CAAC"}
|
|
@@ -280,11 +280,27 @@ export const caseNum = [
|
|
|
280
280
|
fusuu: 20,
|
|
281
281
|
expected: new TensuuResult(8000, 48000, 32000, 16000, { oya: 16000, ko: 8000 })
|
|
282
282
|
},
|
|
283
|
+
{
|
|
284
|
+
name: "hon13",
|
|
285
|
+
desc: "13翻",
|
|
286
|
+
honsuu: 13,
|
|
287
|
+
fusuu: 20,
|
|
288
|
+
isYakuman: true,
|
|
289
|
+
expected: new TensuuResult(8000, 48000, 32000, 16000, { oya: 16000, ko: 8000 })
|
|
290
|
+
},
|
|
291
|
+
{
|
|
292
|
+
name: "hon26",
|
|
293
|
+
desc: "26翻",
|
|
294
|
+
honsuu: 26,
|
|
295
|
+
fusuu: 20,
|
|
296
|
+
expected: new TensuuResult(8000, 48000, 32000, 16000, { oya: 16000, ko: 8000 })
|
|
297
|
+
},
|
|
283
298
|
{
|
|
284
299
|
name: "hon26",
|
|
285
300
|
desc: "26翻",
|
|
286
301
|
honsuu: 26,
|
|
287
302
|
fusuu: 20,
|
|
303
|
+
isYakuman: true,
|
|
288
304
|
expected: new TensuuResult(16000, 96000, 64000, 32000, { oya: 32000, ko: 16000 })
|
|
289
305
|
},
|
|
290
306
|
{
|
|
@@ -292,6 +308,7 @@ export const caseNum = [
|
|
|
292
308
|
desc: "39翻",
|
|
293
309
|
honsuu: 39,
|
|
294
310
|
fusuu: 20,
|
|
311
|
+
isYakuman: true,
|
|
295
312
|
expected: new TensuuResult(24000, 144000, 96000, 48000, { oya: 48000, ko: 24000 })
|
|
296
313
|
},
|
|
297
314
|
{
|
|
@@ -299,6 +316,7 @@ export const caseNum = [
|
|
|
299
316
|
desc: "52翻",
|
|
300
317
|
honsuu: 52,
|
|
301
318
|
fusuu: 20,
|
|
319
|
+
isYakuman: true,
|
|
302
320
|
expected: new TensuuResult(32000, 192000, 128000, 64000, { oya: 64000, ko: 32000 })
|
|
303
321
|
},
|
|
304
322
|
{
|
|
@@ -306,6 +324,7 @@ export const caseNum = [
|
|
|
306
324
|
desc: "65翻",
|
|
307
325
|
honsuu: 65,
|
|
308
326
|
fusuu: 20,
|
|
327
|
+
isYakuman: true,
|
|
309
328
|
expected: new TensuuResult(40000, 240000, 160000, 80000, { oya: 80000, ko: 40000 })
|
|
310
329
|
},
|
|
311
330
|
{
|
|
@@ -313,6 +332,7 @@ export const caseNum = [
|
|
|
313
332
|
desc: "78翻",
|
|
314
333
|
honsuu: 78,
|
|
315
334
|
fusuu: 20,
|
|
335
|
+
isYakuman: true,
|
|
316
336
|
expected: new TensuuResult(48000, 288000, 192000, 96000, { oya: 96000, ko: 48000 })
|
|
317
337
|
},
|
|
318
338
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tensuuNum.js","sourceRoot":"","sources":["../../../tests/tensuu/tensuuNum.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tensuuNum.js","sourceRoot":"","sources":["../../../tests/tensuu/tensuuNum.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ caseNum.forEach(casenum => testcases.push(casenum));
|
|
|
5
5
|
testcases.forEach(testcase => {
|
|
6
6
|
describe(testcase.desc, () => {
|
|
7
7
|
test(testcase.name, () => {
|
|
8
|
-
const expected = TensuuCalculator.calcTensuu(testcase.honsuu, testcase.fusuu);
|
|
8
|
+
const expected = TensuuCalculator.calcTensuu(testcase.honsuu, testcase.fusuu, testcase.isYakuman ?? false);
|
|
9
9
|
expect(testcase.expected).toEqual(expected);
|
|
10
10
|
});
|
|
11
11
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tensuuFromNum.test.js","sourceRoot":"","sources":["../../tests/tensuuFromNum.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,SAAS,GAAoB,EAAE,CAAC;AACtC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;AAEpD,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,QAAQ,GAAG,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tensuuFromNum.test.js","sourceRoot":"","sources":["../../tests/tensuuFromNum.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,SAAS,GAAoB,EAAE,CAAC;AACtC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;AAEpD,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,QAAQ,GAAG,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC;YAC3G,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -34,12 +34,14 @@ export type TensuuNumCase = {
|
|
|
34
34
|
desc: string;
|
|
35
35
|
honsuu: number;
|
|
36
36
|
fusuu: number;
|
|
37
|
+
isYakuman?: boolean;
|
|
37
38
|
expected: TensuuResult;
|
|
38
39
|
};
|
|
39
40
|
export type hanNameCase = {
|
|
40
41
|
name: string;
|
|
41
42
|
desc: string;
|
|
42
43
|
han: number;
|
|
44
|
+
isYakuman: boolean;
|
|
43
45
|
expected: string;
|
|
44
46
|
};
|
|
45
47
|
export type Score = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testConsts.d.ts","sourceRoot":"","sources":["../../tests/testConsts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C,MAAM,MAAM,MAAM,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;CAClC,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,SAAS,IAAI;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,SAAS,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"testConsts.d.ts","sourceRoot":"","sources":["../../tests/testConsts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C,MAAM,MAAM,MAAM,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;CAClC,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,SAAS,IAAI;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,SAAS,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,YAAY,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC"}
|
package/dist/tests/yaku.test.js
CHANGED
|
@@ -14,9 +14,9 @@ testcases.forEach(testcase => {
|
|
|
14
14
|
const blocks = runner.blocks;
|
|
15
15
|
blocks.forEach((block, index) => {
|
|
16
16
|
const context = new YakuContext(runner.hand, runner.ctx, block);
|
|
17
|
-
const
|
|
18
|
-
if (
|
|
19
|
-
yakuMaps.set(index,
|
|
17
|
+
const details = new YakuChecker(context).check();
|
|
18
|
+
if (details.length > 0)
|
|
19
|
+
yakuMaps.set(index, details.toMap());
|
|
20
20
|
});
|
|
21
21
|
expect(yakuMaps).toEqual(testcase.expected);
|
|
22
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaku.test.js","sourceRoot":"","sources":["../../tests/yaku.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"yaku.test.js","sourceRoot":"","sources":["../../tests/yaku.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAMpD,MAAM,SAAS,GAA0B,EAAE,CAAC;AAC5C,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;AACjE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AAE9D,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,QAAQ,GAAa,IAAI,GAAG,EAAE,CAAC;YACrC,MAAM,MAAM,GAA8B,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;YACxE,MAAM,MAAM,GAAmB,MAAM,CAAC,MAAM,CAAC;YAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,MAAM,OAAO,GAAgB,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC7E,MAAM,OAAO,GAAgB,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC9D,IAAG,OAAO,CAAC,MAAM,GAAG,CAAC;oBAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/modules/index.ts
CHANGED
|
@@ -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
|
export type * from './tileDefs.js';
|
|
@@ -2,6 +2,7 @@ import { BlockHais } from '../BlockHais.js';
|
|
|
2
2
|
import { BlockType, MachiType, MeldType } from '../MahjongConsts.js';
|
|
3
3
|
import { MentsuAnalyzer } from '../MentsuAnalyzer.js';
|
|
4
4
|
import { YakuContext } from '../yaku/YakuContext.js';
|
|
5
|
+
import { YakuDetails } from '../yaku/YakuDetails.js';
|
|
5
6
|
import { FuDetail } from './FuDetail.js';
|
|
6
7
|
|
|
7
8
|
type MentsuFuSpec = {
|
|
@@ -30,9 +31,9 @@ const MENTSU_FU_TABLE: Record<string, MentsuFuSpec> = {
|
|
|
30
31
|
|
|
31
32
|
export class FuCalculator{
|
|
32
33
|
private readonly context: YakuContext;
|
|
33
|
-
private readonly yaku:
|
|
34
|
+
private readonly yaku: YakuDetails;
|
|
34
35
|
|
|
35
|
-
constructor(context: YakuContext, yaku:
|
|
36
|
+
constructor(context: YakuContext, yaku: YakuDetails){
|
|
36
37
|
this.context = context;
|
|
37
38
|
this.yaku = yaku;
|
|
38
39
|
}
|
|
@@ -3,19 +3,16 @@ import { TensuuCalculator } from './TensuuCalculator.js';
|
|
|
3
3
|
import { FuCalculator } from './FuCalculator.js';
|
|
4
4
|
import { FuDetail } from './FuDetail.js';
|
|
5
5
|
import { ScoreResult } from './ScoreResult.js';
|
|
6
|
+
import { YakuDetails } from '../yaku/YakuDetails.js';
|
|
6
7
|
|
|
7
8
|
export class ScoreResolver{
|
|
8
9
|
private readonly context: YakuContext;
|
|
9
|
-
private readonly yaku:
|
|
10
|
-
constructor(context: YakuContext, yaku:
|
|
10
|
+
private readonly yaku: YakuDetails;
|
|
11
|
+
constructor(context: YakuContext, yaku: YakuDetails){
|
|
11
12
|
this.context = context;
|
|
12
13
|
this.yaku = yaku;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
|
-
private calcHonsuu(): number{
|
|
16
|
-
return [...this.yaku.values()].reduce((sum, val) => sum + val, 0);
|
|
17
|
-
}
|
|
18
|
-
|
|
19
16
|
private countFusuu(detail: FuDetail[]): number{
|
|
20
17
|
return detail.reduce((sum, val) => sum + val.fu, 0);
|
|
21
18
|
}
|
|
@@ -24,25 +21,28 @@ export class ScoreResolver{
|
|
|
24
21
|
return fu === 25 ? 25 : Math.ceil(fu / 10) * 10;
|
|
25
22
|
}
|
|
26
23
|
|
|
27
|
-
private getHanName(han: number): string{
|
|
28
|
-
|
|
24
|
+
private getHanName(han: number, isYakuman: boolean): string{
|
|
25
|
+
const limits = isYakuman
|
|
26
|
+
? TensuuCalculator.BASE_LIMITS_YAKUMAN
|
|
27
|
+
: TensuuCalculator.BASE_LIMITS_NORMAL;
|
|
28
|
+
for(const limit of limits){
|
|
29
29
|
if(han >= limit.han) return limit.name;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
return "";
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
hanName(han: number){
|
|
36
|
-
return this.getHanName(han);
|
|
35
|
+
hanName(han: number, isYakuman: boolean){
|
|
36
|
+
return this.getHanName(han, isYakuman);
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
resolve(){
|
|
40
|
-
const han = this.calcHonsuu();
|
|
40
|
+
const han = this.yaku.calcHonsuu();
|
|
41
41
|
const fuDetail = new FuCalculator(this.context, this.yaku).calcFu();
|
|
42
42
|
const fuBasic = this.countFusuu(fuDetail);
|
|
43
43
|
const fuCeiled = this.ceilFusuu(fuBasic);
|
|
44
|
-
const hanName = this.getHanName(han);
|
|
45
|
-
const tensuu = TensuuCalculator.calcTensuu(han, fuCeiled);
|
|
44
|
+
const hanName = this.getHanName(han, this.yaku.isIncludeYakuman());
|
|
45
|
+
const tensuu = TensuuCalculator.calcTensuu(han, fuCeiled, this.yaku.isIncludeYakuman());
|
|
46
46
|
return new ScoreResult({
|
|
47
47
|
han: han,
|
|
48
48
|
fuBasic: fuBasic,
|
|
@@ -1,18 +1,22 @@
|
|
|
1
1
|
import { TensuuResult } from './TensuuResult.js';
|
|
2
2
|
|
|
3
3
|
export class TensuuCalculator{
|
|
4
|
-
static readonly
|
|
4
|
+
static readonly BASE_LIMITS_YAKUMAN = [
|
|
5
5
|
{han: 78, base: 48000, name: "六倍役満"},
|
|
6
6
|
{han: 65, base: 40000, name: "五倍役満"},
|
|
7
7
|
{han: 52, base: 32000, name: "四倍役満"},
|
|
8
8
|
{han: 39, base: 24000, name: "三倍役満"},
|
|
9
9
|
{han: 26, base: 16000, name: "二倍役満"},
|
|
10
|
-
{han: 13, base: 8000, name: "役満"}
|
|
10
|
+
{han: 13, base: 8000, name: "役満"}
|
|
11
|
+
];
|
|
12
|
+
static readonly BASE_LIMITS_NORMAL = [
|
|
13
|
+
{han: 13, base: 8000, name: "数え役満"},
|
|
11
14
|
{han: 11, base: 6000, name: "三倍満"},
|
|
12
15
|
{han: 8, base: 4000, name: "倍満"},
|
|
13
16
|
{han: 6, base: 3000, name: "跳満"},
|
|
14
17
|
{han: 5, base: 2000, name: "満貫"},
|
|
15
|
-
]
|
|
18
|
+
]
|
|
19
|
+
|
|
16
20
|
|
|
17
21
|
static calcBaseTensuu(han: number, fu: number): number{
|
|
18
22
|
return Math.min(fu * Math.pow(2, han + 2), 2000);
|
|
@@ -35,8 +39,9 @@ export class TensuuCalculator{
|
|
|
35
39
|
return new TensuuResult(base, ronOya, ronKo, tsumoOya, tsumoKo);
|
|
36
40
|
}
|
|
37
41
|
|
|
38
|
-
static calcTensuu(han: number, fu: number): TensuuResult{
|
|
39
|
-
|
|
42
|
+
static calcTensuu(han: number, fu: number, isYakuman: boolean): TensuuResult{
|
|
43
|
+
const limits = isYakuman ? this.BASE_LIMITS_YAKUMAN : this.BASE_LIMITS_NORMAL;
|
|
44
|
+
for(const limit of limits){
|
|
40
45
|
if(han >= limit.han) return this.calcTensuuFromBase(limit.base);
|
|
41
46
|
}
|
|
42
47
|
return this.calcTensuuFromBase(this.calcBaseTensuu(han, fu));
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { WinEvent } from '../MahjongConsts.js';
|
|
2
2
|
import { YakuContext } from './YakuContext.js';
|
|
3
|
+
import { YakuDetails } from './YakuDetails.js';
|
|
3
4
|
import { NormalYakuCheckers } from './index.js';
|
|
4
5
|
|
|
5
6
|
export class NormalYakuChecker{
|
|
@@ -10,22 +11,22 @@ export class NormalYakuChecker{
|
|
|
10
11
|
}
|
|
11
12
|
|
|
12
13
|
//役判定
|
|
13
|
-
check():
|
|
14
|
-
const
|
|
14
|
+
check(): YakuDetails {
|
|
15
|
+
const yakuDetails: YakuDetails = new YakuDetails();
|
|
15
16
|
for(const Checker of NormalYakuCheckers) {
|
|
16
17
|
const checker = Checker(this.context);
|
|
17
|
-
if(checker.check())
|
|
18
|
+
if(checker.check()) yakuDetails.add(checker.getName(), checker.getHan());
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
if(this.context.ctx.event === WinEvent.RINSHAN)
|
|
21
|
-
if(this.context.ctx.event === WinEvent.CHANKAN)
|
|
22
|
-
if(this.context.ctx.event === WinEvent.HAITEI)
|
|
23
|
-
if(this.context.ctx.event === WinEvent.HOUTEI)
|
|
21
|
+
if(this.context.ctx.event === WinEvent.RINSHAN) yakuDetails.add("嶺上開花", 1);
|
|
22
|
+
if(this.context.ctx.event === WinEvent.CHANKAN) yakuDetails.add("槍槓", 1);
|
|
23
|
+
if(this.context.ctx.event === WinEvent.HAITEI) yakuDetails.add("海底摸月", 1);
|
|
24
|
+
if(this.context.ctx.event === WinEvent.HOUTEI) yakuDetails.add("河底撈魚", 1);
|
|
24
25
|
|
|
25
|
-
if(
|
|
26
|
-
|
|
26
|
+
if(yakuDetails.length > 0 && this.context.ctx.dora > 0){
|
|
27
|
+
yakuDetails.add("ドラ", this.context.ctx.dora);
|
|
27
28
|
}
|
|
28
29
|
|
|
29
|
-
return
|
|
30
|
+
return yakuDetails;
|
|
30
31
|
}
|
|
31
32
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { YakumanChecker } from './YakumanChecker.js';
|
|
2
2
|
import { YakuContext } from './YakuContext.js';
|
|
3
3
|
import { NormalYakuChecker } from './NormalYakuChecker.js';
|
|
4
|
+
import { YakuDetails } from './YakuDetails.js';
|
|
4
5
|
|
|
5
6
|
export class YakuChecker {
|
|
6
7
|
private context: YakuContext
|
|
@@ -9,18 +10,18 @@ export class YakuChecker {
|
|
|
9
10
|
this.context = context;
|
|
10
11
|
}
|
|
11
12
|
|
|
12
|
-
check():
|
|
13
|
+
check(): YakuDetails {
|
|
13
14
|
//手牌と鳴き(カンを考慮して鳴き一つを3と数える)が計14枚かどうか確認する
|
|
14
15
|
const tehai_num = this.context.hais.length;
|
|
15
16
|
const furo_num = this.context.melds.length;
|
|
16
|
-
if(tehai_num + furo_num * 3 !== 14) return new
|
|
17
|
+
if(tehai_num + furo_num * 3 !== 14) return new YakuDetails();
|
|
17
18
|
|
|
18
|
-
const
|
|
19
|
-
if(
|
|
19
|
+
const yakumanDetails: YakuDetails = new YakumanChecker(this.context).check();
|
|
20
|
+
if(yakumanDetails.length === 0){
|
|
20
21
|
return new NormalYakuChecker(this.context).check();
|
|
21
22
|
}
|
|
22
23
|
else{
|
|
23
|
-
return
|
|
24
|
+
return yakumanDetails;
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
27
|
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export class YakuDetail{
|
|
2
|
+
readonly yakuName: string;
|
|
3
|
+
readonly han: number;
|
|
4
|
+
readonly isYakuman: boolean;
|
|
5
|
+
|
|
6
|
+
constructor(yakuName: string, han: number, isYakuman?: boolean){
|
|
7
|
+
this.yakuName = yakuName;
|
|
8
|
+
this.han = han;
|
|
9
|
+
this.isYakuman = isYakuman ?? false;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { YakuDetail } from "./YakuDetail";
|
|
2
|
+
|
|
3
|
+
export class YakuDetails{
|
|
4
|
+
private details: YakuDetail[];
|
|
5
|
+
|
|
6
|
+
constructor(details: YakuDetail[] = []) {
|
|
7
|
+
this.details = details;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
add(yakuName: string, han: number, isYakuman?: boolean){
|
|
11
|
+
this.details.push(new YakuDetail(yakuName, han, isYakuman ?? false));
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
has(yakuName: string){
|
|
15
|
+
return this.details.some(detail => detail.yakuName === yakuName);
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
delete(yakuName: string){
|
|
19
|
+
this.details = this.details.filter(detail => detail.yakuName !== yakuName);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
calcHonsuu(){
|
|
23
|
+
return this.details.reduce((sum, val) => sum + val.han, 0);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
isIncludeYakuman(){
|
|
27
|
+
return this.details.some(detail => detail.isYakuman);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
toMap(){
|
|
31
|
+
return new Map(
|
|
32
|
+
this.details.map(detail => [
|
|
33
|
+
detail.yakuName,
|
|
34
|
+
detail.han
|
|
35
|
+
])
|
|
36
|
+
);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
get length(){
|
|
40
|
+
return this.details.length;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { WinEvent } from '../MahjongConsts.js';
|
|
2
2
|
import { YakuContext } from './YakuContext.js';
|
|
3
|
+
import { YakuDetail } from './YakuDetail.js';
|
|
4
|
+
import { YakuDetails } from './YakuDetails.js';
|
|
3
5
|
import { YakumanCheckers } from './index.js';
|
|
4
6
|
|
|
5
7
|
export class YakumanChecker{
|
|
@@ -10,25 +12,25 @@ export class YakumanChecker{
|
|
|
10
12
|
}
|
|
11
13
|
|
|
12
14
|
//役判定
|
|
13
|
-
check():
|
|
15
|
+
check(): YakuDetails {
|
|
14
16
|
const excludes = [
|
|
15
17
|
{ main: "純正九蓮宝燈", sub: "九蓮宝燈"},
|
|
16
18
|
{ main: "四暗刻単騎", sub: "四暗刻"},
|
|
17
19
|
{ main: "国士無双13面待ち", sub: "国士無双"},
|
|
18
20
|
];
|
|
19
|
-
const
|
|
20
|
-
if(this.context.ctx.event === WinEvent.TENHO)
|
|
21
|
-
if(this.context.ctx.event === WinEvent.CHIHO)
|
|
21
|
+
const yakuDetails: YakuDetails = new YakuDetails();
|
|
22
|
+
if(this.context.ctx.event === WinEvent.TENHO) yakuDetails.add("天和", 13, true);
|
|
23
|
+
if(this.context.ctx.event === WinEvent.CHIHO) yakuDetails.add("地和", 13, true);
|
|
22
24
|
|
|
23
25
|
for(const Checker of YakumanCheckers) {
|
|
24
26
|
const checker = Checker(this.context);
|
|
25
|
-
if(checker.check())
|
|
27
|
+
if(checker.check()) yakuDetails.add(checker.getName(), checker.getHan(), true);
|
|
26
28
|
}
|
|
27
29
|
|
|
28
30
|
for(const { main, sub } of excludes) {
|
|
29
|
-
if(
|
|
31
|
+
if(yakuDetails.has(main)) yakuDetails.delete(sub);
|
|
30
32
|
}
|
|
31
33
|
|
|
32
|
-
return
|
|
34
|
+
return yakuDetails;
|
|
33
35
|
}
|
|
34
36
|
}
|