From 7a49185c6a64a4e417162e7be83e07d7bb884a52 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Mon, 11 May 2020 12:28:46 -0400 Subject: [PATCH] Fix --- commands/games-mp/poker.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/commands/games-mp/poker.js b/commands/games-mp/poker.js index 939ab090..edde0f74 100644 --- a/commands/games-mp/poker.js +++ b/commands/games-mp/poker.js @@ -149,10 +149,10 @@ module.exports = class PokerCommand extends Command { const solved = []; for (const playerID of turnRotation) { const player = players.get(playerID); - const solvedHand = Hand.solve( + const solvedHand = Hand.solve([ ...player.hand.map(card => card.pokersolverKey), ...dealerHand.map(card => card.pokersolverKey) - ); + ]); solvedHand.user = player; solved.push(solvedHand); } @@ -251,9 +251,9 @@ module.exports = class PokerCommand extends Command { turnPlayer.currentBet += raiseValue + (data.currentBet - turnPlayer.currentBet); await msg.say(`${turnPlayer.user} **raises $${formatNumber(raiseValue)}**.`); } else if (choiceAction === 'call') { - turnPlayer.money -= data.currentBet; - turnPlayer.currentBet += data.currentBet; - data.pot += data.currentBet; + turnPlayer.money -= (data.currentBet - turnPlayer.currentBet); + turnPlayer.currentBet += (data.currentBet - turnPlayer.currentBet); + data.pot += (data.currentBet - turnPlayer.currentBet); await msg.say(`${turnPlayer.user} **calls $${formatNumber(data.currentBet)}**.`); } else if (choiceAction === 'fold') { await msg.say(`${turnPlayer.user} **folds**.`); @@ -263,6 +263,7 @@ module.exports = class PokerCommand extends Command { if (choiceAction !== 'fold') turnRotation.push(turnRotation[0]); turnRotation.shift(); return (data.highestBetter.id === turnPlayer.id && choiceAction === 'check') - || (data.highestBetter.currentBet === turnPlayer.currentBet && turnRotation[0] === data.highestBetter.id); + || (data.highestBetter.currentBet === turnPlayer.currentBet && turnRotation[0] === data.highestBetter.id) + || turnRotation.length === 1; } };