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

Implement improved scoring (#13)

Browse Source 
Closes #10

Reviewed-on: #13
Co-authored-by: Rhys Lloyd <krakow20@gmail.com>
Co-committed-by: Rhys Lloyd <krakow20@gmail.com>
This commit was merged in pull request #13.
This commit is contained in:
Rhys Lloyd
2026-05-29 20:18:57 +00:00
committed by Quaternions
parent c9c341e926
commit 64a94c6072
4 changed files with 195 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klondike-cli/src/main.rs
+20 -13
View File
@@ -1,7 +1,7 @@
use card_game::{Card, Game, Pile, Rank, Session, SessionStats, Suit};
use card_game::{Card, Game, Pile, Rank, Session, Suit};
use klondike::{
DstFoundation, DstTableau, Foundation, Klondike, KlondikeConfig, KlondikeInstruction,
KlondikePile, KlondikePileStack, KlondikeStats, SkipCards, Tableau, TableauStack,
KlondikePile, KlondikePileStack, SkipCards, Tableau, TableauStack,
};
// #[cfg(test)]
@@ -108,15 +108,16 @@ impl Display for Displayed<&Klondike> {
}
}
impl Display for Displayed<&SessionStats<KlondikeStats>> {
struct DisplayStats<'a>(&'a Session<Klondike>);
impl Display for DisplayStats<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
f,
"recycles: {} moves: {} undos: {} score:{}",
self.0.stats().recycle_count(),
self.0.stats().moves(),
self.0.undos(),
self.0.stats().score() as isize - self.0.undos() as isize * 15,
self.0.stats().stats().recycle_count(),
self.0.stats().stats().moves(),
self.0.stats().undos(),
self.0.state().score(self.0.stats(), &self.0.config()),
)
}
}
@@ -248,9 +249,9 @@ fn main() -> Result<(), std::io::Error> {
loop {
// display stats
println!("seed: {seed} ");
println!("{}", Displayed(session.stats()));
println!("{}", DisplayStats(&session));
// display game
println!("{}", Displayed(session.state()));
println!("{}", Displayed(session.state().state()));
// parse input
input.clear();
@@ -274,7 +275,11 @@ fn main() -> Result<(), std::io::Error> {
}
}
SessionInstruction::Auto => {
if let Some(instruction) = session.state().get_auto_move(session.config()) {
if let Some(instruction) = session
.state()
.state()
.get_auto_move(&session.config().inner)
{
session.process_instruction(instruction);
} else {
println!("No valid moves!");
@@ -284,9 +289,11 @@ fn main() -> Result<(), std::io::Error> {
session.process_instruction(KlondikeInstruction::RotateStock)
}
SessionInstruction::Klondike(naive_instruction) => {
if let Some(instruction) =
find_valid_instruction(session.config(), session.state(), naive_instruction)
{
if let Some(instruction) = find_valid_instruction(
&session.config().inner,
session.state().state(),
naive_instruction,
) {
session.process_instruction(instruction);
} else {
println!("Invalid move!");