diff --git a/client_cli/src/game_runner.rs b/client_cli/src/game_runner.rs index 9944918..42c836f 100644 --- a/client_cli/src/game_runner.rs +++ b/client_cli/src/game_runner.rs @@ -58,17 +58,12 @@ impl GameRunner { } pub fn handle_event(&mut self, event: &GameEvent) -> Option { - if event == &GameEvent::PlayError { + if !self.state.validate(event) { + println!("event not valid : {:?}", event); return None; } - let valid_event = if self.state.validate(event) { - self.state.consume(event); - event - } else { - println!("{}", self.state); - println!("event not valid : {:?}", event); - &GameEvent::PlayError - }; + // println!("consuming {:?}", event); + self.state.consume(event); // chain all successive bot actions if self.bots.is_empty() { @@ -79,7 +74,7 @@ impl GameRunner { let bot_events: Vec = self .bots .iter_mut() - .filter_map(|bot| bot.handle_event(valid_event)) + .filter_map(|bot| bot.handle_event(event)) .collect(); // if bot_events.len() > 1 { diff --git a/store/python/test.py b/store/python/test.py index 2157e69..f300392 100644 --- a/store/python/test.py +++ b/store/python/test.py @@ -1,7 +1,6 @@ -import store -# import trictrac +import trictrac -game = store.TricTrac() +game = trictrac.TricTrac() print(game.get_state()) # "Initial state" moves = game.get_available_moves() diff --git a/store/python/trictracEnv.py b/store/python/trictracEnv.py index f4524b2..4e40e33 100644 --- a/store/python/trictracEnv.py +++ b/store/python/trictracEnv.py @@ -1,8 +1,7 @@ import gymnasium as gym import numpy as np from gymnasium import spaces -# import trictrac # module Rust exposé via PyO3 -import store # module Rust exposé via PyO3 +import trictrac # module Rust exposé via PyO3 from typing import Dict, List, Tuple, Optional, Any, Union class TricTracEnv(gym.Env): @@ -14,7 +13,7 @@ class TricTracEnv(gym.Env): super(TricTracEnv, self).__init__() # Instancier le jeu - self.game = store.TricTrac() + self.game = trictrac.TricTrac() # Stratégie de l'adversaire self.opponent_strategy = opponent_strategy diff --git a/store/src/game.rs b/store/src/game.rs index 65a23e3..0c42e1a 100644 --- a/store/src/game.rs +++ b/store/src/game.rs @@ -331,9 +331,6 @@ impl GameState { return false; } } - PlayError => { - return true; - } } // We couldn't find anything wrong with the event so it must be good @@ -482,7 +479,6 @@ impl GameState { TurnStage::RollDice }; } - PlayError => {} } self.history.push(valid_event.clone()); } @@ -624,7 +620,6 @@ pub enum GameEvent { player_id: PlayerId, moves: (CheckerMove, CheckerMove), }, - PlayError, } impl GameEvent {