summaryrefslogtreecommitdiff
path: root/src/strategy/minimax.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/strategy/minimax.rs')
-rw-r--r--src/strategy/minimax.rs14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/strategy/minimax.rs b/src/strategy/minimax.rs
index 8a45750..4b10014 100644
--- a/src/strategy/minimax.rs
+++ b/src/strategy/minimax.rs
@@ -283,7 +283,8 @@ fn pruned_moves(state: &GameBoard, player_index: usize) -> Vec<Command> {
let my_starting_health = state.players[player_index].health();
let opponent_starting_health = state.players[opponent_index].health();
- valid_moves(state, player_index)
+ state
+ .valid_moves(player_index)
.into_iter()
.filter(|command| {
//NB: These rules should pass for doing nothing, otherwise
@@ -300,14 +301,3 @@ fn pruned_moves(state: &GameBoard, player_index: usize) -> Vec<Command> {
})
.collect()
}
-
-fn valid_moves(state: &GameBoard, player_index: usize) -> Vec<Command> {
- state
- .valid_shoot_commands(player_index)
- .iter()
- .chain(state.valid_move_commands(player_index).iter())
- .chain(state.valid_bomb_commands(player_index).iter())
- .chain([Command::new(Action::DoNothing)].iter())
- .cloned()
- .collect()
-}