This commit is contained in:
ntr 2019-05-28 14:21:05 +10:00
parent 6057d26774
commit 8bb1de7b42
2 changed files with 11 additions and 3 deletions

View File

@ -48,6 +48,11 @@
* strike speed conversion * strike speed conversion
* disabled skills set before skill phase
so client can display
* remove test variants of skills
## SOON ## SOON

View File

@ -384,9 +384,11 @@ pub enum Effect {
impl Effect { impl Effect {
pub fn immune(&self, skill: Skill) -> bool { pub fn immune(&self, skill: Skill) -> bool {
match self { match self {
Effect::Parry => Effect::Parry => match skill {
skill.colours().contains(&Colour::Red) || Skill::Attack => true,
[Skill::Attack, Skill::Stun].contains(&skill), Skill::Stun => true,
_ => skill.colours().contains(&Colour::Red)
},
Effect::Banish => true, Effect::Banish => true,
Effect::Clutch => [ Effect::Clutch => [
Skill::Stun, Skill::Stun,
@ -608,6 +610,7 @@ impl Skill {
Skill::Heal => 130, //GG Skill::Heal => 130, //GG
Skill::SiphonTick => 40, // GB Skill::SiphonTick => 40, // GB
Skill::Slay => 70, // RG Skill::Slay => 70, // RG
Skill::Strike => 90, //RR Skill::Strike => 90, //RR
Skill::StrikeII => 110, Skill::StrikeII => 110,
Skill::StrikeIII => 130, Skill::StrikeIII => 130,