From 5555c930e2fd9c97614d5e56d4422b9259a1e388 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 13 Dec 2019 15:15:21 +1000
Subject: [PATCH] cooldown fix

---
 core/src/game.rs  | 2 +-
 core/src/skill.rs | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/game.rs b/core/src/game.rs
index 753cd836..152243c0 100644
--- a/core/src/game.rs
+++ b/core/src/game.rs
@@ -590,6 +590,7 @@ impl Game {
 
     fn add_resolution(&mut self, cast: &Cast, event: &Event) -> &mut Game {
         let last = self.resolutions.len() - 1;
+        println!("{:?}", event);
         self.resolutions[last].push(Resolution::new(cast.clone(), event.clone()));
         self
     }
@@ -1227,7 +1228,6 @@ mod tests {
 
         game = game.resolve_phase_start();
 
-        // println!("{:?}", game.player_by_id(x_player.id).unwrap().constructs[0]);
         assert!(game.player_by_id(x_player.id).unwrap().constructs[0].skill_on_cd(Skill::Stun).is_some());
         assert!(game.player_by_id(y_player.id).unwrap().constructs[0].skill_on_cd(Skill::Block).is_none());
     }
diff --git a/core/src/skill.rs b/core/src/skill.rs
index ab2224d7..155b3963 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -48,13 +48,11 @@ impl Cast {
     }
 
     pub fn resolve(self, game: &mut Game) {
-        let mut actions = vec![];
-
         if !self.skill.aoe() {
             if self.skill.cast_animation() {
-                actions.push(Action::Cast);
+                game.action(self, Action::Cast);
             }
-            actions.push(Action::Hit);
+            game.action(self, Action::Hit);
         }
 
         match self.skill {