texas-poker-core 1.3.0 → 1.3.2

package/README.md

@@ -391,4 +391,9 @@ bufix
 ## 1.2.9
 使用枚举值重构action&stage; 调整presentation的计算方式, 增加转换Int的方法, 便于以后数据库索引
 
-## 1.3.0
+## 1.3.0
+
+## 1.3.1
+重命名不合理的变量名称, 以防后期使用使混淆
+## 1.3.2
+新增角色枚举

package/dist/Controller/index.js

@@ -146,15 +146,15 @@ var Controller = /*#__PURE__*/function () {
         var _classPrivateFieldGet4;
         this.end();
         _classPrivateFieldSet(_endAt, this, this.stage);
-        var _classPrivateFieldGet3 = _classPrivateFieldGet(_dealer, this).deck.getMaxPresentationAndPokes(),
-          presentation = _classPrivateFieldGet3.presentation,
+        var _classPrivateFieldGet3 = _classPrivateFieldGet(_dealer, this).deck.getMaxRankSignatureAndPokes(),
+          rankSignature = _classPrivateFieldGet3.rankSignature,
           pokes = _classPrivateFieldGet3.pokes;
         (_classPrivateFieldGet4 = _classPrivateFieldGet(_callbackOfEnd, this)) === null || _classPrivateFieldGet4 === void 0 || _classPrivateFieldGet4.call(this, {
           showHandPokes: true,
           currentStage: _classPrivateFieldGet(_stage, this),
           restCommonPokes: this.getCommonPokes(_classPrivateFieldGet(_stage, this), StageEnum.RIVER),
           maxPokes: pokes,
-          maxPresentation: presentation[0]
+          maxRankCategory: rankSignature[0]
         });
         console.log('游戏结束(shouldEndGame):', _classPrivateFieldGet(_endAt, this));
         return true;

package/dist/Dealer/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _Deck = _interopRequireDefault(require("../Deck"));
 var _TexasError = _interopRequireDefault(require("../TexasError"));
 var _utils = require("../utils");
+var _Player = require("../Player");
 var _constant = require("../Player/constant");
 var _core = require("../Deck/core");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -121,43 +122,55 @@ var Dealer = /*#__PURE__*/function () {
       }
       _classPrivateFieldGet(_actionsHistory, this).push(player);
     }
+    /**
+     * @description 获取场上最大的牌力签名（用于比较/展示）
+     */
   }, {
-    key: "getMaxHandTypeCategory",
-    value: function getMaxHandTypeCategory() {
-      var _this$filter$map$sort = this.filter(function (player) {
+    key: "getMaxRankSignature",
+    value: function getMaxRankSignature() {
+      var _this$filter$map$filt = this.filter(function (player) {
           return player.getStatus() !== 'out';
         }).map(function (player) {
-          return player.getPresentation();
-        }).sort(_core.comparePresentation),
-        _this$filter$map$sort2 = _slicedToArray(_this$filter$map$sort, 1),
-        max = _this$filter$map$sort2[0];
-      return max[0];
+          return player.rankSignature;
+        }).filter(Boolean).sort(function (a, b) {
+          return (0, _core.compareRankSignature)(a, b);
+        }),
+        _this$filter$map$filt2 = _slicedToArray(_this$filter$map$filt, 1),
+        max = _this$filter$map$filt2[0];
+      return max;
+    }
+    /**
+     * @description 获取最大牌型 category（首字符）
+     */
+  }, {
+    key: "getMaxRankCategory",
+    value: function getMaxRankCategory() {
+      var maxRankSig = this.getMaxRankSignature();
+      return maxRankSig[0];
     }
 
-    // 获取所有的最大牌型
+    /** 获取场上最大的牌型组合（可能多玩家并列） */
   }, {
-    key: "getMaxPokes",
-    value: function getMaxPokes() {
-      var _this = this;
-      // getBestHand()
-      var result = this.filter(function (player) {
+    key: "getTableBestFiveCards",
+    value: function getTableBestFiveCards() {
+      var maxRankStrength = Math.max.apply(Math, _toConsumableArray(this.map(function (player) {
+        return player.rankStrength;
+      })));
+      return this.filter(function (player) {
         return player.getStatus() !== 'out';
-      }).map(function (player) {
-        var pokes = (0, _core.getBestHand)(player.getHandPokes(), _classPrivateFieldGet(_deck, _this).getPokes().commonPokes);
+      }).map(function (_ref) {
+        var rankStrength = _ref.rankStrength,
+          bestFiveCards = _ref.bestFiveCards;
         return {
-          presentation: (0, _core.getHandPresentation)(pokes),
-          pokes: pokes
+          rankStrength: rankStrength,
+          bestFiveCards: bestFiveCards
         };
-      });
-      var _result$sort = result.sort(function (a, b) {
-          return (0, _core.comparePresentation)(a.presentation, b.presentation);
-        }),
-        _result$sort2 = _slicedToArray(_result$sort, 1),
-        max = _result$sort2[0];
-      return result.filter(function (item) {
-        return item.presentation === max.presentation;
+      }).filter(function (_ref2) {
+        var rankStrength = _ref2.rankStrength,
+          bestFiveCards = _ref2.bestFiveCards;
+        return rankStrength === maxRankStrength && !!bestFiveCards;
       }).map(function (item) {
-        return item.pokes;
+        return item.bestFiveCards;
       });
     }
   }, {
@@ -180,9 +193,15 @@ var Dealer = /*#__PURE__*/function () {
   }, {
     key: "settle",
     value: function settle() {
-      var _this2 = this;
+      var _this = this;
       this.forEach(function (player) {
-        player.setPresentation((0, _core.getHandPresentation)((0, _core.getBestHand)(player.getHandPokes(), _classPrivateFieldGet(_deck, _this2).getPokes().commonPokes)));
+        if (_classPrivateFieldGet(_deck, _this).getPokes().commonPokes.length === 0) return;
+        var bestFiveCards = (0, _core.getBestFiveCards)(player.getHandPokes(), _classPrivateFieldGet(_deck, _this).getPokes().commonPokes);
+
+        // 存储最大五张牌, 防止后续重复计算
+        player.bestFiveCards = bestFiveCards;
+        player.rankSignature = (0, _core.getFiveCardsRankSignature)(bestFiveCards);
+        player.rankStrength = (0, _core.getStrengthFromRankSignature)(player.rankSignature);
       });
       console.log('底牌:', (0, _core.formatterPoke)(_classPrivateFieldGet(_deck, this).getPokes().commonPokes));
     }
@@ -302,9 +321,9 @@ var Dealer = /*#__PURE__*/function () {
   }, {
     key: "setButton",
     value: function setButton(player) {
-      var _this3 = this;
+      var _this2 = this;
       if (player) {
-        player.setRole('button');
+        player.setRole(_Player.RoleEnum.BTN);
         _classPrivateFieldSet(_button, this, player);
         return;
       }
@@ -316,8 +335,8 @@ var Dealer = /*#__PURE__*/function () {
       var random = (0, _utils.getRandomInt)(0, count - 1);
       this.forEach(function (p, i) {
         if (i === random) {
-          p.setRole('button');
-          _classPrivateFieldSet(_button, _this3, p);
+          p.setRole(_Player.RoleEnum.BTN);
+          _classPrivateFieldSet(_button, _this2, p);
         }
       });
     }

package/dist/Deck/constant.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.suitsMap = exports.suits = exports.ranks = exports.rankMap = exports.handTypeCategoryMap = exports.comboIndices = void 0;
+exports.suitsMap = exports.suits = exports.ranks = exports.rankMap = exports.rankCategoryMap = exports.comboIndices = void 0;
 var suits = exports.suits = ['h', 's', 'd', 'c'];
 var ranks = exports.ranks = ['2', '3', '4', '5', '6', '7', '8', '9', 't', 'j', 'q', 'k', 'a'];
 
@@ -21,13 +21,13 @@ var ranks = exports.ranks = ['2', '3', '4', '5', '6', '7', '8', '9', 't', 'j', '
  */
 
 /**
- * 2 + 3 一共5张牌的组合
+ * 2张手牌
  */
 
-/** 牌型枚举 */
+/** 牌型枚举（五张牌型的类型：高牌/一对/顺子…） */
 
 /**
- * 牌力展示：首字符为牌型 (handTypeCategory)，后接可选数字段，如 "z" | "q14+13+12+11+9" | "w13+r7"
+ * 牌力签名：首字符为牌型 (RankCategory)，后接可选数字段，如 "z" | "q14+13+12+11+9" | "w13+r7"
  */
 
 /**
@@ -39,7 +39,7 @@ var suitsMap = exports.suitsMap = new Map([
  */
 ['h', '♥'], ['s', '♠'], ['d', '♦️'], ['c', '♣']]);
 // 牌型枚举中文映射
-var handTypeCategoryMap = exports.handTypeCategoryMap = new Map([['z', '皇家同花顺'], ['y', '同花顺'], ['x', '四条'], ['w', '葫芦'], ['v', '同花'], ['u', '顺子'], ['t', '三条'], ['s', '两对'], ['r', '一对'], ['q', '高牌']]);
+var rankCategoryMap = exports.rankCategoryMap = new Map([['z', '皇家同花顺'], ['y', '同花顺'], ['x', '四条'], ['w', '葫芦'], ['v', '同花'], ['u', '顺子'], ['t', '三条'], ['s', '两对'], ['r', '一对'], ['q', '高牌']]);
 
 // 牌面值的大小映射 2~A => 2~14
 var rankMap = exports.rankMap = function rankMap(input) {

package/dist/Deck/core.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatterPoke = exports.comparePresentation = exports.compareFn = void 0;
-exports.getBestHand = getBestHand;
-exports.getBestPokesPresentation = getBestPokesPresentation;
-exports.getHandPresentation = getHandPresentation;
-exports.getHandStrengthInt = getHandStrengthInt;
-exports.getHandStrengthIntFromPresentation = getHandStrengthIntFromPresentation;
-exports.getMaxPresentationAndPokes = getMaxPresentationAndPokes;
+exports.formatterPoke = exports.compareRankSignature = exports.compareFn = void 0;
+exports.getBestFiveCards = getBestFiveCards;
+exports.getBestPokesRankSignature = getBestPokesRankSignature;
+exports.getFiveCardsRankSignature = getFiveCardsRankSignature;
+exports.getFiveCardsStrength = getFiveCardsStrength;
+exports.getMaxRankSignatureAndPokes = getMaxRankSignatureAndPokes;
 exports.getSortedAllHandPokesCombinations = getSortedAllHandPokesCombinations;
+exports.getStrengthFromRankSignature = getStrengthFromRankSignature;
 exports.isStraight = exports.getWinners = void 0;
 var _ramda = require("ramda");
 var _constant = require("./constant");
@@ -65,9 +65,9 @@ function formatRanksDesc(ranks) {
   }).map(_constant.rankMap).join('+');
 }
 
-/** 从 presentation 中解析出 rank 数字数组（首段去掉类型字母，其余段为纯数字或 "r"+数字） */
-function parseRankNumbersFromPresentation(presentation) {
-  var rest = presentation.slice(1);
+/** 从 rankSignature 中解析出 rank 数字数组（首段去掉类型字母，其余段为纯数字或 "r"+数字） */
+function parseRankNumbersFromRankSignature(rankSignature) {
+  var rest = rankSignature.slice(1);
   if (!rest) return [];
   return rest.split('+').map(function (segment) {
     var numPart = /^[a-z]\d*$/i.test(segment) ? segment.slice(1) : segment;
@@ -88,8 +88,8 @@ function getCombinations(pokes) {
   });
 }
 var compareFnOfSameType = function compareFnOfSameType(a, b) {
-  var ranks1 = parseRankNumbersFromPresentation(a);
-  var ranks2 = parseRankNumbersFromPresentation(b);
+  var ranks1 = parseRankNumbersFromRankSignature(a);
+  var ranks2 = parseRankNumbersFromRankSignature(b);
   var len = Math.max(ranks1.length, ranks2.length);
   for (var i = 0; i < len; i++) {
     var _ranks1$i, _ranks2$i;
@@ -107,13 +107,12 @@ var compareFnOfSameType = function compareFnOfSameType(a, b) {
  * @returns
  */
 var compareFn = exports.compareFn = function compareFn(a, b) {
-  // 'q13' 'w3+r2'
-  var _ref = [getHandPresentation(a), getHandPresentation(b)],
-    presentationA = _ref[0],
-    presentationB = _ref[1];
-  return comparePresentation(presentationA, presentationB);
+  var _ref = [getFiveCardsRankSignature(a), getFiveCardsRankSignature(b)],
+    rankSigA = _ref[0],
+    rankSigB = _ref[1];
+  return compareRankSignature(rankSigA, rankSigB);
 };
-var comparePresentation = exports.comparePresentation = function comparePresentation(p1, p2) {
+var compareRankSignature = exports.compareRankSignature = function compareRankSignature(p1, p2) {
   var _ref2 = [p1[0], p2[0]],
     typeA = _ref2[0],
     typeB = _ref2[1];
@@ -127,8 +126,8 @@ var comparePresentation = exports.comparePresentation = function comparePresenta
   return typeA > typeB ? -1 : 1;
 };
 
-/** 牌型字符到可排序整数的映射，与 comparePresentation 顺序一致：大即强 */
-var HAND_TYPE_ORDER = {
+/** 牌型字符到可排序整数的映射，与 compareRankSignature 顺序一致：大即强 */
+var RANK_CATEGORY_ORDER = {
   q: 0,
   r: 1,
   s: 2,
@@ -147,14 +146,14 @@ var RANK_BASE = 16;
 var TYPE_MULTIPLIER = 1000000;
 
 /**
- * 将 getHandPresentation 的字符串解析为可排序的整数
- * 保证：comparePresentation(a, b) === -1 => getHandStrengthIntFromPresentation(a) < getHandStrengthIntFromPresentation(b)
+ * 将五张组合牌的 rankSignature 解析为可排序的整数
+ * 保证：compareRankSignature(a, b) === -1 => getStrengthFromRankSignature(a) < getStrengthFromRankSignature(b)
  */
-function getHandStrengthIntFromPresentation(presentation) {
-  var _HAND_TYPE_ORDER$type;
-  var typeChar = presentation[0];
-  var typeIndex = (_HAND_TYPE_ORDER$type = HAND_TYPE_ORDER[typeChar]) !== null && _HAND_TYPE_ORDER$type !== void 0 ? _HAND_TYPE_ORDER$type : 0;
-  var rankNumbers = parseRankNumbersFromPresentation(presentation);
+function getStrengthFromRankSignature(rankSignature) {
+  var _RANK_CATEGORY_ORDER$;
+  var typeChar = rankSignature[0];
+  var typeIndex = (_RANK_CATEGORY_ORDER$ = RANK_CATEGORY_ORDER[typeChar]) !== null && _RANK_CATEGORY_ORDER$ !== void 0 ? _RANK_CATEGORY_ORDER$ : 0;
+  var rankNumbers = parseRankNumbersFromRankSignature(rankSignature);
   var payload = rankNumbers.reduce(function (sum, r, i) {
     return sum + r * Math.pow(RANK_BASE, rankNumbers.length - 1 - i);
   }, 0);
@@ -162,19 +161,19 @@ function getHandStrengthIntFromPresentation(presentation) {
 }
 
 /**
- * 将 5 张牌编码为可排序的整数，便于数据库存储与 ORDER BY 比较
- * 牌力越大数值越大，可直接用于 ORDER BY hand_strength DESC 取最强牌
+ * 获取五张组合牌型的强度（可排序整数），便于数据库存储与 ORDER BY 比较
+ * 牌力越大数值越大，可直接用于 ORDER BY 取最强牌
  */
-function getHandStrengthInt(input) {
-  return getHandStrengthIntFromPresentation(getHandPresentation(input));
+function getFiveCardsStrength(input) {
+  return getStrengthFromRankSignature(getFiveCardsRankSignature(input));
 }
 
 /**
- * @description 计算牌力大小
- * @param input
- * @returns
+ * 获取五张组合牌的唯一标识（牌力签名：类型 + 牌面细节）
+ * @param input 五张组合牌（5 张 Poke）
+ * @returns rankSignature
  */
-function getHandPresentation(input) {
+function getFiveCardsRankSignature(input) {
   // return
   var suits = input.map(function (poke) {
     return poke[0];
@@ -269,23 +268,22 @@ function getHandPresentation(input) {
 }
 
 /**
- * @description 根据底牌和手牌, 计算出最大的牌力组合
- * @param handPokes
- * @param commonPokes
- * @returns
+ * 从 2 张手牌与 5 张底牌中，选出牌力最大的 5 张牌型；。
+ * @param handPokes 手牌（如 2 张）
+ * @param commonPokes 底牌/公共牌（如 5 张）
  */
-function getBestHand(pokes, commonPokes) {
-  var _getCombinations$sort = getCombinations(pokes.concat(commonPokes)).sort(compareFn),
+function getBestFiveCards(handPokes, commonPokes) {
+  if (commonPokes.length === 0) throw new Error('底牌数量不足, 无法组合出最大5张牌型');
+  var _getCombinations$sort = getCombinations(handPokes.concat(commonPokes)).sort(compareFn),
     _getCombinations$sort2 = _slicedToArray(_getCombinations$sort, 1),
     maxOne = _getCombinations$sort2[0];
   return maxOne;
 }
 
 /**
- * @description 获取多个手牌组合中的所有牌型组合, 按照降序排列
- * @param handPokes
- * @param commonPokes
- * @returns
+ * 获取多组手牌与公共牌组合后的所有五张牌型，按牌力降序排列
+ * @param handPokes 各玩家手牌（每组 2 张）
+ * @param commonPokes 公共牌
  */
 function getSortedAllHandPokesCombinations(handPokes, commonPokes) {
   var allCombinations = handPokes.map(function (pokes) {
@@ -294,36 +292,33 @@ function getSortedAllHandPokesCombinations(handPokes, commonPokes) {
   return allCombinations;
 }
 /**
- * @description 获取多个手牌组合中的最大牌力值
- * @param handPokes
- * @param commonPokes
- * @returns
+ * 获取多组手牌与公共牌组合中的最大牌型签名
+ * @param handPokes 各玩家手牌
+ * @param commonPokes 公共牌
  */
-function getBestPokesPresentation(handPokes, commonPokes) {
+function getBestPokesRankSignature(handPokes, commonPokes) {
   var _getSortedAllHandPoke = getSortedAllHandPokesCombinations(handPokes, commonPokes),
     _getSortedAllHandPoke2 = _slicedToArray(_getSortedAllHandPoke, 1),
     maxOne = _getSortedAllHandPoke2[0];
-  return getHandPresentation(maxOne);
+  return getFiveCardsRankSignature(maxOne);
 }
 
-// 获取最大牌型与牌力值
-function getMaxPresentationAndPokes(handPokes, commonPokes) {
+/** 获取多组手牌与公共牌组合中的最大牌型签名及其对应的五张牌 */
+function getMaxRankSignatureAndPokes(handPokes, commonPokes) {
   var allCombinations = getSortedAllHandPokesCombinations(handPokes, commonPokes);
-  var maxPresentation = getHandPresentation(allCombinations[0]);
-
-  // 以下方法可以使用reduce实现, 在目前不影响性能的情况下, 先这样实现
+  var maxRankSignature = getFiveCardsRankSignature(allCombinations[0]);
   var maxPokes = allCombinations.map(function (combination) {
     return {
-      presentation: getHandPresentation(combination),
+      rankSignature: getFiveCardsRankSignature(combination),
       pokes: combination
     };
   }).filter(function (item) {
-    return item.presentation === maxPresentation;
+    return item.rankSignature === maxRankSignature;
   }).map(function (item) {
     return item.pokes;
   });
   return {
-    presentation: maxPresentation,
+    rankSignature: maxRankSignature,
     pokes: maxPokes
   };
 }
@@ -339,20 +334,18 @@ var formatterPoke = exports.formatterPoke = function formatterPoke(input) {
 };
 
 /**
- * @description 根据玩家presentation, 计算出赢家
+ * @description 根据玩家 rankStrength 计算出赢家
  */
 var getWinners = exports.getWinners = function getWinners(players) {
   if (players.some(function (p) {
-    return !p.getPresentation();
+    return !p.rankSignature;
   })) throw new Error('未计算玩家手牌大小,无法比较');
-  var _filter$sort = _toConsumableArray(players).filter(function (player) {
-      return player.getStatus() !== 'out';
-    }).sort(function (a, b) {
-      return comparePresentation(a.getPresentation(), b.getPresentation());
-    }),
-    _filter$sort2 = _slicedToArray(_filter$sort, 1),
-    max = _filter$sort2[0];
+  var maxRankStrength = Math.max.apply(Math, _toConsumableArray(players.filter(function (player) {
+    return player.getStatus() !== 'out';
+  }).map(function (player) {
+    return player.rankStrength;
+  })));
   return players.filter(function (p) {
-    return p.getPresentation() === max.getPresentation();
+    return p.rankStrength === maxRankStrength;
   });
 };

package/dist/Deck/index.js

@@ -37,7 +37,7 @@ var Deck = /*#__PURE__*/function () {
     _classPrivateMethodInitSpec(this, _Deck_brand);
     _classPrivateFieldInitSpec(this, _deck, []);
     /**
-     * 玩家的手牌
+     * 各玩家的手牌（每人 2 张）
      */
     _classPrivateFieldInitSpec(this, _handPokes, []);
     /**
@@ -122,22 +122,20 @@ var Deck = /*#__PURE__*/function () {
       return _classPrivateFieldGet(_deck, this);
     }
   }, {
-    key: "getMaxPresentation",
-    value: function getMaxPresentation() {
-      var presentation = (0, _core.getBestPokesPresentation)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this));
-      return presentation[0];
+    key: "getMaxRankCategory",
+    value: function getMaxRankCategory() {
+      var rankSignature = (0, _core.getBestPokesRankSignature)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this));
+      return rankSignature[0];
     }
   }, {
     key: "getMaxPokeCombinations",
     value: function getMaxPokeCombinations() {
-      return (0, _core.getMaxPresentationAndPokes)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this)).pokes;
+      return (0, _core.getMaxRankSignatureAndPokes)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this)).pokes;
     }
-
-    // 该方法是getMaxPokeCombinations&getMaxPresentation的组合
   }, {
-    key: "getMaxPresentationAndPokes",
-    value: function getMaxPresentationAndPokes() {
-      return (0, _core.getMaxPresentationAndPokes)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this));
+    key: "getMaxRankSignatureAndPokes",
+    value: function getMaxRankSignatureAndPokes() {
+      return (0, _core.getMaxRankSignatureAndPokes)(_classPrivateFieldGet(_handPokes, this), _classPrivateFieldGet(_commonPokes, this));
     }
   }]);
 }();

package/dist/Player/constant.js

@@ -3,22 +3,46 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.roleMap = exports.playerRoleSetMap = exports.ActionTypeMap = exports.ActionTypeEnum = void 0;
+exports.roleMap = exports.playerRoleSetMap = exports.RoleEnum = exports.ActionTypeMap = exports.ActionTypeEnum = void 0;
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var twoPlayer = ['button', 'big-blind'];
-var threePlayer = ['button', 'small-blind', 'big-blind'];
-var fourPlayer = threePlayer.concat('under-the-gun');
-var fivePlayer = fourPlayer.concat('middle-position');
-var sixPlayer = fivePlayer.concat('cut-off');
-var sevenPlayer = [].concat(_toConsumableArray(sixPlayer.slice(0, -1)), ['hi-jack'], _toConsumableArray(sixPlayer.slice(-1)));
-var eightPlayer = [].concat(_toConsumableArray(sevenPlayer.slice(0, 5)), ['middle-position1'], _toConsumableArray(sevenPlayer.slice(5)));
-var ninePlayer = [].concat(_toConsumableArray(eightPlayer.slice(0, 4)), ['under-the-gun1'], _toConsumableArray(eightPlayer.slice(4)));
-var tenPlayer = [].concat(_toConsumableArray(ninePlayer.slice(0, 5)), ['under-the-gun2'], _toConsumableArray(ninePlayer.slice(5)));
+/** 座位角色枚举 */
+var RoleEnum = exports.RoleEnum = /*#__PURE__*/function (RoleEnum) {
+  /** 庄家/按钮 */
+  RoleEnum["BTN"] = "btn";
+  /** 小盲 */
+  RoleEnum["SB"] = "sb";
+  /** 大盲 */
+  RoleEnum["BB"] = "bb";
+  /** 枪口 */
+  RoleEnum["UTG"] = "utg";
+  /** 枪口+1 */
+  RoleEnum["UTG1"] = "utg1";
+  /** 枪口+2（10 人桌） */
+  RoleEnum["UTG2"] = "utg2";
+  /** 中位 */
+  RoleEnum["MP"] = "mp";
+  /** Lojack（10 人桌） */
+  RoleEnum["LJ"] = "lj";
+  /** 劫持位 */
+  RoleEnum["HJ"] = "hj";
+  /** 关煞位 */
+  RoleEnum["CO"] = "co";
+  return RoleEnum;
+}({});
+var twoPlayer = [RoleEnum.BTN, RoleEnum.BB];
+var threePlayer = [RoleEnum.BTN, RoleEnum.SB, RoleEnum.BB];
+var fourPlayer = threePlayer.concat(RoleEnum.UTG);
+var fivePlayer = fourPlayer.concat(RoleEnum.MP);
+var sixPlayer = fivePlayer.concat(RoleEnum.CO);
+var sevenPlayer = [].concat(_toConsumableArray(sixPlayer.slice(0, -1)), [RoleEnum.HJ], _toConsumableArray(sixPlayer.slice(-1)));
+var eightPlayer = [].concat(_toConsumableArray(sevenPlayer.slice(0, 5)), [RoleEnum.LJ], _toConsumableArray(sevenPlayer.slice(5)));
+var ninePlayer = [].concat(_toConsumableArray(eightPlayer.slice(0, 4)), [RoleEnum.UTG1], _toConsumableArray(eightPlayer.slice(4)));
+var tenPlayer = [].concat(_toConsumableArray(ninePlayer.slice(0, 5)), [RoleEnum.UTG2], _toConsumableArray(ninePlayer.slice(5)));
 var ActionTypeEnum = exports.ActionTypeEnum = /*#__PURE__*/function (ActionTypeEnum) {
   ActionTypeEnum["CALL"] = "call";
   ActionTypeEnum["CHECK"] = "check";
@@ -29,5 +53,5 @@ var ActionTypeEnum = exports.ActionTypeEnum = /*#__PURE__*/function (ActionTypeE
   return ActionTypeEnum;
 }({});
 var ActionTypeMap = exports.ActionTypeMap = new Map([[ActionTypeEnum.CALL, '跟注'], [ActionTypeEnum.CHECK, '过牌'], [ActionTypeEnum.FOLD, '弃牌'], [ActionTypeEnum.RAISE, '加注'], [ActionTypeEnum.ALL_IN, 'All In'], [ActionTypeEnum.BET, '下注']]);
-var roleMap = exports.roleMap = new Map([['button', '庄家'], ['small-blind', '小盲'], ['big-blind', '大盲'], ['middle-position', '中位'], ['middle-position1', '中位+1'], ['middle-position2', '中位+2'], ['under-the-gun', '枪口'], ['under-the-gun1', '枪口+1'], ['under-the-gun2', '枪口+2'], ['hi-jack', '高劫持'], ['cut-off', '关煞']]);
-var playerRoleSetMap = exports.playerRoleSetMap = new Map([[1, ['button']], [2, twoPlayer], [3, threePlayer], [4, fourPlayer], [5, fivePlayer], [6, sixPlayer], [7, sevenPlayer], [8, eightPlayer], [9, ninePlayer], [10, tenPlayer]]);
+var roleMap = exports.roleMap = new Map([[RoleEnum.BTN, '庄家'], [RoleEnum.SB, '小盲'], [RoleEnum.BB, '大盲'], [RoleEnum.UTG, '枪口'], [RoleEnum.UTG1, '枪口+1'], [RoleEnum.UTG2, '枪口+2'], [RoleEnum.MP, '中位'], [RoleEnum.LJ, 'Lojack'], [RoleEnum.HJ, '劫持位'], [RoleEnum.CO, '关煞']]);
+var playerRoleSetMap = exports.playerRoleSetMap = new Map([[1, [RoleEnum.BTN]], [2, twoPlayer], [3, threePlayer], [4, fourPlayer], [5, fivePlayer], [6, sixPlayer], [7, sevenPlayer], [8, eightPlayer], [9, ninePlayer], [10, tenPlayer]]);

package/dist/Player/index.js

@@ -10,7 +10,14 @@ Object.defineProperty(exports, "ActionTypeEnum", {
     return _constant.ActionTypeEnum;
   }
 });
-exports.default = exports.Player = void 0;
+exports.Player = void 0;
+Object.defineProperty(exports, "RoleEnum", {
+  enumerable: true,
+  get: function get() {
+    return _constant.RoleEnum;
+  }
+});
+exports.default = void 0;
 var _TexasError = _interopRequireDefault(require("../TexasError"));
 var _utils = require("../utils");
 var _config = require("../config");
@@ -38,9 +45,11 @@ function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t),
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
-function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
-// 玩家的状态
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); } // 玩家的状态
 // 玩家回合时采取的行动（使用枚举值作为类型）
+/**
+ * 玩家
+ */
 var _role = /*#__PURE__*/new WeakMap();
 var _userInfo = /*#__PURE__*/new WeakMap();
 var _pool = /*#__PURE__*/new WeakMap();
@@ -59,13 +68,12 @@ var _lastPlayer = /*#__PURE__*/new WeakMap();
 var _nextPlayer = /*#__PURE__*/new WeakMap();
 var _timer = /*#__PURE__*/new WeakMap();
 var _handPokes = /*#__PURE__*/new WeakMap();
-var _presentation = /*#__PURE__*/new WeakMap();
+var _bestFiveCards = /*#__PURE__*/new WeakMap();
+var _rankSignature = /*#__PURE__*/new WeakMap();
+var _rankStrength = /*#__PURE__*/new WeakMap();
 var _callback = /*#__PURE__*/new WeakMap();
 var _callbackOfAction = /*#__PURE__*/new WeakMap();
 var _Player_brand = /*#__PURE__*/new WeakSet();
-/**
- * 玩家
- */
 var Player = exports.Player = /*#__PURE__*/function () {
   function Player(_ref) {
     var lowestBetAmount = _ref.lowestBetAmount,
@@ -137,10 +145,15 @@ var Player = exports.Player = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _nextPlayer, null);
     _classPrivateFieldInitSpec(this, _timer, null);
     /**
-     * 玩家的手牌
+     * 玩家的手牌（2 张）
      */
     _classPrivateFieldInitSpec(this, _handPokes, []);
-    _classPrivateFieldInitSpec(this, _presentation, void 0);
+    /**
+     * 与公共牌组合后的最佳五张牌（best 5-card combination）
+     */
+    _classPrivateFieldInitSpec(this, _bestFiveCards, undefined);
+    _classPrivateFieldInitSpec(this, _rankSignature, void 0);
+    _classPrivateFieldInitSpec(this, _rankStrength, 0);
     _classPrivateFieldInitSpec(this, _callback, void 0);
     /**
      * 用户采取行动
@@ -219,20 +232,26 @@ var Player = exports.Player = /*#__PURE__*/function () {
     function getRemainThinkTime() {
       return _classPrivateFieldGet(_thinkingTime, this) - _classPrivateFieldGet(_countDownTime, this);
     }
+  }, {
+    key: "bestFiveCards",
+    get: function get() {
+      return _classPrivateFieldGet(_bestFiveCards, this);
+    },
+    set: function set(value) {
+      _classPrivateFieldSet(_bestFiveCards, this, value);
+    }
   }, {
     key: "setNextPlayer",
     value: function setNextPlayer(player) {
       _classPrivateFieldSet(_nextPlayer, this, player);
     }
   }, {
-    key: "setPresentation",
-    value: function setPresentation(presentation) {
-      _classPrivateFieldSet(_presentation, this, presentation);
-    }
-  }, {
-    key: "getPresentation",
-    value: function getPresentation() {
-      return _classPrivateFieldGet(_presentation, this);
+    key: "rankSignature",
+    get: function get() {
+      return _classPrivateFieldGet(_rankSignature, this);
+    },
+    set: function set(value) {
+      _classPrivateFieldSet(_rankSignature, this, value);
     }
   }, {
     key: "getNextPlayer",
@@ -267,6 +286,14 @@ var Player = exports.Player = /*#__PURE__*/function () {
     set: function set(value) {
       _classPrivateFieldSet(_onlineStatus, this, value);
     }
+  }, {
+    key: "rankStrength",
+    get: function get() {
+      return _classPrivateFieldGet(_rankStrength, this);
+    },
+    set: function set(value) {
+      _classPrivateFieldSet(_rankStrength, this, value);
+    }
   }, {
     key: "onPreAction",
     value: function onPreAction(callback) {
@@ -279,7 +306,8 @@ var Player = exports.Player = /*#__PURE__*/function () {
       this.resetCurrentStageTotalAmount();
       _classPrivateFieldSet(_totalBetAmount, this, 0);
       _classPrivateFieldSet(_handPokes, this, []);
-      _classPrivateFieldSet(_presentation, this, undefined);
+      _classPrivateFieldSet(_rankStrength, this, 0);
+      _classPrivateFieldSet(_rankSignature, this, undefined);
       _classPrivateFieldSet(_status, this, 'waiting');
       if (process.env.PROJECT_ENV === 'dev') this.balance = _classPrivateFieldGet(_userInfo, this).balance;
       this.clearTimer();
@@ -843,7 +871,7 @@ var Player = exports.Player = /*#__PURE__*/function () {
 }();
 _Player = Player;
 function _isBigBlindOptionInPreFlop() {
-  return _classPrivateFieldGet(_controller, this).stage === _Controller.StageEnum.PRE_FLOP && _classPrivateFieldGet(_role, this) === 'big-blind' && _classPrivateFieldGet(_currentStageTotalAmount, this) >= this.getMaxBetAmountAtCurrentStage();
+  return _classPrivateFieldGet(_controller, this).stage === _Controller.StageEnum.PRE_FLOP && _classPrivateFieldGet(_role, this) === _constant.RoleEnum.BB && _classPrivateFieldGet(_currentStageTotalAmount, this) >= this.getMaxBetAmountAtCurrentStage();
 }
 /**
  * @description 获取玩家允许的行动列表

package/dist/Pool/index.js

@@ -169,7 +169,7 @@ var Pool = /*#__PURE__*/function () {
       this.calculate();
       console.log('玩家牌力大小:');
       _classPrivateFieldGet(_players, this).forEach(function (player) {
-        console.log(player.getUserInfo().name, player.getPresentation(), (0, _core.formatterPoke)(player.getHandPokes()));
+        console.log(player.getUserInfo().name, player.rankSignature, (0, _core.formatterPoke)(player.getHandPokes()));
       });
       console.log('奖池:');
       console.log(Array.from(_classPrivateFieldGet(_pots, this).entries()).map(function (_ref) {

package/dist/index.js

@@ -9,10 +9,10 @@ var _exportNames = {
   TexasError: true,
   Deck: true,
   formatterPoke: true,
-  getBestPokesPresentation: true,
-  comparePresentation: true,
-  getHandStrengthInt: true,
-  getHandStrengthIntFromPresentation: true,
+  getBestPokesRankSignature: true,
+  compareRankSignature: true,
+  getFiveCardsStrength: true,
+  getStrengthFromRankSignature: true,
   Dealer: true,
   stageMap: true,
   roleMap: true,
@@ -27,6 +27,7 @@ var _exportNames = {
   PlayerSeatStatus: true,
   User: true,
   Role: true,
+  RoleEnum: true,
   Action: true,
   ActionType: true,
   OnlineStatus: true,
@@ -99,6 +100,12 @@ Object.defineProperty(exports, "Role", {
     return _Player.Role;
   }
 });
+Object.defineProperty(exports, "RoleEnum", {
+  enumerable: true,
+  get: function get() {
+    return _Player.RoleEnum;
+  }
+});
 Object.defineProperty(exports, "Room", {
   enumerable: true,
   get: function get() {
@@ -147,10 +154,10 @@ Object.defineProperty(exports, "User", {
     return _Player.User;
   }
 });
-Object.defineProperty(exports, "comparePresentation", {
+Object.defineProperty(exports, "compareRankSignature", {
   enumerable: true,
   get: function get() {
-    return _core.comparePresentation;
+    return _core.compareRankSignature;
   }
 });
 Object.defineProperty(exports, "formatterPoke", {
@@ -159,22 +166,22 @@ Object.defineProperty(exports, "formatterPoke", {
     return _core.formatterPoke;
   }
 });
-Object.defineProperty(exports, "getBestPokesPresentation", {
+Object.defineProperty(exports, "getBestPokesRankSignature", {
   enumerable: true,
   get: function get() {
-    return _core.getBestPokesPresentation;
+    return _core.getBestPokesRankSignature;
   }
 });
-Object.defineProperty(exports, "getHandStrengthInt", {
+Object.defineProperty(exports, "getFiveCardsStrength", {
   enumerable: true,
   get: function get() {
-    return _core.getHandStrengthInt;
+    return _core.getFiveCardsStrength;
   }
 });
-Object.defineProperty(exports, "getHandStrengthIntFromPresentation", {
+Object.defineProperty(exports, "getStrengthFromRankSignature", {
   enumerable: true,
   get: function get() {
-    return _core.getHandStrengthIntFromPresentation;
+    return _core.getStrengthFromRankSignature;
   }
 });
 Object.defineProperty(exports, "roleMap", {

package/package.json

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

package/types/Controller/index.d.ts

@@ -1,6 +1,6 @@
 import Dealer from '../Dealer';
 import { Player } from '../Player';
-import { Poke, handTypeCategory } from '../Deck/constant';
+import { Poke, RankCategory } from '../Deck/constant';
 import { GameComponent, TexasErrorCallback } from '../Texas';
 export declare enum StageEnum {
     PRE_FLOP = "pre_flop",
@@ -14,7 +14,7 @@ export type CallbackOfGameEnd = (params: {
     currentStage: Stage;
     showHandPokes: boolean;
     maxPokes?: Poke[][];
-    maxPresentation?: handTypeCategory;
+    maxRankCategory?: RankCategory;
 }) => void;
 export type CallbackOnNextStage = (params: {
     commonPokes: Poke[];

package/types/Dealer/index.d.ts

@@ -1,6 +1,6 @@
 import Deck from '../Deck';
 import { Player } from '../Player';
-import { handTypeCategory } from '../Deck/constant';
+import { RankCategory } from '../Deck/constant';
 import { GameComponent, TexasErrorCallback } from '../Texas';
 /**
  * 荷官, 控制游戏进行
@@ -18,8 +18,16 @@ declare class Dealer implements GameComponent {
     get lowestBetAmount(): number;
     dealCards(): void;
     addAction(player: Player): void;
-    getMaxHandTypeCategory(): handTypeCategory;
-    getMaxPokes(): ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
+    /**
+     * @description 获取场上最大的牌力签名（用于比较/展示）
+     */
+    getMaxRankSignature(): `s${string}` | `t${string}` | `q${string}` | `z${string}` | `y${string}` | `x${string}` | `w${string}` | `v${string}` | `u${string}` | `r${string}`;
+    /**
+     * @description 获取最大牌型 category（首字符）
+     */
+    getMaxRankCategory(): RankCategory;
+    /** 获取场上最大的牌型组合（可能多玩家并列） */
+    getTableBestFiveCards(): (("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[] | undefined)[];
     logPlayers(): void;
     setRoles(): void;
     /**

package/types/Deck/constant.d.ts

@@ -13,19 +13,19 @@ export type Rank = (typeof ranks)[number];
  */
 export type Poke = `${Suit}${Rank}`;
 /**
- * 2 + 3 一共5张牌的组合
+ * 2张手牌
  */
 export type HandPoke = Poke[];
-/** 牌型枚举 */
-export type handTypeCategory = 'z' | 'y' | 'x' | 'w' | 'v' | 'u' | 't' | 's' | 'r' | 'q';
+/** 牌型枚举（五张牌型的类型：高牌/一对/顺子…） */
+export type RankCategory = 'z' | 'y' | 'x' | 'w' | 'v' | 'u' | 't' | 's' | 'r' | 'q';
 /**
- * 牌力展示：首字符为牌型 (handTypeCategory)，后接可选数字段，如 "z" | "q14+13+12+11+9" | "w13+r7"
+ * 牌力签名：首字符为牌型 (RankCategory)，后接可选数字段，如 "z" | "q14+13+12+11+9" | "w13+r7"
  */
-export type Presentation = `${handTypeCategory}${string}`;
+export type RankSignature = `${RankCategory}${string}`;
 /**
  * 花色format map
  */
 export declare const suitsMap: Map<"h" | "s" | "d" | "c", string>;
-export declare const handTypeCategoryMap: Map<handTypeCategory, string>;
+export declare const rankCategoryMap: Map<RankCategory, string>;
 export declare const rankMap: (input: Rank) => number;
 export declare const comboIndices: number[][];

package/types/Deck/core.d.ts

@@ -1,5 +1,5 @@
 import { Player } from '../Player';
-import { Poke, Rank, Presentation } from './constant';
+import { Poke, Rank, RankSignature } from './constant';
 /**
  * @description 判断是否为顺子, 并且返回最大顺子的值
  * @param values
@@ -16,46 +16,44 @@ export declare const isStraight: (values: Rank[]) => {
  * @returns
  */
 export declare const compareFn: (a: Poke[], b: Poke[]) => number;
-export declare const comparePresentation: (p1: string, p2: string) => number;
+export declare const compareRankSignature: (p1: string, p2: string) => number;
 /**
- * 将 getHandPresentation 的字符串解析为可排序的整数
- * 保证：comparePresentation(a, b) === -1 => getHandStrengthIntFromPresentation(a) < getHandStrengthIntFromPresentation(b)
+ * 将五张组合牌的 rankSignature 解析为可排序的整数
+ * 保证：compareRankSignature(a, b) === -1 => getStrengthFromRankSignature(a) < getStrengthFromRankSignature(b)
  */
-export declare function getHandStrengthIntFromPresentation(presentation: Presentation): number;
+export declare function getStrengthFromRankSignature(rankSignature: RankSignature): number;
 /**
- * 将 5 张牌编码为可排序的整数，便于数据库存储与 ORDER BY 比较
- * 牌力越大数值越大，可直接用于 ORDER BY hand_strength DESC 取最强牌
+ * 获取五张组合牌型的强度（可排序整数），便于数据库存储与 ORDER BY 比较
+ * 牌力越大数值越大，可直接用于 ORDER BY 取最强牌
  */
-export declare function getHandStrengthInt(input: Poke[]): number;
+export declare function getFiveCardsStrength(input: Poke[]): number;
 /**
- * @description 计算牌力大小
- * @param input
- * @returns
+ * 获取五张组合牌的唯一标识（牌力签名：类型 + 牌面细节）
+ * @param input 五张组合牌（5 张 Poke）
+ * @returns rankSignature
  */
-export declare function getHandPresentation(input: Poke[]): Presentation;
+export declare function getFiveCardsRankSignature(input: Poke[]): RankSignature;
 /**
- * @description 根据底牌和手牌, 计算出最大的牌力组合
- * @param handPokes
- * @param commonPokes
- * @returns
+ * 从 2 张手牌与 5 张底牌中，选出牌力最大的 5 张牌型；。
+ * @param handPokes 手牌（如 2 张）
+ * @param commonPokes 底牌/公共牌（如 5 张）
  */
-export declare function getBestHand(pokes: Poke[], commonPokes: Poke[]): Poke[];
+export declare function getBestFiveCards(handPokes: Poke[], commonPokes: Poke[]): Poke[];
 /**
- * @description 获取多个手牌组合中的所有牌型组合, 按照降序排列
- * @param handPokes
- * @param commonPokes
- * @returns
+ * 获取多组手牌与公共牌组合后的所有五张牌型，按牌力降序排列
+ * @param handPokes 各玩家手牌（每组 2 张）
+ * @param commonPokes 公共牌
  */
 export declare function getSortedAllHandPokesCombinations(handPokes: Poke[][], commonPokes: Poke[]): ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
 /**
- * @description 获取多个手牌组合中的最大牌力值
- * @param handPokes
- * @param commonPokes
- * @returns
+ * 获取多组手牌与公共牌组合中的最大牌型签名
+ * @param handPokes 各玩家手牌
+ * @param commonPokes 公共牌
  */
-export declare function getBestPokesPresentation(handPokes: Poke[][], commonPokes: Poke[]): `s${string}` | `t${string}` | `q${string}` | `z${string}` | `y${string}` | `x${string}` | `w${string}` | `v${string}` | `u${string}` | `r${string}`;
-export declare function getMaxPresentationAndPokes(handPokes: Poke[][], commonPokes: Poke[]): {
-    presentation: `s${string}` | `t${string}` | `q${string}` | `z${string}` | `y${string}` | `x${string}` | `w${string}` | `v${string}` | `u${string}` | `r${string}`;
+export declare function getBestPokesRankSignature(handPokes: Poke[][], commonPokes: Poke[]): `s${string}` | `t${string}` | `q${string}` | `z${string}` | `y${string}` | `x${string}` | `w${string}` | `v${string}` | `u${string}` | `r${string}`;
+/** 获取多组手牌与公共牌组合中的最大牌型签名及其对应的五张牌 */
+export declare function getMaxRankSignatureAndPokes(handPokes: Poke[][], commonPokes: Poke[]): {
+    rankSignature: `s${string}` | `t${string}` | `q${string}` | `z${string}` | `y${string}` | `x${string}` | `w${string}` | `v${string}` | `u${string}` | `r${string}`;
     pokes: ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
 };
 /**
@@ -65,6 +63,6 @@ export declare function getMaxPresentationAndPokes(handPokes: Poke[][], commonPo
  */
 export declare const formatterPoke: (input: Poke[]) => string;
 /**
- * @description 根据玩家presentation, 计算出赢家
+ * @description 根据玩家 rankStrength 计算出赢家
  */
 export declare const getWinners: (players: Player[]) => Player[];

package/types/Deck/index.d.ts

@@ -1,4 +1,4 @@
-import { handTypeCategory } from './constant';
+import { RankCategory } from './constant';
 /**
  * 洗牌, 发牌
  */
@@ -21,10 +21,10 @@ declare class Deck {
         commonPokes: ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[];
     };
     getCards(): ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[];
-    getMaxPresentation(): handTypeCategory;
+    getMaxRankCategory(): RankCategory;
     getMaxPokeCombinations(): ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
-    getMaxPresentationAndPokes(): {
-        presentation: `s${string}` | `t${string}` | `q${string}` | `z${string}` | `y${string}` | `x${string}` | `w${string}` | `v${string}` | `u${string}` | `r${string}`;
+    getMaxRankSignatureAndPokes(): {
+        rankSignature: `s${string}` | `t${string}` | `q${string}` | `z${string}` | `y${string}` | `x${string}` | `w${string}` | `v${string}` | `u${string}` | `r${string}`;
         pokes: ("h2" | "h3" | "h4" | "h5" | "h6" | "h7" | "h8" | "h9" | "ht" | "hj" | "hq" | "hk" | "ha" | "s2" | "s3" | "s4" | "s5" | "s6" | "s7" | "s8" | "s9" | "st" | "sj" | "sq" | "sk" | "sa" | "d2" | "d3" | "d4" | "d5" | "d6" | "d7" | "d8" | "d9" | "dt" | "dj" | "dq" | "dk" | "da" | "c2" | "c3" | "c4" | "c5" | "c6" | "c7" | "c8" | "c9" | "ct" | "cj" | "cq" | "ck" | "ca")[][];
     };
 }

package/types/Player/constant.d.ts

@@ -1,4 +1,27 @@
-import { Role } from './index';
+/** 座位角色枚举 */
+export declare enum RoleEnum {
+    /** 庄家/按钮 */
+    BTN = "btn",
+    /** 小盲 */
+    SB = "sb",
+    /** 大盲 */
+    BB = "bb",
+    /** 枪口 */
+    UTG = "utg",
+    /** 枪口+1 */
+    UTG1 = "utg1",
+    /** 枪口+2（10 人桌） */
+    UTG2 = "utg2",
+    /** 中位 */
+    MP = "mp",
+    /** Lojack（10 人桌） */
+    LJ = "lj",
+    /** 劫持位 */
+    HJ = "hj",
+    /** 关煞位 */
+    CO = "co"
+}
+export type Role = RoleEnum;
 export declare enum ActionTypeEnum {
     CALL = "call",
     CHECK = "check",
@@ -8,6 +31,6 @@ export declare enum ActionTypeEnum {
     BET = "bet"
 }
 export declare const ActionTypeMap: Map<ActionTypeEnum, string>;
-export declare const roleMap: Map<Role, string>;
-declare const playerRoleSetMap: Map<number, Role[]>;
+export declare const roleMap: Map<RoleEnum, string>;
+declare const playerRoleSetMap: Map<number, RoleEnum[]>;
 export { playerRoleSetMap };

package/types/Player/index.d.ts

@@ -1,8 +1,8 @@
 import Pool from '../Pool';
 import Dealer from '../Dealer';
-import { Poke } from '../Deck/constant';
-import { ActionTypeEnum } from './constant';
+import { ActionTypeEnum, RoleEnum, type Role } from './constant';
 import Controller from '../Controller';
+import { Poke, RankSignature } from '../Deck/constant';
 import { PreAction, GameComponent, TexasErrorCallback } from '../Texas';
 export { ActionTypeEnum };
 type PlayerStatus = 'allIn' | 'active' | 'waiting' | 'out';
@@ -31,7 +31,8 @@ export interface User {
     avatar?: string;
 }
 export type CallbackOfAction = (player: Player, isPreFlop?: boolean) => Promise<void>;
-export type Role = 'button' | 'small-blind' | 'big-blind' | `under-the-gun${number | ''}` | `middle-position${number | ''}` | 'hi-jack' | 'cut-off';
+export type { Role } from './constant';
+export { RoleEnum } from './constant';
 /**
  * 玩家
  */
@@ -67,9 +68,11 @@ export declare class Player implements GameComponent {
      * @description 获取剩余的行动思考时间
      */
     getRemainThinkTime(): number;
+    get bestFiveCards(): Poke[] | undefined;
+    set bestFiveCards(value: Poke[] | undefined);
     setNextPlayer(player: Player | null): void;
-    setPresentation(presentation: string): void;
-    getPresentation(): string | undefined;
+    get rankSignature(): RankSignature | undefined;
+    set rankSignature(value: RankSignature);
     getNextPlayer(): Player | null;
     getLastPlayer(): Player | null;
     setLastPlayer(player: Player | null): void;
@@ -77,6 +80,8 @@ export declare class Player implements GameComponent {
     getStatus(): PlayerStatus;
     get onlineStatus(): OnlineStatus;
     set onlineStatus(value: OnlineStatus);
+    set rankStrength(value: number);
+    get rankStrength(): number;
     onPreAction(callback: (params: PreAction) => void): void;
     reset(): void;
     setRole(role: Role): void;
@@ -117,7 +122,7 @@ export declare class Player implements GameComponent {
     returnLatestPlayerIf(filter: (player: Player) => boolean): Player | null;
     returnNextPlayerIf(filter: (player: Player) => boolean): Player | null;
     getAction(): Action | undefined;
-    getRole(): Role | undefined;
+    getRole(): RoleEnum | undefined;
     getUserInfo(): User;
     checkIfCanAct(): void;
     toString(): string;

package/types/index.d.ts

@@ -8,7 +8,7 @@ import { roleMap, ActionTypeMap } from './Player/constant';
 import { Stage, StageEnum, ControllerStatus } from './Controller';
 import { texasErrorMap, TexasErrorCode } from './TexasError/constant';
 import { RoomStatus, default as Room, PlayerSeatStatus } from './Room';
-import { User, Role, Action, ActionType, OnlineStatus, ActionTypeEnum, default as Player } from './Player';
+import { User, Role, RoleEnum, Action, ActionType, OnlineStatus, ActionTypeEnum, default as Player } from './Player';
 export * from './Deck/constant';
-export { getBestPokesPresentation, comparePresentation, getHandStrengthInt, getHandStrengthIntFromPresentation } from './Deck/core';
-export { Player, User, ActionType, ActionTypeEnum, Role, Action, roleMap, ActionTypeMap, Stage, StageEnum, ControllerStatus, stageMap, Dealer, Deck, Room, RoomStatus, PlayerSeatStatus, formatterPoke, TexasError, TexasErrorCode, texasErrorMap, Texas, OnlineStatus };
+export { getBestPokesRankSignature, compareRankSignature, getFiveCardsStrength, getStrengthFromRankSignature } from './Deck/core';
+export { Player, User, ActionType, ActionTypeEnum, Role, RoleEnum, Action, roleMap, ActionTypeMap, Stage, StageEnum, ControllerStatus, stageMap, Dealer, Deck, Room, RoomStatus, PlayerSeatStatus, formatterPoke, TexasError, TexasErrorCode, texasErrorMap, Texas, OnlineStatus };