From db8e30dffbfd0953ab365fb93a6db33cd835c8b9 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 5 Dec 2019 14:37:24 +1000
Subject: [PATCH] blast

---
 core/src/skill.rs | 44 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/core/src/skill.rs b/core/src/skill.rs
index 8402ff5b..13f9ab13 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -176,34 +176,23 @@ impl Cast {
                 },
             ],
 
-            // fn bash(source: &mut Construct, target: &mut Construct, skill: Skill) {
-    //     skill.effect().into_iter()
-    //         .for_each(|e| (game.event(Event::new(source, target).event(target.add_effect(skill, e)))));
+            Skill::Blast |
+            Skill::BlastPlus |
+            Skill::BlastPlusPlus => vec![
+                Action::Damage {
+                    construct: self.target,
+                    colour: Colour::Blue,
+                    values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
+                },
+            ],
+
+
+
+
 
-    //     if resolutions.iter().any(|r| match r.event {
-    //         Event::Effect { effect, skill: effect_skill, duration: _, construct_effects: _ }
-    //             => effect == Effect::Stun && skill == effect_skill,
-    //         _ => false,
-    //     }) {
-    //         let mut cds = 0;
-    //         for cs in target.skills.iter_mut() {
-    //             if cs.skill.base_cd().is_some() {
-    //                 cs.cd = match cs.cd {
-    //                     None => Some(1),
-    //                     Some(i) => Some(i + 1),
-    //                 };
 
-    //                 cds += 1;
-    //             }
-    //         }
 
-    //         let amount = source.red_power().pct(skill.multiplier().pct(100 + 45usize.saturating_mul(cds)));
-    //         target.deal_red_damage(skill, amount)
-    //             .into_iter()
-    //             .for_each(|e| game.event(Event::new(source, target).event(e).stages(EventStages::PostOnly)));
-    //     }
 
-    // }
 
             Skill::Strike |
             Skill::StrikePlus |
@@ -1349,13 +1338,6 @@ impl Skill {
 //         .for_each(|e| game.event(Event::new(source, target).event(e).stages(EventStages::PostOnly)));
 // }
 
-// fn blast(source: &mut Construct, target: &mut Construct, skill: Skill) {
-//     let amount = source.blue_power().pct(skill.multiplier());
-//     target.deal_blue_damage(skill, amount)
-//         .into_iter()
-//         .for_each(|e| game.event(Event::new(source, target).event(e)));
-// }
-
 // fn amplify(source: &mut Construct, target: &mut Construct, skill: Skill) {
 //     game.event(Event::new(source, target).event(target.add_effect(skill, skill.effect()[0])));
 // }