arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-14 08:08:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Dragon Fire
2020-05-11 15:47:52 -04:00
parent ddffb09c3f
commit 64fe36acae
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/games-mp/poker.js
+15 -7
View File
@@ -95,11 +95,7 @@ module.exports = class PokerCommand extends Command {
turnData.currentBet = bigBlindAmount; turnData.currentBet = bigBlindAmount;
turnData.highestBetter = bigBlind; turnData.highestBetter = bigBlind;
let turnOver = false; let turnOver = false;
const turnRotation = rotation.slice(0); let turnRotation = this.makeTurnRotation(players, bigBlind, smallBlind);
if (players.size === 2) turnRotation.push(turnRotation[1], turnRotation[0]);
else turnRotation.push(turnRotation[0], turnRotation[1]);
turnRotation.shift();
turnRotation.shift();
while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData); while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData);
if (turnRotation.length === 1) { if (turnRotation.length === 1) {
const remainer = players.get(turnRotation[0]); const remainer = players.get(turnRotation[0]);
@@ -117,6 +113,7 @@ module.exports = class PokerCommand extends Command {
`); `);
await delay(5000); await delay(5000);
turnOver = false; turnOver = false;
turnRotation = this.makeTurnRotation(players, bigBlind, smallBlind);
while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData); while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData);
if (turnRotation.length === 1) { if (turnRotation.length === 1) {
const remainer = players.get(turnRotation[0]); const remainer = players.get(turnRotation[0]);
@@ -134,6 +131,7 @@ module.exports = class PokerCommand extends Command {
`); `);
await delay(5000); await delay(5000);
turnOver = false; turnOver = false;
turnRotation = this.makeTurnRotation(players, bigBlind, smallBlind);
while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData); while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData);
if (turnRotation.length === 1) { if (turnRotation.length === 1) {
const remainer = players.get(turnRotation[0]); const remainer = players.get(turnRotation[0]);
@@ -151,6 +149,7 @@ module.exports = class PokerCommand extends Command {
`); `);
await delay(5000); await delay(5000);
turnOver = false; turnOver = false;
turnRotation = this.makeTurnRotation(players, bigBlind, smallBlind);
while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData); while (!turnOver) turnOver = await this.bettingRound(msg, players, turnRotation, turnData);
if (turnRotation.length === 1) { if (turnRotation.length === 1) {
const remainer = players.get(turnRotation[0]); const remainer = players.get(turnRotation[0]);
@@ -222,7 +221,16 @@ module.exports = class PokerCommand extends Command {
return actions; return actions;
} }
makeTurnRotation(players, bigBlind, smallBlind) {
return [
smallBlind,
...players.filter(player => bigBlind.id !== player.id && smallBlind.id !== player.id),
bigBlind
];
}
async bettingRound(msg, players, turnRotation, data) { async bettingRound(msg, players, turnRotation, data) {
const oldHighestBetter = data.highestBetter;
const turnPlayer = players.get(turnRotation[0]); const turnPlayer = players.get(turnRotation[0]);
const actions = this.determineActions(turnPlayer, data.currentBet); const actions = this.determineActions(turnPlayer, data.currentBet);
const displayActions = list(actions.map(action => `\`${action}\``), 'or'); const displayActions = list(actions.map(action => `\`${action}\``), 'or');
@@ -279,8 +287,8 @@ module.exports = class PokerCommand extends Command {
} }
if (choiceAction !== 'fold') turnRotation.push(turnRotation[0]); if (choiceAction !== 'fold') turnRotation.push(turnRotation[0]);
turnRotation.shift(); turnRotation.shift();
return (data.highestBetter.id === turnPlayer.id && choiceAction === 'check') return (oldHighestBetter.id === turnPlayer.id && choiceAction === 'check')
|| (data.highestBetter.currentBet === turnPlayer.currentBet && turnRotation[0] === data.highestBetter.id) || (oldHighestBetter.currentBet === turnPlayer.currentBet && turnRotation[0] === oldHighestBetter.id)
|| turnRotation.length === 1; || turnRotation.length === 1;
} }