texas-poker-core 1.4.13 → 1.4.16

package/README.md

@@ -433,14 +433,34 @@ bufix
 增加类型到处
 
 ## 1.4.8
-texas实例新增beforeStageAdvance,beforeNextPlayerTurn
+
+texas 实例新增 beforeStageAdvance,beforeNextPlayerTurn
+
 ## 1.4.9
-修复min,max逻辑错误
+
+修复 min,max 逻辑错误
+
 ## 1.4.10
+
 增加新一轮重拍角色方法
+
 ## 1.4.11
+
 修改游戏结算时的逻辑遗漏
+
 ## 1.4.12
-修复wager局后未清空的问题
+
+修复 wager 局后未清空的问题
+
 ## 1.4.13
-gameEnd事件增加pokesRevealed字段用于入库
+
+gameEnd 事件增加 pokesRevealed 字段用于入库
+
+## 1.4.14
+
+fix: 修复结算金额分配异常
+
+## 1.4.15
+允许玩家全押时下注所有筹码
+## 1.4.16
+允许玩家全押时下注所有筹码

package/dist/Controller/constants.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stageMap = void 0;
 var _ = require(".");
-var stageMap = exports.stageMap = new Map([[_.StageEnum.PRE_FLOP, '翻牌前'], [_.StageEnum.FLOP, '翻牌圈'], [_.StageEnum.TURN, '转牌圈'], [_.StageEnum.RIVER, '河牌']]);
+var stageMap = exports.stageMap = new Map([[_.StageEnum.PRE_FLOP, '翻牌前'], [_.StageEnum.FLOP, '翻牌圈'], [_.StageEnum.TURN, '转牌圈'], [_.StageEnum.RIVER, '河牌圈']]);

package/dist/Deck/core.js

@@ -412,7 +412,11 @@ var getWinners = exports.getWinners = function getWinners(players) {
   }).map(function (player) {
     return player.rankStrength;
   })));
+  // 还好通过数据分析这里
+  // 这里需要过滤弃牌的玩家, 在场玩家去比大小
   return players.filter(function (p) {
+    return p.getStatus() !== 'out';
+  }).filter(function (p) {
     return p.rankStrength === maxRankStrength;
   });
 };

package/dist/Player/index.js

@@ -476,6 +476,12 @@ var Player = exports.Player = /*#__PURE__*/function () {
                 lowestBetAmount: _classPrivateFieldGet(_lowestBetAmount, this)
               })));
             case 8:
+              if (!(money === this.balance)) {
+                _context3.next = 10;
+                break;
+              }
+              return _context3.abrupt("return", this.allIn());
+            case 10:
               _classPrivateFieldSet(_action, this, {
                 type: _constant.ActionTypeEnum.BET,
                 payload: {
@@ -494,18 +500,18 @@ var Player = exports.Player = /*#__PURE__*/function () {
                 }
               });
               _classPrivateFieldGet(_dealer, this).addAction(this);
-              _context3.next = 14;
+              _context3.next = 16;
               return (_classPrivateFieldGet4 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet4 === void 0 ? void 0 : _classPrivateFieldGet4.call(this, this, preFlopDefaultAction);
-            case 14:
+            case 16:
               if (preFlopDefaultAction) {
-                _context3.next = 17;
+                _context3.next = 19;
                 break;
               }
-              _context3.next = 17;
+              _context3.next = 19;
               return this.transferControl();
-            case 17:
+            case 19:
               return _context3.abrupt("return", money);
-            case 18:
+            case 20:
             case "end":
               return _context3.stop();
           }
@@ -566,6 +572,12 @@ var Player = exports.Player = /*#__PURE__*/function () {
                 attemptedTotal: money + _classPrivateFieldGet(_currentStageTotalAmount, this)
               })));
             case 10:
+              if (!(money === this.balance)) {
+                _context4.next = 12;
+                break;
+              }
+              return _context4.abrupt("return", this.allIn());
+            case 12:
               _classPrivateFieldGet(_pool, this).add(this, money);
               _classPrivateFieldSet(_action, this, {
                 type: _constant.ActionTypeEnum.RAISE,
@@ -574,9 +586,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
                 }
               });
               _classPrivateFieldGet(_dealer, this).addAction(this);
-              _context4.next = 15;
+              _context4.next = 17;
               return (_classPrivateFieldGet5 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet5 === void 0 ? void 0 : _classPrivateFieldGet5.call(this, this);
-            case 15:
+            case 17:
               _TexasEngineContext.TexasEngineContext.emitTrace({
                 channel: 'player',
                 name: 'raise',
@@ -586,9 +598,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
                   money: money
                 }
               });
-              _context4.next = 18;
+              _context4.next = 20;
               return this.transferControl();
-            case 18:
+            case 20:
             case "end":
               return _context4.stop();
           }
@@ -681,7 +693,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
     value: function () {
       var _allIn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         var _classPrivateFieldGet7;
-        var maxAllInAmount, moneyShouldPay;
+        var moneyShouldPay;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -693,17 +705,25 @@ var Player = exports.Player = /*#__PURE__*/function () {
               return _context6.abrupt("return", this.fail(new _TexasError.default(_TexasError.TexasCoreErrorCode.PLAYER_CANNOT_ALL_IN)));
             case 3:
               // 其他玩家持有筹码的最大值, 全押金额不可超过该值
-              maxAllInAmount = this.getMaxAllInAmount();
-              moneyShouldPay = Math.min(Math.max(maxAllInAmount - _classPrivateFieldGet(_currentStageTotalAmount, this), _classPrivateFieldGet(_lowestBetAmount, this)), this.balance);
+              // const maxAllInAmount = this.getMaxAllInAmount()
+              // const moneyShouldPay = Math.min(
+              //   Math.max(
+              //     maxAllInAmount - this.#currentStageTotalAmount,
+              //     this.#lowestBetAmount
+              //   ),
+              //   this.balance
+              // )
+              // fix: 允许玩家全押所有筹码, 多的进入边池就行
+              moneyShouldPay = this.balance;
               if (!(moneyShouldPay <= 0)) {
-                _context6.next = 7;
+                _context6.next = 6;
                 break;
               }
               return _context6.abrupt("return", this.fail(new _TexasError.default(_TexasError.TexasCoreErrorCode.PLAYER_ALL_IN_INVALID, {
                 moneyShouldPay: moneyShouldPay,
                 balance: this.balance
               })));
-            case 7:
+            case 6:
               _classPrivateFieldGet(_pool, this).add(this, moneyShouldPay);
               _classPrivateFieldSet(_action, this, {
                 type: _constant.ActionTypeEnum.ALL_IN,
@@ -713,9 +733,9 @@ var Player = exports.Player = /*#__PURE__*/function () {
               });
               _classPrivateFieldSet(_status, this, 'allIn');
               _classPrivateFieldGet(_dealer, this).addAction(this);
-              _context6.next = 13;
+              _context6.next = 12;
               return (_classPrivateFieldGet7 = _classPrivateFieldGet(_callbackOfAction, this)) === null || _classPrivateFieldGet7 === void 0 ? void 0 : _classPrivateFieldGet7.call(this, this);
-            case 13:
+            case 12:
               _TexasEngineContext.TexasEngineContext.emitTrace({
                 channel: 'player',
                 name: 'all_in',
@@ -726,11 +746,11 @@ var Player = exports.Player = /*#__PURE__*/function () {
                   balance: this.balance
                 }
               });
-              _context6.next = 16;
+              _context6.next = 15;
               return this.transferControl();
-            case 16:
+            case 15:
               return _context6.abrupt("return", moneyShouldPay);
-            case 17:
+            case 16:
             case "end":
               return _context6.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "texas-poker-core",
-  "version": "1.4.13",
+  "version": "1.4.16",
   "description": "德州扑克核心功能",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/types/Player/index.d.ts

@@ -89,7 +89,7 @@ export declare class Player implements GameComponent {
     check(): Promise<undefined>;
     fold(): Promise<undefined>;
     bet(money: number, preFlopDefaultAction?: boolean): Promise<number>;
-    raise(money: number): Promise<undefined>;
+    raise(money: number): Promise<number | undefined>;
     call(): Promise<undefined>;
     allIn(): Promise<number>;
     /**