Merge branch 'release/v1.1.4'

kobalab · Jul 3, 2019 · d153e67 · d153e67
2 parents 453f72f + ced118a
commit d153e67
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 2019-07-03 v1.1.4
+
+ - 何切る解答機が評価値 0 のシャンテン戻しを表示しないよう修正
+
 ### 2019-05-29 v1.1.3
 
  - 何切る解答機の初期表示の乱れを修正

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "majiang",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」",
   "main": "src/js/majiang.js",
   "private": true,

diff --git a/src/js/majiang.js b/src/js/majiang.js
@@ -10,7 +10,7 @@
 "use strict";
 
 module.exports = {
-    VERSION: '1.1.3',
+    VERSION: '1.1.4',
     Shoupai: require('./majiang/shoupai'),
     Shan:    require('./majiang/shan'),
     He:      require('./majiang/he'),

diff --git a/src/js/majiang/player.js b/src/js/majiang/player.js
@@ -437,7 +437,7 @@ select_dapai(info) {
     }
 
     let dapai, max = 0, max_tingpai = 0, backtrack = [];
-    let paishu = this._suanpai.paishu_all();;
+    let paishu = this._suanpai.paishu_all();
     let n_xiangting = Majiang.Util.xiangting(this._shoupai);
     for (let p of this.get_dapai()) {
         if (! dapai) dapai = p;
@@ -487,7 +487,7 @@ select_dapai(info) {
         let x  = 1 - paijia(p)/100 + ev;
 
         if (info) {
-            if (! info.find(x => x.p == p.substr(0,2) && ! x.gang)) {
+            if (! info.find(x => x.p == p.substr(0,2) && ! x.gang) && ev > 0) {
                 info.push({
                     p: p.substr(0,2), n_xiangting: n_xiangting + 1, ev: ev,
                     tingpai: tingpai, n_tingpai: n_tingpai