Hanabi/hanabi.rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

turn result, turn history

Browse source
This commit is contained in:
Jeff Wu 2016-03-17 23:58:10 -07:00
parent e371e2f112
commit e01d93a055
2 changed files with 80 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/game.rs
View file

@ -173,7 +173,7 @@ impl fmt::Display for Discard {
} }
} }
#[derive(Debug)] #[derive(Debug,Clone)]
pub enum Hinted { pub enum Hinted {
Color(Color), Color(Color),
Value(Value), Value(Value),
@ -187,24 +187,34 @@ impl fmt::Display for Hinted {
} }
} }
#[derive(Debug)] #[derive(Debug,Clone)]
pub struct Hint { pub struct Hint {
pub player: Player, pub player: Player,
pub hinted: Hinted, pub hinted: Hinted,
} }
// represents the choice a player made in a given turn // represents the choice a player made in a given turn
#[derive(Debug)] #[derive(Debug,Clone)]
pub enum TurnChoice { pub enum TurnChoice {
Hint(Hint), Hint(Hint),
Discard(usize), Discard(usize),
Play(usize), Play(usize),
} }
// represents what happened in a turn
#[derive(Debug,Clone)]
pub enum TurnResult {
Hint(Vec<usize>),
Discard(Card),
Play(Card, bool),
}
// represents a turn taken in the game // represents a turn taken in the game
pub struct Turn<'a> { #[derive(Debug)]
pub player: &'a Player, pub struct Turn {
pub choice: &'a TurnChoice, pub player: Player,
pub choice: TurnChoice,
pub result: TurnResult,
} }
// represents possible settings for the game // represents possible settings for the game
@ -262,7 +272,8 @@ impl PlayerState {
self.info.push(CardInfo::new()); self.info.push(CardInfo::new());
} }
pub fn reveal(&mut self, hinted: &Hinted) { pub fn reveal(&mut self, hinted: &Hinted) -> Vec<usize> {
let mut indices = Vec::new();
match hinted { match hinted {
&Hinted::Color(ref color) => { &Hinted::Color(ref color) => {
let mut i = 0; let mut i = 0;
@ -271,6 +282,7 @@ impl PlayerState {
color, color,
card.color == *color card.color == *color
); );
indices.push(i);
i += 1; i += 1;
} }
} }
@ -281,11 +293,13 @@ impl PlayerState {
value, value,
card.value == *value card.value == *value
); );
indices.push(i);
i += 1; i += 1;
} }
} }
} }
indices
} }
} }
@ -327,8 +341,7 @@ pub struct BoardState {
pub hints_remaining: u32, pub hints_remaining: u32,
pub lives_total: u32, pub lives_total: u32,
pub lives_remaining: u32, pub lives_remaining: u32,
// TODO: pub turn_history: Vec<Turn>,
// pub turn_history: Vec<TurnChoice>,
// only relevant when deck runs out // only relevant when deck runs out
pub deckless_turns_remaining: u32, pub deckless_turns_remaining: u32,
} }
@ -351,6 +364,7 @@ impl BoardState {
hints_remaining: opts.num_hints, hints_remaining: opts.num_hints,
lives_total: opts.num_lives, lives_total: opts.num_lives,
lives_remaining: opts.num_lives, lives_remaining: opts.num_lives,
turn_history: Vec::new(),
// number of turns to play with deck length ran out // number of turns to play with deck length ran out
deckless_turns_remaining: opts.num_players + 1, deckless_turns_remaining: opts.num_players + 1,
} }
@ -635,10 +649,11 @@ impl GameState {
} }
} }
pub fn process_choice(&mut self, choice: &TurnChoice) { pub fn process_choice(&mut self, choice: TurnChoice) -> TurnResult {
debug!("Player {}'s move", self.board.player); debug!("Player {}'s move", self.board.player);
let turn_result = {
match choice { match choice {
&TurnChoice::Hint(ref hint) => { TurnChoice::Hint(ref hint) => {
assert!(self.board.hints_remaining > 0, assert!(self.board.hints_remaining > 0,
"Tried to hint with no hints remaining"); "Tried to hint with no hints remaining");
self.board.hints_remaining -= 1; self.board.hints_remaining -= 1;
@ -648,47 +663,53 @@ impl GameState {
format!("Player {} gave a hint to himself", hint.player)); format!("Player {} gave a hint to himself", hint.player));
let ref mut state = self.player_states.get_mut(&hint.player).unwrap(); let ref mut state = self.player_states.get_mut(&hint.player).unwrap();
state.reveal(&hint.hinted); let indices = state.reveal(&hint.hinted);
TurnResult::Hint(indices)
} }
&TurnChoice::Discard(index) => { TurnChoice::Discard(index) => {
let card = self.take_from_hand(index); let card = self.take_from_hand(index);
debug!("Discard card in position {}, which is {}", index, card); debug!("Discard card in position {}, which is {}", index, card);
self.board.discard.place(card); self.board.discard.place(card.clone());
self.board.try_add_hint(); self.board.try_add_hint();
TurnResult::Discard(card)
} }
&TurnChoice::Play(index) => { TurnChoice::Play(index) => {
let card = self.take_from_hand(index); let card = self.take_from_hand(index);
debug!( debug!(
"Playing card at position {}, which is {}", "Playing card at position {}, which is {}",
index, card index, card
); );
let playable = self.board.is_playable(&card);
if self.board.is_playable(&card) { if playable {
let finished = { {
let firework = self.board.get_firework_mut(&card.color); let firework = self.board.get_firework_mut(&card.color);
debug!("Successfully played {}!", card); debug!("Successfully played {}!", card);
let finished = card.value == FINAL_VALUE; firework.place(card.clone());
if finished {
debug!("Firework complete for {}!", card.color);
} }
firework.place(card); if card.value == FINAL_VALUE {
finished debug!("Firework complete for {}!", card.color);
};
if finished {
self.board.try_add_hint(); self.board.try_add_hint();
} }
} else { } else {
self.board.discard.place(card); self.board.discard.place(card.clone());
self.board.lives_remaining -= 1; self.board.lives_remaining -= 1;
debug!( debug!(
"Removing a life! Lives remaining: {}", "Removing a life! Lives remaining: {}",
self.board.lives_remaining self.board.lives_remaining
); );
} }
TurnResult::Play(card, playable)
} }
} }
};
let turn = Turn {
player: self.board.player.clone(),
result: turn_result.clone(),
choice: choice,
};
self.board.turn_history.push(turn);
self.replenish_hand(); self.replenish_hand();
@ -702,5 +723,6 @@ impl GameState {
}; };
assert_eq!((self.board.turn - 1) % self.board.num_players, self.board.player); assert_eq!((self.board.turn - 1) % self.board.num_players, self.board.player);
turn_result
} }
} }

9
src/simulator.rs
View file

@ -50,11 +50,12 @@ pub fn simulate_once(
strategy.decide(&game.get_view(player)) strategy.decide(&game.get_view(player))
}; };
game.process_choice(&choice); let turn_result = game.process_choice(choice.clone());
let turn = Turn { let turn = Turn {
player: &player, player: player,
choice: &choice, choice: choice,
result: turn_result,
}; };
for player in game.get_players() { for player in game.get_players() {
@ -62,7 +63,6 @@ pub fn simulate_once(
strategy.update(&turn, &game.get_view(player)); strategy.update(&turn, &game.get_view(player));
} }
// TODO: do some stuff
debug!("State:\n{}", game); debug!("State:\n{}", game);
} }
let score = game.score(); let score = game.score();
@ -117,7 +117,6 @@ impl fmt::Display for Histogram {
} }
} }
// TODO: multithreaded
pub fn simulate<T>( pub fn simulate<T>(
opts: &GameOptions, opts: &GameOptions,
strat_config: &T, strat_config: &T,