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

moving a non-king to reveal empty tableau also counts as reveal

Browse Source
This commit is contained in:
Rhys Lloyd
2026-05-16 18:08:05 -07:00
parent d43f4c5693
commit 8eba64aecf
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klondike-cli/src/main.rs
+10 -3
View File
@@ -1,4 +1,4 @@
use card_game::{Card, Game, Pile, Session, Suit}; use card_game::{Card, CardValue, Game, Pile, Session, Suit};
use klondike::{ use klondike::{
DstFoundation, DstTableau, Foundation, Klondike, KlondikeInstruction, KlondikePile, DstFoundation, DstTableau, Foundation, Klondike, KlondikeInstruction, KlondikePile,
KlondikePileStack, SkipCards, Tableau, TableauStack, KlondikePileStack, SkipCards, Tableau, TableauStack,
@@ -236,7 +236,7 @@ fn main() -> Result<(), std::io::Error> {
instruction: &KlondikeInstruction, instruction: &KlondikeInstruction,
) -> usize { ) -> usize {
// 1 Move into foundation // 1 Move into foundation
// 2 T->T Move to reveal new card // 2 T->T Move to reveal new card (moving a non-king to reveal empty tableau also counts)
// 3 Move from stock // 3 Move from stock
// 4 Rotate stock // 4 Rotate stock
// 5 T->T Move not revealing new card // 5 T->T Move not revealing new card
@@ -247,7 +247,14 @@ fn main() -> Result<(), std::io::Error> {
KlondikePileStack::Tableau(TableauStack { KlondikePileStack::Tableau(TableauStack {
tableau, tableau,
skip_cards: SkipCards::Skip0, skip_cards: SkipCards::Skip0,
}) if !state.state().is_tableau_face_down_empty(tableau) => 2, }) if !state.state().is_tableau_face_down_empty(tableau)
|| state
.state()
.card(dst_tableau.src)
.is_some_and(|card| card.value() != CardValue::KING) =>
{
2
}
KlondikePileStack::Stock => 3, KlondikePileStack::Stock => 3,
_ => 5, _ => 5,
}, },