drwily/gogobee
1
0
Fork 0
mirror of https://github.com/prosolis/gogobee.git synced 2026-07-15 08:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Blackjack bugs and UNO multiplayer issues, add simultaneous play

Browse Source 
Blackjack:
- Fix handValue soft flag for multi-ace hands (A+A+5 returned soft=false,
  causing dealer to incorrectly stand on soft 17)
- Fix loss display showing €-50 instead of -€50
- Round down Blackjack 1.5x payout per requirements (math.Floor)
- Restrict !bjboard to games room like all other game commands
- Fix leaderboard showing misleading W/L (pushes counted as losses)
- Notify user when bet is capped to max instead of silently capping
- Fix bet max message to use min(MaxBet, maxAvailable)
- Rework to simultaneous play: all players hit/stand independently
  with one shared round timer, reminders at 30s and 10s remaining
- Add !blackjack deal to skip the 60s join wait
- Add mid-round forfeit via !blackjack leave during play
- Set minimum 5s delay for reminder timers to avoid spam on low timeouts

Multiplayer UNO:
- Fix lobby race conditions: move euro debit inside mutex lock to
  prevent lobby overwrites and missed refunds
- Extract shared applyCardEffects to deduplicate card effect logic
  from applyAndAnnounce, botMultiTurn, and applyAutoEffects
- Add 10-minute game inactivity timeout with refunds (was in
  requirements but not implemented)
- Add card count to all "draws a card, turn passes" room messages
  so spectators can track hand sizes

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
prosolis
2026-03-19 21:59:57 -07:00
parent 265a9976cf
commit b9237181b1
2 changed files with 325 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
internal/plugin/uno_multi.go
View File

@@ -54,8 +54,9 @@ type unoMultiGame struct {
done bool
bookDown bool
timer *time.Timer
mu sync.Mutex // per-game lock
timer *time.Timer
inactiveTimer *time.Timer // 10-minute game timeout
mu sync.Mutex // per-game lock
}
type unoMultiLobby struct {
@@ -233,10 +234,10 @@ func (p *UnoPlugin) handleMultiStart(ctx MessageContext, amountStr string) error
}
}
}
p.mu.Unlock()
// Debit ante
// Debit ante while still holding the lock
if !p.euro.Debit(ctx.Sender, amount, "uno_multi_ante") {
p.mu.Unlock()
return p.SendReply(ctx.RoomID, ctx.EventID, "Insufficient balance for that ante.")
}
@@ -253,7 +254,6 @@ func (p *UnoPlugin) handleMultiStart(ctx MessageContext, amountStr string) error
p.lobbyExpired(ctx.RoomID)
})
p.mu.Lock()
p.lobbies[ctx.RoomID] = lobby
p.mu.Unlock()
@@ -303,14 +303,13 @@ func (p *UnoPlugin) handleMultiJoin(ctx MessageContext) error {
}
}
}
p.mu.Unlock()
// Debit ante
// Debit ante while still holding the lock
if !p.euro.Debit(ctx.Sender, lobby.ante, "uno_multi_ante") {
p.mu.Unlock()
return p.SendReply(ctx.RoomID, ctx.EventID, "Insufficient balance for the ante.")
}
p.mu.Lock()
lobby.players = append(lobby.players, ctx.Sender)
count := len(lobby.players)
p.mu.Unlock()
@@ -491,6 +490,7 @@ func (p *UnoPlugin) handleMultiGo(ctx MessageContext) error {
// Start first turn
game.mu.Lock()
defer game.mu.Unlock()
p.startInactivityTimer(game)
p.executeMultiTurn(game)
return nil
@@ -623,7 +623,7 @@ func (p *UnoPlugin) executeMultiTurn(game *unoMultiGame) {
if len(drawn) == 0 {
// Empty deck, no playable cards — pass
name := p.unoDisplayName(player.userID)
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s has no playable cards and deck is empty. Turn passes.", name))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s has no playable cards and deck is empty. Turn passes. (%d cards)", name, len(player.hand)))
p.SendMessage(player.dmRoomID, "No playable cards and deck is empty. Turn passes.")
game.currentIdx = game.nextActiveIdx()
game.turnID++
@@ -645,7 +645,7 @@ func (p *UnoPlugin) executeMultiTurn(game *unoMultiGame) {
name := p.unoDisplayName(player.userID)
p.SendMessage(player.dmRoomID,
fmt.Sprintf("No playable cards — drew automatically: %s\nNot playable. Turn passes.", card.Display()))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s draws a card. Turn passes.", name))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s draws a card. Turn passes. (%d cards)", name, len(player.hand)))
game.currentIdx = game.nextActiveIdx()
game.turnID++
continue
@@ -702,10 +702,11 @@ func (p *UnoPlugin) handleMultiDMInput(ctx MessageContext, game *unoMultiGame) e
return nil // not this player's turn
}
// Reset auto-play counter on manual input
// Reset auto-play counter and inactivity timer on manual input
player.autoPlays = 0
p.startInactivityTimer(game)
// Cancel timer
// Cancel turn timer
if game.timer != nil {
game.timer.Stop()
}
@@ -866,7 +867,7 @@ func (p *UnoPlugin) handleMultiPlayerDraw(game *unoMultiGame, player *unoMultiPl
name := p.unoDisplayName(player.userID)
p.SendMessage(player.dmRoomID, fmt.Sprintf("You drew: %s\nNot playable. Turn passes.", card.Display()))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s draws a card. Turn passes.", name))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s draws a card. Turn passes. (%d cards)", name, len(player.hand)))
p.advanceAndExecute(game)
return nil
}
@@ -884,7 +885,7 @@ func (p *UnoPlugin) handleMultiDrawnPlayable(game *unoMultiGame, player *unoMult
if input == "no" || input == "n" {
name := p.unoDisplayName(player.userID)
p.SendMessage(player.dmRoomID, "Card kept. Turn passes.")
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s draws a card. Turn passes.", name))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 %s draws a card. Turn passes. (%d cards)", name, len(player.hand)))
p.advanceAndExecute(game)
return nil
}
@@ -929,13 +930,18 @@ func (p *UnoPlugin) handleMultiDrawnPlayable(game *unoMultiGame, player *unoMult
// Card effects & turn announcement
// ---------------------------------------------------------------------------
func (p *UnoPlugin) applyAndAnnounce(game *unoMultiGame, player *unoMultiPlayer, card unoCard) {
name := p.unoDisplayName(player.userID)
var roomMsg strings.Builder
// cardEffectResult describes what happened when a card's effects were applied.
type cardEffectResult struct {
skippedName string // non-empty if a player was skipped
reversed bool // true if direction was reversed
drawnCount int // cards drawn by the victim (2 or 4)
}
roomMsg.WriteString(fmt.Sprintf("🃏 %s plays: %s", name, card.DisplayWithColor(game.topColor)))
// applyCardEffects applies skip/reverse/draw effects and advances the turn.
// Caller must hold game.mu.
func (p *UnoPlugin) applyCardEffects(game *unoMultiGame, card unoCard) cardEffectResult {
var result cardEffectResult
// Determine next player for effects
nextIdx := game.nextActiveIdx()
nextPlayer := game.players[nextIdx]
nextName := p.unoDisplayName(nextPlayer.userID)
@@ -945,24 +951,20 @@ func (p *UnoPlugin) applyAndAnnounce(game *unoMultiGame, player *unoMultiPlayer,
switch card.Value {
case unoSkip:
// In multiplayer, skip always skips the next player
roomMsg.WriteString(fmt.Sprintf("\n %s is skipped!", nextName))
// Advance past the skipped player
result.skippedName = nextName
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
case unoReverse:
game.direction *= -1
activePlayers := game.activePlayers()
if len(activePlayers) == 2 {
// 2-player: reverse = skip
roomMsg.WriteString(fmt.Sprintf("\n %s is skipped! (reverse)", nextName))
result.reversed = true
if len(game.activePlayers()) == 2 {
result.skippedName = nextName
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
} else {
roomMsg.WriteString("\n Direction reversed!")
game.currentIdx = game.nextActiveIdx()
game.turnID++
}
@@ -970,8 +972,8 @@ func (p *UnoPlugin) applyAndAnnounce(game *unoMultiGame, player *unoMultiPlayer,
case unoDrawTwo:
drawn := game.draw(2)
nextPlayer.hand = append(nextPlayer.hand, drawn...)
roomMsg.WriteString(fmt.Sprintf("\n %s draws 2 and is skipped!", nextName))
// Skip past the victim
result.skippedName = nextName
result.drawnCount = 2
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
@@ -979,17 +981,42 @@ func (p *UnoPlugin) applyAndAnnounce(game *unoMultiGame, player *unoMultiPlayer,
case unoWildDrawFour:
drawn := game.draw(4)
nextPlayer.hand = append(nextPlayer.hand, drawn...)
roomMsg.WriteString(fmt.Sprintf("\n %s draws 4 and is skipped!", nextName))
result.skippedName = nextName
result.drawnCount = 4
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
default:
// Normal card
game.currentIdx = game.nextActiveIdx()
game.turnID++
}
return result
}
// writeEffectLines appends human-readable effect descriptions to a string builder.
func writeEffectLines(sb *strings.Builder, eff cardEffectResult) {
if eff.drawnCount > 0 {
sb.WriteString(fmt.Sprintf("\n %s draws %d and is skipped!", eff.skippedName, eff.drawnCount))
} else if eff.skippedName != "" && eff.reversed {
sb.WriteString(fmt.Sprintf("\n %s is skipped! (reverse)", eff.skippedName))
} else if eff.skippedName != "" {
sb.WriteString(fmt.Sprintf("\n %s is skipped!", eff.skippedName))
} else if eff.reversed {
sb.WriteString("\n Direction reversed!")
}
}
func (p *UnoPlugin) applyAndAnnounce(game *unoMultiGame, player *unoMultiPlayer, card unoCard) {
name := p.unoDisplayName(player.userID)
var roomMsg strings.Builder
roomMsg.WriteString(fmt.Sprintf("🃏 %s plays: %s", name, card.DisplayWithColor(game.topColor)))
eff := p.applyCardEffects(game, card)
writeEffectLines(&roomMsg, eff)
// Book state commentary (occasionally)
if game.turns%4 == 0 {
if changed := game.updateBookState(); changed {
@@ -1119,53 +1146,8 @@ func (p *UnoPlugin) botMultiTurn(game *unoMultiGame, roomBuf *strings.Builder) {
}
// Apply action effects
nextIdx := game.nextActiveIdx()
nextPlayer := game.players[nextIdx]
nextName := p.unoDisplayName(nextPlayer.userID)
if nextPlayer.isBot {
nextName = bn
}
switch card.Value {
case unoSkip:
roomBuf.WriteString(fmt.Sprintf("\n %s is skipped!", nextName))
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
case unoReverse:
game.direction *= -1
if len(game.activePlayers()) == 2 {
roomBuf.WriteString(fmt.Sprintf("\n %s is skipped! (reverse)", nextName))
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
} else {
roomBuf.WriteString("\n Direction reversed!")
game.currentIdx = game.nextActiveIdx()
game.turnID++
}
case unoDrawTwo:
drawn := game.draw(2)
nextPlayer.hand = append(nextPlayer.hand, drawn...)
roomBuf.WriteString(fmt.Sprintf("\n %s draws 2 and is skipped!", nextName))
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
case unoWildDrawFour:
drawn := game.draw(4)
nextPlayer.hand = append(nextPlayer.hand, drawn...)
roomBuf.WriteString(fmt.Sprintf("\n %s draws 4 and is skipped!", nextName))
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
default:
game.currentIdx = game.nextActiveIdx()
game.turnID++
}
eff := p.applyCardEffects(game, card)
writeEffectLines(roomBuf, eff)
game.turns++
}
@@ -1219,6 +1201,50 @@ func (p *UnoPlugin) startMultiAutoPlayTimer(game *unoMultiGame) {
})
}
// startInactivityTimer starts (or resets) the 10-minute game timeout.
// If no human input occurs within the window, the game ends and remaining players are refunded.
// Caller must hold game.mu.
func (p *UnoPlugin) startInactivityTimer(game *unoMultiGame) {
if game.inactiveTimer != nil {
game.inactiveTimer.Stop()
}
timeout := envInt("UNO_MULTI_INACTIVITY_TIMEOUT", 600)
gameID := game.id
game.inactiveTimer = time.AfterFunc(time.Duration(timeout)*time.Second, func() {
p.mu.Lock()
mg, exists := p.multiGames[gameID]
p.mu.Unlock()
if !exists {
return
}
mg.mu.Lock()
defer mg.mu.Unlock()
if mg.done {
return
}
mg.done = true
if mg.timer != nil {
mg.timer.Stop()
}
// Refund remaining human players
for _, pl := range mg.players {
if !pl.isBot && pl.active {
p.euro.Credit(pl.userID, mg.ante, "uno_multi_timeout_refund")
}
}
p.SendMessage(mg.roomID, "🃏 **Game timed out** — no human input for 10 minutes. All antes refunded.")
p.recordMultiGame(mg, id.UserID(""), "timeout")
p.cleanupMultiGame(mg)
})
}
func (p *UnoPlugin) autoPlayMultiTurn(game *unoMultiGame, player *unoMultiPlayer) {
name := p.unoDisplayName(player.userID)
@@ -1393,48 +1419,14 @@ func (p *UnoPlugin) autoPlayMultiTurn(game *unoMultiGame, player *unoMultiPlayer
}
p.SendMessage(player.dmRoomID, fmt.Sprintf("*Auto-played:* Drew %s. Not playable. Turn passes.", card.Display()))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 *%s was auto-played.* Draws a card. Turn passes.", name))
p.SendMessage(game.roomID, fmt.Sprintf("🃏 *%s was auto-played.* Draws a card. Turn passes. (%d cards)", name, len(player.hand)))
p.advanceAndExecute(game)
}
}
// applyAutoEffects applies card effects after an auto-play and advances the turn.
func (p *UnoPlugin) applyAutoEffects(game *unoMultiGame, player *unoMultiPlayer, card unoCard) {
nextIdx := game.nextActiveIdx()
nextPlayer := game.players[nextIdx]
switch card.Value {
case unoSkip:
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
case unoReverse:
game.direction *= -1
if len(game.activePlayers()) == 2 {
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
} else {
game.currentIdx = game.nextActiveIdx()
game.turnID++
}
case unoDrawTwo:
drawn := game.draw(2)
nextPlayer.hand = append(nextPlayer.hand, drawn...)
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
case unoWildDrawFour:
drawn := game.draw(4)
nextPlayer.hand = append(nextPlayer.hand, drawn...)
game.currentIdx = nextIdx
game.currentIdx = game.nextActiveIdx()
game.turnID++
default:
game.currentIdx = game.nextActiveIdx()
game.turnID++
}
func (p *UnoPlugin) applyAutoEffects(game *unoMultiGame, _ *unoMultiPlayer, card unoCard) {
p.applyCardEffects(game, card)
p.executeMultiTurn(game)
}
@@ -1451,6 +1443,9 @@ func (p *UnoPlugin) multiPlayerWins(game *unoMultiGame, winner *unoMultiPlayer)
if game.timer != nil {
game.timer.Stop()
}
if game.inactiveTimer != nil {
game.inactiveTimer.Stop()
}
// Calculate pot (all human antes)
humanCount := 0
@@ -1481,6 +1476,9 @@ func (p *UnoPlugin) multiBotWins(game *unoMultiGame) {
if game.timer != nil {
game.timer.Stop()
}
if game.inactiveTimer != nil {
game.inactiveTimer.Stop()
}
humanCount := 0
for _, pl := range game.players {