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

firework cloneable (and more compact)

Browse source
This commit is contained in:
Jeff Wu 2016-03-18 02:01:47 -07:00
parent c9602d1948
commit 964602d03d
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/game.rs
View file

@ -52,38 +52,29 @@ pub type CardsInfo = Vec<CardInfo>;
#[derive(Debug)] #[derive(Debug)]
pub struct Firework { pub struct Firework {
pub color: Color, pub color: Color,
pub cards: Cards, top: Value,
} }
impl Firework { impl Firework {
fn new(color: Color) -> Firework { fn new(color: Color) -> Firework {
let mut cards = Cards::new();
// have a 0, so it's easier to implement
let card = Card::new(color, 0);
cards.push(card);
Firework { Firework {
color: color, color: color,
cards: cards, top: 0,
} }
} }
fn top_value(&self) -> Value {
self.cards.last().unwrap().value
}
fn desired_value(&self) -> Option<Value> { fn desired_value(&self) -> Option<Value> {
if self.complete() { None } else { Some(self.top_value() + 1) } if self.complete() { None } else { Some(self.top + 1) }
} }
fn score(&self) -> usize { fn score(&self) -> usize {
// subtract one to account for the 0 we pushed (self.top as usize)
self.cards.len() - 1
} }
fn complete(&self) -> bool { fn complete(&self) -> bool {
self.top_value() == FINAL_VALUE self.top == FINAL_VALUE
} }
fn place(&mut self, card: Card) { fn place(&mut self, card: &Card) {
assert!( assert!(
card.color == self.color, card.color == self.color,
"Attempted to place card on firework of wrong color!" "Attempted to place card on firework of wrong color!"
@ -93,7 +84,7 @@ impl Firework {
"Attempted to place card of wrong value on firework!" "Attempted to place card of wrong value on firework!"
); );
self.cards.push(card); self.top = card.value;
} }
} }
impl fmt::Display for Firework { impl fmt::Display for Firework {
@ -101,7 +92,7 @@ impl fmt::Display for Firework {
if self.complete() { if self.complete() {
write!(f, "{} firework complete!", self.color) write!(f, "{} firework complete!", self.color)
} else { } else {
write!(f, "{} firework at {}", self.color, self.top_value()) write!(f, "{} firework at {}", self.color, self.top)
} }
} }
} }
@ -686,7 +677,7 @@ impl GameState {
{ {
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);
firework.place(card.clone()); firework.place(&card);
} }
if card.value == FINAL_VALUE { if card.value == FINAL_VALUE {
debug!("Firework complete for {}!", card.color); debug!("Firework complete for {}!", card.color);