Refactor momentum_player() for clarity

[pluta-lesnura] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 8f7949a57de7ea2cb4e343c4b4b7c997d36fec53..c46aa7dcf18eeca8ec17f76e0732a3dd24db828a 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -444,15 +444,14 @@ pub fn random_player(draw_chance: f64) -> Player {
 #[must_use]
 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)
     }))
 }
 
@@ -529,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();