Let players peek both decks during and after a battle

Record each seat's arranged lineup on the battle result (already public)
and reveal the full deck in a popover when hovering a deck pile in the
battle view — the opponent's included.
This commit is contained in:
Greyson Parrelli
2026-07-23 01:12:36 -04:00
parent c641e4fc20
commit 7eb4812f86
5 changed files with 91 additions and 7 deletions
+9 -6
View File
@@ -102,12 +102,14 @@ type BattleEvent struct {
Bonus int `json:"bonus"` Bonus int `json:"bonus"`
} }
// BattleResult is the full, public record of one round's battle. Only what // BattleResult is the full, public record of one round's battle.
// was revealed appears in Events; the rest of the winner's stack stays
// hidden.
type BattleResult struct { type BattleResult struct {
Round int `json:"round"` Round int `json:"round"`
StackSizes []int `json:"stackSizes"` // starting deck size per seat StackSizes []int `json:"stackSizes"` // starting deck size per seat
// Lineups is each seat's arranged deck at battle start (top of deck
// first). Public so players can review the whole matchup — including the
// opponent's cards — during and after the fight.
Lineups [][]Card `json:"lineups,omitempty"`
Events []BattleEvent `json:"events"` Events []BattleEvent `json:"events"`
WinnerSeat int `json:"winnerSeat"` // -1 = draw WinnerSeat int `json:"winnerSeat"` // -1 = draw
Trophies int `json:"trophies"` // awarded to the winner Trophies int `json:"trophies"` // awarded to the winner
@@ -189,7 +191,7 @@ func effectCount(e Effect, s *battleSide, u *BattleUnit) int {
// stalemate. // stalemate.
func (g *Game) resolveBattle() { func (g *Game) resolveBattle() {
n := len(g.Players) n := len(g.Players)
res := &BattleResult{Round: g.Round, WinnerSeat: -1, StackSizes: make([]int, n)} res := &BattleResult{Round: g.Round, WinnerSeat: -1, StackSizes: make([]int, n), Lineups: make([][]Card, n)}
sides := make([]*battleSide, n) sides := make([]*battleSide, n)
emit := func(ev BattleEvent) { res.Events = append(res.Events, ev) } emit := func(ev BattleEvent) { res.Events = append(res.Events, ev) }
@@ -197,6 +199,7 @@ func (g *Game) resolveBattle() {
s := &battleSide{stack: append([]Card(nil), p.Deck...)} s := &battleSide{stack: append([]Card(nil), p.Deck...)}
sides[p.Seat] = s sides[p.Seat] = s
res.StackSizes[p.Seat] = len(p.Deck) res.StackSizes[p.Seat] = len(p.Deck)
res.Lineups[p.Seat] = append([]Card(nil), p.Deck...)
} }
// seatOrder resolves the priority-token holder first, then everyone else. // seatOrder resolves the priority-token holder first, then everyone else.
// Reveals, queued play effects, and cross-side triggers all follow it, so // Reveals, queued play effects, and cross-side triggers all follow it, so
+18
View File
@@ -696,3 +696,21 @@ func TestPriorityTokenTransfer(t *testing.T) {
t.Fatalf("a draw should leave the token put, priority=%d", g.PrioritySeat) t.Fatalf("a draw should leave the token put, priority=%d", g.PrioritySeat)
} }
} }
// TestBattleResultExposesLineups: both seats' arranged decks are recorded on
// the result so players can peek the whole matchup.
func TestBattleResultExposesLineups(t *testing.T) {
g, _, _ := testGame(t)
res := forceBattle(t, g,
[]Card{g.pet("A", 3), g.pet("B", 2)},
[]Card{g.pet("C", 4)})
if len(res.Lineups) != 2 {
t.Fatalf("expected a lineup per seat, got %d", len(res.Lineups))
}
if len(res.Lineups[0]) != 2 || res.Lineups[0][0].Name != "A" {
t.Fatalf("seat 0 lineup should mirror its arranged deck: %+v", res.Lineups[0])
}
if len(res.Lineups[1]) != 1 || res.Lineups[1][0].Name != "C" {
t.Fatalf("seat 1 lineup should mirror its arranged deck: %+v", res.Lineups[1])
}
}
+22 -1
View File
@@ -175,6 +175,8 @@ export function BattlePhase({ view, send }: Props) {
const events = battle.events ?? [] const events = battle.events ?? []
const [step, setStep] = useState(0) const [step, setStep] = useState(0)
const [acked, setAcked] = useState(false) const [acked, setAcked] = useState(false)
const [peekSeat, setPeekSeat] = useState<number | null>(null)
const lineups = battle.lineups
const done = step >= events.length const done = step >= events.length
const lastEvent = step > 0 ? events[step - 1] : null const lastEvent = step > 0 ? events[step - 1] : null
@@ -207,8 +209,14 @@ export function BattlePhase({ view, send }: Props) {
const revealing = !done && lastEvent?.type === 'reveal' && lastEvent.seat === seat const revealing = !done && lastEvent?.type === 'reveal' && lastEvent.seat === seat
const pop = done ? null : unitPop(lastEvent, seat, events, step) const pop = done ? null : unitPop(lastEvent, seat, events, step)
const lineup = lineups?.[seat] ?? []
const stackEl = ( const stackEl = (
<div className="stackpile"> <div
className={`stackpile ${lineup.length ? 'peekable' : ''}`}
onMouseEnter={lineup.length ? () => setPeekSeat(seat) : undefined}
onMouseLeave={() => setPeekSeat((s) => (s === seat ? null : s))}
title={lineup.length ? 'Hover to see the whole deck' : undefined}
>
{s.stack > 0 ? ( {s.stack > 0 ? (
<div className="card-back"> <div className="card-back">
<span className="card-back-count">{s.stack}</span> <span className="card-back-count">{s.stack}</span>
@@ -226,6 +234,19 @@ export function BattlePhase({ view, send }: Props) {
<CardView card={lastEvent.card} size="sm" dead /> <CardView card={lastEvent.card} size="sm" dead />
</div> </div>
)} )}
{peekSeat === seat && lineup.length > 0 && (
<div className={`deck-peek deck-peek-${dir}`}>
<div className="deck-peek-label">
{seat === youSeat ? 'Your' : 'Opponents'} deck · {lineup.length} card
{lineup.length !== 1 ? 's' : ''} (top first)
</div>
<div className="deck-peek-cards">
{lineup.map((c, i) => (
<CardView key={c.id || i} card={c} size="sm" />
))}
</div>
</div>
)}
</div> </div>
) )
+41
View File
@@ -1377,3 +1377,44 @@ h3 {
transform: scale(1.5); transform: scale(1.5);
} }
} }
/* --- deck peek (battle) --- */
.stackpile.peekable {
cursor: help;
}
.deck-peek {
position: absolute;
bottom: calc(100% + 8px);
z-index: 60;
width: max-content;
max-width: 60vw;
background: rgba(18, 53, 31, 0.98);
border: 2px solid var(--cocoa);
border-radius: 10px;
padding: 8px 10px;
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.5);
}
.deck-peek-left {
left: 0;
}
.deck-peek-right {
right: 0;
}
.deck-peek-label {
color: var(--gold);
font-size: 0.72rem;
font-weight: 800;
margin-bottom: 6px;
}
.deck-peek-cards {
display: flex;
flex-wrap: wrap;
gap: 6px;
max-width: min(60vw, 560px);
}
+1
View File
@@ -69,6 +69,7 @@ export interface BattleEvent {
export interface BattleResult { export interface BattleResult {
round: number round: number
stackSizes: number[] stackSizes: number[]
lineups?: Card[][] // each seat's arranged deck (top first); public for peeking
events: BattleEvent[] | null events: BattleEvent[] | null
winnerSeat: number winnerSeat: number
trophies: number trophies: number