1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
//! Best-of-5 tournament: a local series of versus rounds on rotating maps.
//! Round wins accumulate here; the interlude screen bridges the rounds and
//! the results card grows a series block (and a champion headline once the
//! series is decided).
use crate::app::i18n::fill;
use crate::app::match_setup::MatchConfig;
use crate::app::menu_ui;
use crate::app::palette;
use crate::app::settings::GameSettings;
use crate::app::side_panels::leading_seats;
use crate::app::teams::TeamMode;
use crate::app::{Screen, Seats, Sim};
use crate::sim::MAX_PLAYERS;
use bevy::prelude::*;
/// Rounds in a full series; first to [`SERIES_TARGET`] ends it early.
pub const SERIES_ROUNDS: u8 = 5;
pub const SERIES_TARGET: u8 = 3;
#[derive(Resource, Default)]
pub struct Tournament {
pub active: bool,
/// The series is decided; the next Enter leaves for the menu.
pub finished: bool,
/// 1-based current round.
pub round: u8,
pub wins: [u8; MAX_PLAYERS],
}
/// Who a series belongs to. Rounds are awarded per *seat*, because that is
/// how the wins are stored, but a team series is won by the team: both its
/// members hold the same tally, so asking which seat leads sees a tie and
/// answers nobody. The card needs to know which question was asked.
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub enum Champion {
Seat(u8),
Team(u8),
}
impl Champion {
/// Whether `seat` is one of the winners: itself, or a member of the
/// winning team.
pub fn claims(self, seat: u8, mode: TeamMode) -> bool {
match self {
Champion::Seat(s) => s == seat,
Champion::Team(t) => mode.team_of(seat) == t,
}
}
}
impl Tournament {
pub fn start() -> Self {
Tournament {
active: true,
finished: false,
round: 1,
wins: [0; MAX_PLAYERS],
}
}
/// The unique holder of the most round wins, if there is one. Only
/// meaningful free-for-all; [`Tournament::winner`] is the one to ask.
fn champion(&self) -> Option<u8> {
crate::app::side_panels::unique_max(&self.wins).map(|s| s as u8)
}
/// Who took the series, under the mode it was played in. In team play
/// the tally is read one seat per team (every member is awarded the
/// same round) so the comparison is between teams and a shared tally
/// is a win, not a tie.
pub fn winner(&self, mode: TeamMode, seats: u8) -> Option<Champion> {
if mode == TeamMode::Solo {
return self.champion().map(Champion::Seat);
}
let tallies: Vec<u8> = (0..mode.teams(seats))
.map(|team| {
mode.seats_of(team, seats)
.first()
.map_or(0, |&seat| self.wins[usize::from(seat)])
})
.collect();
crate::app::side_panels::unique_max(&tallies).map(|team| Champion::Team(team as u8))
}
}
/// Award the finished round to its unique leader (or, in team play, to
/// every seat on the leading team) and decide the series. Runs before the results card spawns.
pub fn record_series_round(
sim: Res<Sim>,
seats: Res<Seats>,
settings: Res<GameSettings>,
online: Res<crate::app::net::Online>,
mut tournament: ResMut<Tournament>,
) {
if !tournament.active || tournament.finished {
return;
}
// Every peer counts the round it just watched, so its results card is
// right even for the final round, which is followed by no invitation.
// Online, a re-deal of the seats between rounds would leave this tally
// pinned to the old chairs; the host's next invitation carries the
// authoritative wins moved onto the new ones, and `enter_interlude`
// overwrites this with them, so a mid-series seat change corrects
// itself without this having to know the mapping.
let mode = crate::app::teams::in_play(&settings, &online, seats.0);
let leaders = leading_seats(sim.0.scores(), seats.0, mode);
for (seat, led) in leaders.iter().enumerate() {
if *led {
tournament.wins[seat] += 1;
}
}
let best = *tournament.wins.iter().max().unwrap_or(&0);
if best >= SERIES_TARGET || tournament.round >= SERIES_ROUNDS {
tournament.finished = true;
}
}
/// The series tally, one row per contender: who, and a star per round won.
/// Solo rows are seats; team rows are teams, because a pair holding two
/// rounds between them has won two, not four.
pub fn standings(
settings: &GameSettings,
names: &crate::app::SeatNames,
tournament: &Tournament,
mode: TeamMode,
seats: u8,
) -> Vec<(String, Color)> {
(0..mode.teams(seats))
.map(|team| {
let face = crate::app::teams::face_of(mode, team, seats);
let wins = tournament.wins[usize::from(face)];
let who = if mode == TeamMode::Solo {
names.label(settings.tr(), face)
} else {
crate::app::teams::label(settings, names, mode, team, seats)
};
(
format!("{who} {}", "*".repeat(usize::from(wins))),
palette::player_color(face),
)
})
.collect()
}
/// The champion's name for the headline, and the seat whose colour it wears.
pub fn champion_name(
settings: &GameSettings,
names: &crate::app::SeatNames,
mode: TeamMode,
champion: Champion,
seats: u8,
) -> (String, u8) {
match champion {
Champion::Seat(seat) => (names.label(settings.tr(), seat), seat),
Champion::Team(team) => (
crate::app::teams::label(settings, names, mode, team, seats),
crate::app::teams::face_of(mode, team, seats),
),
}
}
/// Marker for the between-rounds interlude card.
#[derive(Component)]
pub struct InterludeUi;
/// Auto-advance clock on the interlude card.
#[derive(Component)]
pub struct InterludeTimer(pub Timer);
/// Entering the interlude advances the series bookkeeping (next round,
/// rotated map, config re-armed) and shows the standings for a beat.
#[allow(clippy::too_many_arguments)]
pub fn enter_interlude(
mut commands: Commands,
settings: Res<GameSettings>,
names: Res<crate::app::SeatNames>,
seats: Res<Seats>,
mut online: ResMut<crate::app::net::Online>,
mut config: ResMut<MatchConfig>,
beaches: Res<crate::app::match_setup::CustomBeaches>,
mut tournament: ResMut<Tournament>,
) {
let mode = crate::app::teams::in_play(&settings, &online, seats.0.max(2));
// The session is through the doorway; the flag has done its work of
// carrying it past `end_versus`. Online, the map and the seed are the
// host's to say and arrive in the terms; the config steps below are
// for a local series, and `load_versus` ignores them for an online one.
//
// The round number and the tally are the host's word online: it re-deals
// them to the next round's seats and sends them out, so both are adopted
// here rather than counted locally, which would advance the round twice
// and credit a moved seat's wins to whoever now sits in it.
match &mut online.0 {
Some(session) => {
session.next_round = false;
if let Some((round, wins)) = session.series_standing.take() {
tournament.round = round;
tournament.wins = wins;
}
}
None => tournament.round += 1,
}
// The dial's own step, with the dial's own guards: past the shelf when
// nothing on it seats the table, past the four-castle beaches when
// five or six are sitting.
crate::app::match_setup::next_map(&mut config, &beaches);
config.armed = true;
let tr = settings.tr();
commands
.spawn((
InterludeUi,
InterludeTimer(Timer::from_seconds(2.4, TimerMode::Once)),
Node {
flex_direction: FlexDirection::Column,
row_gap: Val::Px(12.0),
..menu_ui::centred_overlay()
},
BackgroundColor(palette::CARD_BG),
))
.with_children(|card| {
card.spawn((
Text::new(fill(tr.tour_round, &[("n", &tournament.round.to_string())])),
TextFont {
font_size: FontSize::Px(34.0),
..default()
},
TextColor(palette::GOLD),
));
for (line, color) in standings(&settings, &names, &tournament, mode, seats.0.max(2)) {
card.spawn((
Text::new(line),
TextFont {
font_size: FontSize::Px(24.0),
..default()
},
TextColor(color),
));
}
});
}
/// The interlude rolls into the next round on its own (or on Enter).
pub fn interlude_tick(
time: Res<Time>,
keys: Res<ButtonInput<KeyCode>>,
mut timers: Query<&mut InterludeTimer>,
mut next_screen: ResMut<NextState<Screen>>,
) {
for mut timer in &mut timers {
timer.0.tick(time.delta());
if timer.0.is_finished() || keys.just_pressed(KeyCode::Enter) {
next_screen.set(Screen::Versus);
}
}
}
/// Back at the menu, any running series is abandoned.
pub fn reset_on_menu(mut tournament: ResMut<Tournament>) {
*tournament = Tournament::default();
}
#[cfg(test)]
mod tests {
use super::*;
/// Both members of the leading pair hold the same tally, so a per-seat
/// search sees a tie and only the team search finds the winner.
#[test]
fn a_team_series_is_won_by_the_team() {
let mut t = Tournament::start();
// Two rounds to the pair {0,1}, one to the pair {2,3}.
t.wins = [2, 2, 1, 1, 0, 0];
assert_eq!(t.champion(), None, "the seats are tied, and always will be");
assert_eq!(t.winner(TeamMode::Pairs, 4), Some(Champion::Team(0)));
assert_eq!(t.winner(TeamMode::Solo, 4), None);
// A drawn series still crowns nobody.
t.wins = [2, 2, 2, 2, 0, 0];
assert_eq!(t.winner(TeamMode::Pairs, 4), None);
// Trios read the interleaved halves, not the blocks.
t.wins = [1, 3, 1, 3, 1, 3];
assert_eq!(t.winner(TeamMode::Trios, 6), Some(Champion::Team(1)));
}
/// The series bookkeeping itself, which nothing exercised: a round goes
/// to its leader, three of them end the series early, and a team round
/// is awarded to every seat on the winning team.
#[test]
fn three_rounds_take_the_series() {
use crate::sim::classic_arena;
let mut app = App::new();
app.insert_resource(Sim(classic_arena(false, 4)));
app.insert_resource(Seats(4));
app.insert_resource(GameSettings::default());
app.init_resource::<crate::app::net::Online>();
app.insert_resource(Tournament::start());
app.add_systems(Update, record_series_round);
// Seat 1 banks the most, three rounds running.
{
let mut sim = app.world_mut().resource_mut::<Sim>();
for (seat, score) in [(0, 0), (1, 9), (2, 3), (3, 1)] {
sim.0.set_score(seat, score);
}
}
for round in 1..=3u8 {
app.world_mut().resource_mut::<Tournament>().round = round;
app.update();
}
let tour = app.world().resource::<Tournament>();
assert_eq!(tour.wins, [0, 3, 0, 0, 0, 0]);
assert!(tour.finished, "first to three ends it before round five");
assert_eq!(tour.winner(TeamMode::Solo, 4), Some(Champion::Seat(1)));
// A finished series stops counting, however many more rounds run.
app.update();
assert_eq!(app.world().resource::<Tournament>().wins[1], 3);
// In pairs the round goes to both members of the leading pair.
app.insert_resource(Tournament::start());
app.world_mut().resource_mut::<GameSettings>().team_mode = TeamMode::Pairs;
app.update();
assert_eq!(
app.world().resource::<Tournament>().wins,
[1, 1, 0, 0, 0, 0],
"the pair map is {{0,1}} {{2,3}}: seat 1's nine takes the round for \
seat 0 too, who banked nothing"
);
}
#[test]
fn champion_needs_a_unique_top() {
let mut t = Tournament::start();
assert_eq!(t.champion(), None, "no wins yet");
t.wins = [2, 1, 0, 0, 0, 0];
assert_eq!(t.champion(), Some(0));
t.wins = [2, 2, 0, 0, 0, 0];
assert_eq!(t.champion(), None, "tied series has no champion");
}
}