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

REALLY Fix the Poker bug

Browse Source
This commit is contained in:
Dragon Fire
2020-11-24 16:57:52 -05:00
parent 193b8a9ca6
commit 61df6c93c9
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/games-mp/poker.js
+29 -8
View File
@@ -3,7 +3,7 @@ const Collection = require('@discordjs/collection');
const { Hand } = require('pokersolver'); const { Hand } = require('pokersolver');
const { stripIndents } = require('common-tags'); const { stripIndents } = require('common-tags');
const Deck = require('../../structures/cards/Deck'); const Deck = require('../../structures/cards/Deck');
const { formatNumber, list, delay, removeFromArray, awaitPlayers } = require('../../util/Util'); const { formatNumber, list, delay, awaitPlayers } = require('../../util/Util');
const max = 6; const max = 6;
const min = 2; const min = 2;
const bigBlindAmount = 100; const bigBlindAmount = 100;
@@ -98,7 +98,13 @@ module.exports = class PokerCommand extends Command {
turnData.currentBet = bigBlindAmount; turnData.currentBet = bigBlindAmount;
turnData.highestBetter = bigBlind; turnData.highestBetter = bigBlind;
let keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind); let keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind);
if (!keepGoing) continue; if (!keepGoing) {
if (players.size < 2) {
winner = players.first();
break;
}
continue;
}
const dealerHand = deck.draw(3); const dealerHand = deck.draw(3);
await msg.say(stripIndents` await msg.say(stripIndents`
**Dealer Hand:** **Dealer Hand:**
@@ -108,7 +114,13 @@ module.exports = class PokerCommand extends Command {
`); `);
await delay(10000); await delay(10000);
keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind); keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind);
if (!keepGoing) continue; if (!keepGoing) {
if (players.size < 2) {
winner = players.first();
break;
}
continue;
}
dealerHand.push(deck.draw()); dealerHand.push(deck.draw());
await msg.say(stripIndents` await msg.say(stripIndents`
**Dealer Hand:** **Dealer Hand:**
@@ -118,7 +130,13 @@ module.exports = class PokerCommand extends Command {
`); `);
await delay(10000); await delay(10000);
keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind); keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind);
if (!keepGoing) continue; if (!keepGoing) {
if (players.size < 2) {
winner = players.first();
break;
}
continue;
}
dealerHand.push(deck.draw()); dealerHand.push(deck.draw());
await msg.say(stripIndents` await msg.say(stripIndents`
**Dealer Hand:** **Dealer Hand:**
@@ -128,7 +146,13 @@ module.exports = class PokerCommand extends Command {
`); `);
await delay(10000); await delay(10000);
keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind); keepGoing = await this.gameRound(msg, players, deck, folded, turnData, bigBlind, smallBlind);
if (!keepGoing) continue; if (!keepGoing) {
if (players.size < 2) {
winner = players.first();
break;
}
continue;
}
const solved = []; const solved = [];
for (const playerID of rotation) { for (const playerID of rotation) {
if (folded.includes(playerID)) continue; if (folded.includes(playerID)) continue;
@@ -165,9 +189,6 @@ module.exports = class PokerCommand extends Command {
winners[0].user.money += turnData.pot; winners[0].user.money += turnData.pot;
} }
await this.resetGame(msg, players, deck); await this.resetGame(msg, players, deck);
for (const playerID of rotation) {
if (!players.has(playerID)) rotation = removeFromArray(rotation, playerID);
}
if (players.size < 2) { if (players.size < 2) {
winner = players.first(); winner = players.first();
break; break;
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "xiao", "name": "xiao",
"version": "121.0.0", "version": "121.0.1",
"description": "Your personal server companion.", "description": "Your personal server companion.",
"main": "Xiao.js", "main": "Xiao.js",
"scripts": { "scripts": {