win_cards_amount_number + task that could be implemented in win_cards_amount_color

Author: remigerme

src/task.rs

@@ -23,6 +23,7 @@ pub mod dont_win_cards;
 pub mod dont_win_tricks;
 pub mod win_cards;
 pub mod win_cards_amount_color;
+pub mod win_cards_amount_number;
 pub mod win_nb_tricks;
 pub mod win_nb_tricks_compared_captain;
 pub mod win_trick_with;

src/task/README.md

@@ -62,7 +62,7 @@ Thank you for your help!
 
 ## Checklist
 
-**Status: 73/96.**
+**Status: 82/96.**
 
 From [BGG forum](https://boardgamegeek.com/thread/2631311/all-the-mission-cards):
 
@@ -150,18 +150,19 @@ From [BGG forum](https://boardgamegeek.com/thread/2631311/all-the-mission-cards)
   - [x] (3/4/4) Win exactly two blue cards.
   - [x] (3/3/4) Win exactly one pink card.
   - [x] (2/3/4) Win at least one card of each colour (excluding submarines)
+  - [x] (3/3/3) Win exactly one submarine (deal new cards if someone has all submarines in hand)
   - [x] (3/3/4) Win exactly two submarines (deal new cards if someone has submarines no. 2,3,4 in hand)
   - [x] (3/4/4) Win exactly three submarines (deal new cards if someone has all submarines in hand)
+- done in [`TaskWinCardsAmountNumber`]
+  - [x] (3/4/5) Win at least three 5s.
+  - [x] (3/4/5) Win at least three 9s.
+  - [x] (2/2/2) Win at least two 7s.
+  - [x] (3/4/4) Win exactly three 6s
+  - [x] (2/3/3) Win exactly two 9s
 - [ ] (2/3/3) Win more tricks than everyone else
 - [ ] (3/4/5) Win more tricks than everyone else together
 - [ ] (2/2/3) Win fewer tricks than everyone else
-- [ ] (3/4/5) Win at least three 5s.
-- [ ] (3/4/5) Win at least three 9s.
-- [ ] (2/2/2) Win at least two 7s.
-- [ ] (3/4/4) Win exactly three 6s
-- [ ] (2/3/3) Win exactly two 9s
 - [ ] (3/4/5) Win all cards of at least one colour (excluding submarines)
-- [ ] (3/3/3) Win exactly one submarine (deal new cards if someone has all submarines in hand)
 - [ ] (3/3/3) Win the 1 submarine and no other (deal new cards if someone has submarines no. 1 and 4 or 1,2,3 in hand)
 - [ ] (3/3/3) Win the 2 submarine and no other (deal new cards if someone has submarines no. 2 and 4 or 1,2,3 in hand)
 - [ ] (3/2/2) Do not win two consecutive tricks.

src/task/win_cards_amount_color.rs

@@ -60,6 +60,11 @@ impl TaskWinCardsAmountColor {
         Self::new(false, constraints)
     }
 
+    pub fn new_exactly_1_submarine() -> Self {
+        let constraints = HashMap::from([(Card::Submarine as fn(usize) -> Card, 1)]);
+        Self::new(true, constraints)
+    }
+
     pub fn new_exactly_2_submarines() -> Self {
         let constraints = HashMap::from([(Card::Submarine as fn(usize) -> Card, 2)]);
         Self::new(true, constraints)

src/task/win_cards_amount_number.rs

@@ -0,0 +1,92 @@
+use std::collections::HashMap;
+
+use crate::{
+    task::{Task, TaskStatus},
+    trick::Trick,
+};
+
+#[derive(Debug)]
+pub struct TaskWinCardsAmountNumber {
+    constraints: HashMap<usize, usize>,
+    exactly: bool,
+}
+
+fn count_won_except_submarine(tricks: &[Trick], value: usize) -> usize {
+    tricks.iter().fold(0, |acc, trick| {
+        acc + trick
+            .iter()
+            .filter(|c| c.val() == value && !c.is_submarine())
+            .count()
+    })
+}
+
+impl TaskWinCardsAmountNumber {
+    pub fn new(exactly: bool, constraints: HashMap<usize, usize>) -> Self {
+        Self {
+            exactly,
+            constraints,
+        }
+    }
+
+    pub fn new_at_least_three_5s() -> Self {
+        let constraints = HashMap::from([(5, 3)]);
+        Self::new(false, constraints)
+    }
+
+    pub fn new_at_least_three_9s() -> Self {
+        let constraints = HashMap::from([(9, 3)]);
+        Self::new(false, constraints)
+    }
+
+    pub fn new_at_least_two_7s() -> Self {
+        let constraints = HashMap::from([(7, 2)]);
+        Self::new(false, constraints)
+    }
+
+    pub fn new_exactly_three_6s() -> Self {
+        let constraints = HashMap::from([(6, 3)]);
+        Self::new(true, constraints)
+    }
+
+    pub fn new_exactly_two_9s() -> Self {
+        let constraints = HashMap::from([(9, 2)]);
+        Self::new(true, constraints)
+    }
+}
+
+impl Task for TaskWinCardsAmountNumber {
+    fn eval(&self, state: &crate::state::State, ip: usize) -> super::TaskStatus {
+        let mut done = true;
+        for (&value, &amount) in &self.constraints {
+            let won_by_ip = count_won_except_submarine(state.get_player(ip).get_tricks(), value);
+
+            if self.exactly && won_by_ip > amount {
+                return TaskStatus::Failed;
+            }
+
+            if !self.exactly && won_by_ip >= amount {
+                continue;
+            }
+
+            let missing = amount - won_by_ip;
+            let mut won_by_others = 0;
+            for i in 0..state.n_players() {
+                if i != ip {
+                    won_by_others +=
+                        count_won_except_submarine(state.get_player(i).get_tricks(), value);
+                }
+            }
+            let available = 4 - (won_by_ip + won_by_others);
+            if available < missing {
+                return TaskStatus::Failed;
+            }
+            done &= (self.exactly && available == 0) || (!self.exactly && won_by_ip >= amount);
+        }
+
+        if done {
+            return TaskStatus::Done;
+        }
+
+        TaskStatus::Unknown
+    }
+}