Refactor momentum_player() for clarity

[pluta-lesnura] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 444b3fef59d08d930f7e8ef19e8924f831d96a7e..c46aa7dcf18eeca8ec17f76e0732a3dd24db828a 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -416,8 +416,9 @@ impl Player {
     }
 }
 
-pub fn random_player(draw_chance: f64) -> impl FnMut(&Game) -> Play {
-    move |game: &Game| -> Play {
+#[must_use]
+pub fn random_player(draw_chance: f64) -> Player {
+    Player(Box::new(move |game: &Game| -> Play {
         match game.phase {
             Phase::Play => Play::Play(
                 *game
@@ -436,23 +437,22 @@ pub fn random_player(draw_chance: f64) -> impl FnMut(&Game) -> Play {
                 }
             }
         }
-    }
+    }))
 }
 
-/// When available, make plays that grant momentum.  Otherwise, play randomly.
-pub fn momentum_player(draw_chance: f64) -> impl FnMut(&Game) -> Play {
-    let mut fallback = random_player(draw_chance);
-    move |game: &Game| -> Play {
-        match (&game.phase, game.discard.top().and_then(Card::suit)) {
-            (Phase::Play, Some(suit)) => {
-                match game.current_player_hand().filter_by_suit(suit).random() {
-                    Some(card) => Play::Play(*card),
-                    _ => fallback(game),
+/// When available, make plays that grant momentum.
+#[must_use]
+pub fn momentum_player(mut fallback: Player) -> Player {
+    Player(Box::new(move |game: &Game| -> Play {
+        if game.phase == Phase::Play {
+            if let Some(suit) = game.discard.top().and_then(Card::suit) {
+                if let Some(card) = game.current_player_hand().filter_by_suit(suit).random() {
+                    return Play::Play(*card);
                 }
             }
-            _ => fallback(game),
         }
-    }
+        fallback.0(game)
+    }))
 }
 
 /// # Errors
@@ -528,7 +528,7 @@ mod tests {
     #[test]
     fn test_game() {
         for num_players in 1..10 {
-            let players: Vec<_> = std::iter::from_fn(|| Some(Player::new(random_player(0.5))))
+            let players: Vec<_> = std::iter::from_fn(|| Some(momentum_player(random_player(0.5))))
                 .take(num_players)
                 .collect();
             let mut game = Game::default();