From: Scott Worley Date: Tue, 18 Jul 2023 19:35:54 +0000 (-0700) Subject: players are Players X-Git-Url: http://git.scottworley.com/pluta-lesnura/commitdiff_plain/9cf05d1abb3f9641d4a35b70f4738e339861490c?ds=sidebyside players are Players --- diff --git a/src/lib.rs b/src/lib.rs index 444b3fe..1ee5f0b 100644 --- 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,24 @@ 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 { +#[must_use] +pub fn momentum_player(draw_chance: f64) -> Player { let mut fallback = random_player(draw_chance); - move |game: &Game| -> Play { + 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(game), + _ => fallback.0(game), } } - _ => fallback(game), + _ => fallback.0(game), } - } + })) } /// # Errors @@ -528,7 +530,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(random_player(0.5))) .take(num_players) .collect(); let mut game = Game::default(); diff --git a/src/main.rs b/src/main.rs index b2924ee..c7d5533 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use clap::{Parser, Subcommand, ValueEnum}; -use pluta_lesnura::{momentum_player, play, random_player, Game, Player}; +use pluta_lesnura::{momentum_player, play, random_player, Game}; #[derive(Parser)] #[command(author, version, about, long_about = None, arg_required_else_help = true)] @@ -44,8 +44,8 @@ fn main() -> Result<(), &'static str> { strategy, }) => { let player = || match strategy { - Strategy::Random => Player::new(random_player(*draw_chance)), - Strategy::Momentum => Player::new(momentum_player(*draw_chance)), + Strategy::Random => random_player(*draw_chance), + Strategy::Momentum => momentum_player(*draw_chance), }; for _ in 0..*num_games { let players: Vec<_> = std::iter::from_fn(|| Some(player()))