X-Git-Url: http://git.scottworley.com/pluta-lesnura/blobdiff_plain/9cf05d1abb3f9641d4a35b70f4738e339861490c..c5e4b1eb46c33d636e95f3dbbbdf0bb15ce5d2ef:/src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 1ee5f0b..c46aa7d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -440,20 +440,18 @@ pub fn random_player(draw_chance: f64) -> Player {
     }))
 }
 
-/// When available, make plays that grant momentum.  Otherwise, play randomly.
+/// When available, make plays that grant momentum.
 #[must_use]
-pub fn momentum_player(draw_chance: f64) -> Player {
-    let mut fallback = random_player(draw_chance);
+pub fn momentum_player(mut fallback: Player) -> Player {
     Player(Box::new(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.0(game),
+        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.0(game),
         }
+        fallback.0(game)
     }))
 }
 
@@ -530,7 +528,7 @@ mod tests {
     #[test]
     fn test_game() {
         for num_players in 1..10 {
-            let players: Vec<_> = std::iter::from_fn(|| Some(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();