funman300
ffc79447d4
P0 fixes: - Register WinSummaryPlugin, SelectionPlugin, CardAnimationPlugin in main.rs (all three were exported but never wired — features silently did nothing) - game_state::draw(): increment move_count on waste→stock recycle, not just on normal draws; add move_count_increments_on_recycle regression test P1 fixes: - solitaire_server/Cargo.toml: remove duplicate dev-dependencies (solitaire_sync, uuid, chrono, jsonwebtoken were in both sections) P2 — input_plugin refactor: - Split 198-line handle_keyboard() into three focused systems under 110 lines each: handle_keyboard_core (U/N/Z/D/Space), handle_keyboard_hint (H), handle_keyboard_forfeit (G) - Introduce KeyboardConfirmState resource to share countdown timers across systems - Add three new unit tests: all_hints_suggests_draw_*, all_hints_is_empty_when_truly_stuck, new_game_confirm_window_is_positive P2 — achievement predicate tests (solitaire_core): - Add 10 direct unit tests for speed_demon, lightning, no_undo, high_scorer, on_a_roll, comeback predicates (previously only covered via check_achievements()) - 141 core tests now passing P2 — server tests: - solitaire_server/src/sync.rs: 4 unit tests for merge logic (no DB required) - solitaire_server/src/leaderboard.rs: 2 unit tests for entry shape and sort order P3 — documentation: - Add struct-level /// to 12 Plugin structs (ChallengePlugin, CursorPlugin, AnimationPlugin, HelpPlugin, PausePlugin, AudioPlugin, DailyChallengePlugin, HudPlugin, LeaderboardPlugin, OnboardingPlugin, TimeAttackPlugin, WeeklyGoalsPlugin) - Add field-level /// to Card, Pile, Deck, GameState, AchievementContext, AchievementDef - Add /// to WeeklyGoalKind, WeeklyGoalDef, WeeklyGoalContext, StatsExt::update_on_win card_animation module (new files from previous session): - chain.rs, diagnostics.rs, tuning.rs, updated interaction.rs/animation.rs/mod.rs/lib.rs - Remove unused HOVER_SCALE_DEFAULT / DRAG_LIFT_SCALE_DEFAULT / HOVER_LERP_SPEED_DEFAULT constants - Add handle_touch_stock_tap so touch users can draw from the stock pile Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
73 lines
2.1 KiB
Rust
73 lines
2.1 KiB
Rust
use serde::{Deserialize, Serialize};
|
||
use crate::card::{Card, Suit};
|
||
|
||
/// Identifies which pile on the board a set of cards belongs to.
|
||
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||
pub enum PileType {
|
||
/// The face-down draw pile.
|
||
Stock,
|
||
/// The face-up discard pile drawn to.
|
||
Waste,
|
||
/// One of the four suit-ordered foundation piles.
|
||
Foundation(Suit),
|
||
/// One of the seven tableau columns (0–6).
|
||
Tableau(usize),
|
||
}
|
||
|
||
/// A named collection of cards in a specific board position.
|
||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||
pub struct Pile {
|
||
/// Which pile this is (Stock, Waste, Foundation suit, or Tableau column).
|
||
pub pile_type: PileType,
|
||
/// Cards in the pile, bottom-to-top stacking order. Last element is the top card.
|
||
pub cards: Vec<Card>,
|
||
}
|
||
|
||
impl Pile {
|
||
/// Creates a new empty pile of the given type.
|
||
pub fn new(pile_type: PileType) -> Self {
|
||
Self { pile_type, cards: Vec::new() }
|
||
}
|
||
|
||
/// Returns a reference to the top (last) card, or `None` if empty.
|
||
pub fn top(&self) -> Option<&Card> {
|
||
self.cards.last()
|
||
}
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
use crate::card::{Card, Rank, Suit};
|
||
|
||
#[test]
|
||
fn new_pile_is_empty() {
|
||
let pile = Pile::new(PileType::Stock);
|
||
assert!(pile.cards.is_empty());
|
||
}
|
||
|
||
#[test]
|
||
fn pile_top_returns_last_card() {
|
||
let mut pile = Pile::new(PileType::Waste);
|
||
pile.cards.push(Card { id: 0, suit: Suit::Hearts, rank: Rank::Ace, face_up: true });
|
||
pile.cards.push(Card { id: 1, suit: Suit::Clubs, rank: Rank::Two, face_up: true });
|
||
assert_eq!(pile.top().unwrap().id, 1);
|
||
}
|
||
|
||
#[test]
|
||
fn pile_top_on_empty_is_none() {
|
||
let pile = Pile::new(PileType::Waste);
|
||
assert!(pile.top().is_none());
|
||
}
|
||
|
||
#[test]
|
||
fn pile_type_foundation_uses_suit() {
|
||
assert_ne!(PileType::Foundation(Suit::Hearts), PileType::Foundation(Suit::Spades));
|
||
}
|
||
|
||
#[test]
|
||
fn pile_type_tableau_uses_index() {
|
||
assert_ne!(PileType::Tableau(0), PileType::Tableau(6));
|
||
}
|
||
}
|