todo

Cargo.toml

@@ -8,19 +8,19 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-clap = { version = "4.0.4", features = ["derive"] }
-thiserror = "1.0"
+clap = { version = "4.5.21", features = ["derive"] }
+thiserror = "2.0"
 rand = "0.8"
 rand_distr = "0.4.3"
-derive_more = "0.99.17"
-derive-new = "0.6.0"
+derive_more = { version = "1.0", features = ["full"] }
+derive-new = "0.7.0"
 itertools = "0.13"
 strum = { version = "0.26", features = ["derive"] }
 indoc = "2.0"
-regex = "1"
+regex = "1.11.1"
 colored = "2.0.0"
 array-init = "2.0.1"
-ordered-float = "4.2.0"
+ordered-float = "4.5.0"
 lazy-regex = "3.1.0"
 
 [lints.rust]

README.txt

@@ -13,12 +13,4 @@ Usage :
 - linting :
   - clippy : cargo clippy --all-targets --all-features -- -D warnings
 
-Todo :
-- type games : defense, attack, petit hunt, full assets
-- game managing
-    - flag on/off
-    - cut game
-    - random reunion
-- duplicate
-
 70.70% coverage, 772/1092 lines covered

TODO.txt

@@ -0,0 +1,9 @@
+Todo :
+- type games : defense, attack, petit hunt, full assets
+- game managing
+    - flag on/off
+    - cut game
+    - dog one by one
+    - random reunion
+- test games : handles, chelem, etc
+- duplicate mode

src/game.rs

@@ -108,7 +108,7 @@ impl<const MODE: usize> Game<MODE> {
         }
         Ok(())
     }
-    pub fn distribute(&mut self) -> Option<GameDistributed<MODE>> {
+    fn distribute(&mut self) -> Option<GameDistributed<MODE>> {
         let mut players_in_game: [PlayerInGame; MODE] =
             array_init(|i| PlayerInGame::new(self.mode, *self.players[i].options()));
 
@@ -138,7 +138,7 @@ impl<const MODE: usize> Game<MODE> {
     pub fn rotate_at(&mut self, index: usize) {
         self.players.rotate_left(index);
     }
-    pub fn rotate_dealer(&mut self) {
+    fn rotate_dealer(&mut self) {
         if self.dealer == self.players.len() - 1 {
             self.dealer = 0;
         } else {

src/game_distributed.rs

@@ -21,12 +21,6 @@ pub struct GameDistributed<'a, const MODE: usize> {
     players_in_game: [PlayerInGame; MODE],
 }
 
-impl<const MODE: usize> fmt::Display for GameDistributed<'_, MODE> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f, "Game {} with dog {}", self.game.mode(), self.dog)
-    }
-}
-
 impl<'a, const MODE: usize> GameDistributed<'a, MODE> {
     pub fn game(&mut self) -> &mut Game<MODE> {
         self.game
@@ -167,3 +161,9 @@ impl<'a, const MODE: usize> GameDistributed<'a, MODE> {
         Ok(Some(game_started))
     }
 }
+
+impl<const MODE: usize> fmt::Display for GameDistributed<'_, MODE> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        writeln!(f, "Game {} with dog {}", self.game.mode(), self.dog)
+    }
+}

src/game_started.rs

@@ -6,7 +6,6 @@ use crate::constants::{BASE_CONTRACT_POINTS, MAX_CARDS};
 use crate::contract::Contract;
 use crate::errors::TarotErrorKind;
 use crate::game_distributed::GameDistributed;
-// use crate::helpers::wait_input;
 use crate::mode::Mode;
 use crate::options::Options;
 use crate::player::Player;
@@ -48,11 +47,11 @@ impl<const MODE: usize> fmt::Display for GameStarted<'_, MODE> {
     }
 }
 
-impl<'a, const MODE: usize> GameStarted<'a, MODE> {
+impl<const MODE: usize> GameStarted<'_, MODE> {
     pub fn is_consistent(&mut self) -> Result<(), TarotErrorKind> {
         self.game_distributed.game().is_consistent()
     }
-    pub fn finished(&mut self) -> bool {
+    pub fn finished(&self) -> bool {
         self.game_distributed.finished()
     }
     pub fn mode(&mut self) -> &Mode {
@@ -416,5 +415,12 @@ impl<'a, const MODE: usize> GameStarted<'a, MODE> {
     }
 }
 
-// #[test]
-// fn game_started_tests() {}
+#[test]
+fn game_started_tests() {
+    use crate::game::Game;
+
+    let options = Options::default();
+    let _game = Game::<{ Mode::Four.players() }>::new(options);
+
+    // let game_distributed = GameDistributed::new(game, options, )
+}

src/options.rs

@@ -1,4 +1,4 @@
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Default)]
 pub struct Options {
     pub random: bool,
     pub auto: bool,

src/player_in_game.rs

@@ -197,7 +197,7 @@ impl PlayerInGame {
         Ok(self.hand.remove(final_choice))
     }
     pub fn choose_contract_among(
-        &mut self,
+        &self,
         player: &Player,
         contracts: &[Contract],
     ) -> Option<Contract> {