鳴きを考慮するときに「ハイテイ牌は鳴けない」を考慮しないよう修正

kobalab · Jan 4, 2022 · 0c31150 · 0c31150
1 parent 9bc7ce6
commit 0c31150
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/legacy/player-0202.js b/legacy/player-0202.js
@@ -251,14 +251,19 @@ module.exports = class Player extends Majiang.Player {
 
     tingpai(shoupai) {
 
+        const get_peng_mianzi = (shoupai, p) =>
+                    Majiang.Game.get_peng_mianzi(this._rule, shoupai, p);
+        const get_chi_mianzi  = (shoupai, p) =>
+                    Majiang.Game.get_chi_mianzi(this._rule, shoupai, p);
+
         let n_xiangting = this.xiangting(shoupai);
 
         let pai = [];
         for (let p of Majiang.Util.tingpai(shoupai, (s)=>this.xiangting(s))) {
 
             if (n_xiangting > 0) {
 
-                for (let m of this.get_peng_mianzi(shoupai, p+'+')) {
+                for (let m of get_peng_mianzi(shoupai, p+'+')) {
                     let new_shoupai = shoupai.clone().fulou(m);
                     if (this.xiangting(new_shoupai) < n_xiangting) {
                         pai.push(p+'+');
@@ -267,7 +272,7 @@ module.exports = class Player extends Majiang.Player {
                 }
                 if (pai[pai.length - 1] == p+'+') continue;
 
-                for (let m of this.get_chi_mianzi(shoupai, p+'-')) {
+                for (let m of get_chi_mianzi(shoupai, p+'-')) {
                     let new_shoupai = shoupai.clone().fulou(m);
                     if (this.xiangting(new_shoupai) < n_xiangting) {
                         pai.push(p+'-');

diff --git a/lib/player.js b/lib/player.js
@@ -251,14 +251,19 @@ module.exports = class Player extends Majiang.Player {
 
     tingpai(shoupai) {
 
+        const get_peng_mianzi = (shoupai, p) =>
+                    Majiang.Game.get_peng_mianzi(this._rule, shoupai, p);
+        const get_chi_mianzi  = (shoupai, p) =>
+                    Majiang.Game.get_chi_mianzi(this._rule, shoupai, p);
+
         let n_xiangting = this.xiangting(shoupai);
 
         let pai = [];
         for (let p of Majiang.Util.tingpai(shoupai, (s)=>this.xiangting(s))) {
 
             if (n_xiangting > 0) {
 
-                for (let m of this.get_peng_mianzi(shoupai, p+'+')) {
+                for (let m of get_peng_mianzi(shoupai, p+'+')) {
                     let new_shoupai = shoupai.clone().fulou(m);
                     if (this.xiangting(new_shoupai) < n_xiangting) {
                         pai.push(p+'+');
@@ -267,7 +272,7 @@ module.exports = class Player extends Majiang.Player {
                 }
                 if (pai[pai.length - 1] == p+'+') continue;
 
-                for (let m of this.get_chi_mianzi(shoupai, p+'-')) {
+                for (let m of get_chi_mianzi(shoupai, p+'-')) {
                     let new_shoupai = shoupai.clone().fulou(m);
                     if (this.xiangting(new_shoupai) < n_xiangting) {
                         pai.push(p+'-');