From 964602d03d0d7bc47e29c0925d2ac0e0cd3feef8 Mon Sep 17 00:00:00 2001
From: Jeff Wu <wuthefwasthat@gmail.com>
Date: Fri, 18 Mar 2016 02:01:47 -0700
Subject: [PATCH] firework cloneable (and more compact)

---
 src/game.rs | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index 2de36dd..fc09fb3 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -52,38 +52,29 @@ pub type CardsInfo = Vec<CardInfo>;
 #[derive(Debug)]
 pub struct Firework {
     pub color: Color,
-    pub cards: Cards,
+    top: Value,
 }
 impl 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 {
             color: color,
-            cards: cards,
+            top: 0,
         }
     }
 
-    fn top_value(&self) -> Value {
-        self.cards.last().unwrap().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 {
-        // subtract one to account for the 0 we pushed
-        self.cards.len() - 1
+        (self.top as usize)
     }
 
     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!(
             card.color == self.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!"
         );
 
-        self.cards.push(card);
+        self.top = card.value;
     }
 }
 impl fmt::Display for Firework {
@@ -101,7 +92,7 @@ impl fmt::Display for Firework {
         if self.complete() {
             write!(f, "{} firework complete!", self.color)
         } 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);
                             debug!("Successfully played {}!", card);
-                            firework.place(card.clone());
+                            firework.place(&card);
                         }
                         if card.value == FINAL_VALUE {
                             debug!("Firework complete for {}!", card.color);