Quaternions/card_game
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

specific functions

Browse Source
This commit is contained in:
Rhys Lloyd
2026-05-16 22:12:27 -07:00
parent 3cbe8dea78
commit de0fdf33ad
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klondike/src/lib.rs
+18 -17
View File
@@ -397,21 +397,22 @@ impl KlondikeState {
KlondikePile::Stock => self.stock.pop_flip_up(), KlondikePile::Stock => self.stock.pop_flip_up(),
} }
} }
fn extend<D: Into<KlondikePile>, I: IntoIterator<Item = Card>>(&mut self, dst: D, cards: I) { fn extend_foundation<I: IntoIterator<Item = Card>>(
match dst.into() { &mut self,
KlondikePile::Tableau(tableau) => match tableau { foundation: Foundation,
Tableau::Tableau1 => self.tableau1.extend(cards), cards: I,
Tableau::Tableau2 => self.tableau2.extend(cards), ) {
Tableau::Tableau3 => self.tableau3.extend(cards), self.foundations[foundation as usize].extend(cards)
Tableau::Tableau4 => self.tableau4.extend(cards), }
Tableau::Tableau5 => self.tableau5.extend(cards), fn extend_tableau<I: IntoIterator<Item = Card>>(&mut self, tableau: Tableau, cards: I) {
Tableau::Tableau6 => self.tableau6.extend(cards), match tableau {
Tableau::Tableau7 => self.tableau7.extend(cards), Tableau::Tableau1 => self.tableau1.extend(cards),
}, Tableau::Tableau2 => self.tableau2.extend(cards),
KlondikePile::Foundation(foundation) => { Tableau::Tableau3 => self.tableau3.extend(cards),
self.foundations[foundation as usize].extend(cards) Tableau::Tableau4 => self.tableau4.extend(cards),
} Tableau::Tableau5 => self.tableau5.extend(cards),
KlondikePile::Stock => self.stock.extend(cards), Tableau::Tableau6 => self.tableau6.extend(cards),
Tableau::Tableau7 => self.tableau7.extend(cards),
} }
} }
pub fn is_instruction_valid(&self, instruction: KlondikeInstruction) -> bool { pub fn is_instruction_valid(&self, instruction: KlondikeInstruction) -> bool {
@@ -557,12 +558,12 @@ impl Game for Klondike {
// Move a card from anywhere to a foundation // Move a card from anywhere to a foundation
KlondikeInstruction::DstFoundation(DstFoundation { src, foundation }) => { KlondikeInstruction::DstFoundation(DstFoundation { src, foundation }) => {
let card = self.state.take_top_card(src); let card = self.state.take_top_card(src);
self.state.extend(foundation, card); self.state.extend_foundation(foundation, card);
} }
// Move a stack of cards from anywhere to a tableau // Move a stack of cards from anywhere to a tableau
KlondikeInstruction::DstTableau(DstTableau { src, tableau }) => { KlondikeInstruction::DstTableau(DstTableau { src, tableau }) => {
let cards = self.state.take_stack(src); let cards = self.state.take_stack(src);
self.state.extend(tableau, cards); self.state.extend_tableau(tableau, cards);
} }
} }
} }