X-Git-Url: http://git.scottworley.com/pluta-lesnura/blobdiff_plain/7d0aa2d61de043373796dd07a4d8467e1463ef95..aa0622ab28e4bf320db9a2ff747e5004923e2570:/src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 59a47a9..09bd5fb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -178,7 +178,6 @@ impl Hand {
     fn len(&self) -> usize {
         self.cards.len()
     }
-    #[cfg(test)]
     fn random(&self) -> Option<&Card> {
         self.cards.choose(&mut rand::thread_rng())
     }
@@ -204,6 +203,7 @@ pub enum Phase {
     Momentum,
 }
 
+#[derive(Debug)]
 pub enum GameOutcome {
     Loss,
     Win,
@@ -347,7 +347,7 @@ impl Game {
             .progress
             .iter()
             .zip(self.path_lengths.iter())
-            .any(|(&prog, len)| prog >= len.0 .0.try_into().expect("wat?"))
+            .any(|(&prog, len)| prog >= len.0.value().try_into().expect("wat?"))
         {
             GameOutcome::Win
         } else {
@@ -395,23 +395,33 @@ impl Default for Game {
 }
 
 pub struct Player(Box<dyn FnMut(&Game) -> Play>);
+impl Player {
+    #[must_use]
+    pub fn new<T>(f: T) -> Self
+    where
+        T: FnMut(&Game) -> Play + 'static,
+    {
+        Self(Box::new(f))
+    }
+}
 
-#[cfg(test)]
-fn random_player(game: &Game) -> Play {
-    match game.phase {
-        Phase::Play => Play::Play(
-            *game
-                .current_player_hand()
-                .random()
-                .expect("I always have a card to play because I just drew one"),
-        ),
-        Phase::Momentum => {
-            if rand::thread_rng().gen_bool(0.5) {
-                Play::Draw
-            } else {
-                match game.current_player_hand().random() {
-                    Some(card) => Play::Play(*card),
-                    None => Play::Draw,
+pub fn random_player(draw_chance: f64) -> impl FnMut(&Game) -> Play {
+    move |game: &Game| -> Play {
+        match game.phase {
+            Phase::Play => Play::Play(
+                *game
+                    .current_player_hand()
+                    .random()
+                    .expect("I always have a card to play because I just drew one"),
+            ),
+            Phase::Momentum => {
+                if rand::thread_rng().gen_bool(draw_chance) {
+                    Play::Draw
+                } else {
+                    match game.current_player_hand().random() {
+                        Some(card) => Play::Play(*card),
+                        None => Play::Draw,
+                    }
                 }
             }
         }
@@ -491,7 +501,7 @@ mod tests {
     #[test]
     fn test_game() {
         for num_players in 1..10 {
-            let players: Vec<_> = std::iter::from_fn(|| Some(Player(Box::new(random_player))))
+            let players: Vec<_> = std::iter::from_fn(|| Some(Player::new(random_player(0.5))))
                 .take(num_players)
                 .collect();
             let mut game = Game::default();