New command types for select and bombs

1 files changed, 36 insertions, 3 deletions

diff --git a/src/command.rs b/src/command.rs
index 81e3d67..1ffdd35 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -3,20 +3,53 @@ use crate::geometry::Direction;
 use crate::geometry::Point2d;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum Command {
+pub struct Command {
+    pub worm: Option<i32>,
+    pub action: Action
+}
+
+impl fmt::Display for Command {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.worm {
+            Some(worm) => write!(f, "select {};{}", worm, self.action),
+            None => write!(f, "{}", self.action)
+        }
+    }
+}
+
+impl Command {
+    pub fn with_select(worm: i32, action: Action) -> Command {
+        Command {
+            worm: Some(worm),
+            action
+        }
+    }
+
+    pub fn new(action: Action) -> Command {
+        Command {
+            worm: None,
+            action
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub enum Action {
     Move(Point2d<i8>),
     Dig(Point2d<i8>),
     Shoot(Direction),
+    Bomb(Point2d<i8>),
     DoNothing,
 }
 
-impl fmt::Display for Command {
+impl fmt::Display for Action {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use Command::*;
+        use Action::*;
         match self {
             Move(p) => write!(f, "move {} {}", p.x, p.y),
             Dig(p) => write!(f, "dig {} {}", p.x, p.y),
             Shoot(dir) => write!(f, "shoot {}", dir),
+            Bomb(p) => write!(f, "banana {} {}", p.x, p.y),
             DoNothing => write!(f, "nothing"),
         }
     }