From b4a52576d208f99119c15a56a06a509f1bb77f64 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 6 Nov 2019 17:08:31 +1000
Subject: [PATCH] hastestrike / hybridblast + triggers (Attack no longer
 triggers)

---
 server/src/skill.rs | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/server/src/skill.rs b/server/src/skill.rs
index 790bebb8..18afda7b 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -89,10 +89,15 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
 
     if source.affected(Effect::Haste) {
         match skill {
-            Skill::Attack |
-            Skill::Slay|
-            Skill::Chaos|
-            Skill::Strike=> {
+            Skill::Slay |
+            Skill::SlayPlus |
+            Skill::SlayPlusPlus |
+            Skill::Chaos |
+            Skill::ChaosPlus |
+            Skill::ChaosPlusPlus |
+            Skill::Strike |
+            Skill::StrikePlus |
+            Skill::StrikePlusPlus => {
                 let amount = source.speed().pct(Skill::HasteStrike.multiplier());
                 target.deal_red_damage(Skill::HasteStrike, amount)
                 .into_iter()
@@ -105,8 +110,14 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
     if source.affected(Effect::Hybrid) {
         match skill {
             Skill::Blast|
-            Skill::Chaos|
-            Skill::Siphon=> {
+            Skill::BlastPlus |
+            Skill::BlastPlusPlus |
+            Skill::Chaos |
+            Skill::ChaosPlus |
+            Skill::ChaosPlusPlus |
+            Skill::Siphon |
+            Skill::SiphonPlus |
+            Skill::SiphonPlusPlus => {
                 let amount = source.green_power().pct(Skill::HybridBlast.multiplier());
                 target.deal_blue_damage(Skill::HybridBlast, amount)
                 .into_iter()