Merge branch 'release/v0.1.9'

kobalab · Jan 2, 2022 · 3ad69e7 · 3ad69e7
2 parents f23a5d4 + e2cf01f
commit 3ad69e7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,8 @@
+### v0.1.9 / 2022-01-03
+
+ - Majiang.Shoupai
+   - 赤牌によるポンをチーと誤認して喰い替え判定しているバグを修正
+
 ### v0.1.8 / 2021-12-17
 
  - Majiang.Util

diff --git a/lib/index.js b/lib/index.js
@@ -1,5 +1,5 @@
 /*!
- *  @kobalab/majiang-core v0.1.8
+ *  @kobalab/majiang-core v0.1.9
  *
  *  Copyright(C) 2021 Satoshi Kobayashi
  *  Released under the MIT license

diff --git a/lib/shoupai.js b/lib/shoupai.js
@@ -252,7 +252,7 @@ module.exports = class Shoupai {
             let s = m[0];
             let n = + m.match(/\d(?=[\+\=\-])/) || 5;
             deny[s+n] = true;
-            if (! m.match(/^[mpsz](\d)\1\1/)) {
+            if (! m.replace(/0/,'5').match(/^[mpsz](\d)\1\1/)) {
                 if (n < 7 && m.match(/^[mps]\d\-\d\d$/)) deny[s+(n+3)] = true;
                 if (3 < n && m.match(/^[mps]\d\d\d\-$/)) deny[s+(n-3)] = true;
             }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kobalab/majiang-core",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "麻雀基本ライブラリ",
   "publishConfig": {
     "access": "public"

diff --git a/test/shoupai.js b/test/shoupai.js
@@ -601,6 +601,10 @@ suite('Majiang.Shoupai', ()=>{
             assert.deepEqual(Shoupai('m206p456s789z12,m345-,').get_dapai(),
                              ['m6','p4','p5','p6','s7','s8','s9','z1','z2']);
         });
+        test('赤牌によるポンの際に正しく喰い替え判定すること', ()=>{
+            assert.deepEqual(Shoupai('m25p1s12678,z666+,m550-,').get_dapai(),
+                             ['m2','p1','s1','s2','s6','s7','s8']);
+        });
         test('喰替えのため打牌できない場合があること', ()=>{
             assert.deepEqual(Shoupai('m14,p456-,s789-,z111+,m234-,')
                                                             .get_dapai(),