From 8bb1de7b42d6183df5c5f55cff83bce1bfd8c75b Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 28 May 2019 14:21:05 +1000
Subject: [PATCH] parry

---
 WORKLOG.md          | 5 +++++
 server/src/skill.rs | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index 9387fab2..b779ffc4 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -48,6 +48,11 @@
 
 * strike speed conversion
 
+* disabled skills set before skill phase
+  so client can display
+
+* remove test variants of skills
+
 
 ## SOON
 
diff --git a/server/src/skill.rs b/server/src/skill.rs
index c37cbc5c..7dc1ee7a 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -384,9 +384,11 @@ pub enum Effect {
 impl Effect {
     pub fn immune(&self, skill: Skill) -> bool {
         match self {
-            Effect::Parry =>
-                skill.colours().contains(&Colour::Red) ||
-                [Skill::Attack, Skill::Stun].contains(&skill),
+            Effect::Parry => match skill {
+                Skill::Attack => true,
+                Skill::Stun => true,
+                _ => skill.colours().contains(&Colour::Red)
+            },
             Effect::Banish => true,
             Effect::Clutch => [
                 Skill::Stun,
@@ -608,6 +610,7 @@ impl Skill {
             Skill::Heal => 130, //GG
             Skill::SiphonTick => 40, // GB
             Skill::Slay => 70, // RG
+
             Skill::Strike => 90, //RR
                 Skill::StrikeII => 110,
                 Skill::StrikeIII => 130,