From d73e79864680a8e6d57f2f0390058dd4c9186cb7 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 26 Mar 2019 20:37:27 +1100 Subject: [PATCH] few more skills back in --- server/WORKLOG.md | 5 +++-- server/src/skill.rs | 4 ++-- server/src/vbox.rs | 30 +++++++++++++++--------------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/server/WORKLOG.md b/server/WORKLOG.md index b452d6db..258574fc 100644 --- a/server/WORKLOG.md +++ b/server/WORKLOG.md @@ -18,10 +18,11 @@ cryp vbox update defensives in skill.rs -ensure all skills impl - ez Skill::Slay -> red attack with bonus somethingorother for blue / maim no healing +consolidate buffs debuffs and disables + no more red/blue + siphon test make parry semi-aggressive diff --git a/server/src/skill.rs b/server/src/skill.rs index fc0066b9..8b4da010 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -1062,7 +1062,7 @@ fn silence(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Re fn purge(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Resolutions { for (i, ce) in target.effects.clone().iter_mut().enumerate() { - if ce.effect.category() == Category::BlueBuff { + if [Category::BlueBuff, Category::RedBuff].contains(&ce.effect.category()) { target.effects.remove(i); results.push(Resolution::new(source, target).event(Event::Removal { effect: ce.effect })); } @@ -1073,7 +1073,7 @@ fn purge(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Reso fn purify(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Resolutions { for (i, ce) in target.effects.clone().iter_mut().enumerate() { - if ce.effect.category() == Category::BlueDebuff { + if [Category::BlueDebuff, Category::RedDebuff].contains(&ce.effect.category()) { target.effects.remove(i); results.push(Resolution::new(source, target).event(Event::Removal { effect: ce.effect })); } diff --git a/server/src/vbox.rs b/server/src/vbox.rs index c324c4c6..800d536b 100644 --- a/server/src/vbox.rs +++ b/server/src/vbox.rs @@ -329,20 +329,6 @@ struct Combo { fn get_combos() -> Vec { let mut combinations = vec![ - Combo { units: vec![Var::Attack, Var::Red, Var::Red], var: Var::Strike }, - Combo { units: vec![Var::Attack, Var::Green, Var::Green], var: Var::Heal }, - Combo { units: vec![Var::Attack, Var::Blue, Var::Blue], var: Var::Blast }, - // Combo { units: vec![Var::Attack, Var::Red, Var::Green], var: Var::Slay }, - Combo { units: vec![Var::Attack, Var::Green, Var::Blue], var: Var::Decay }, - // Combo { units: vec![Var::Attack, Var::Red, Var::Blue], var: Var::Blast }, - - Combo { units: vec![Var::Block, Var::Red, Var::Red], var: Var::Parry }, - Combo { units: vec![Var::Block, Var::Green, Var::Green], var: Var::Reflect }, - Combo { units: vec![Var::Block, Var::Blue, Var::Blue], var: Var::Corrupt }, - Combo { units: vec![Var::Block, Var::Red, Var::Green], var: Var::Taunt }, - Combo { units: vec![Var::Block, Var::Green, Var::Blue], var: Var::Shield }, - Combo { units: vec![Var::Block, Var::Red, Var::Blue], var: Var::Recharge }, - Combo { units: vec![Var::Buff, Var::Red, Var::Red], var: Var::Empower }, Combo { units: vec![Var::Buff, Var::Green, Var::Green], var: Var::Triage }, Combo { units: vec![Var::Buff, Var::Blue, Var::Blue], var: Var::Hostility }, @@ -357,13 +343,27 @@ fn get_combos() -> Vec { Combo { units: vec![Var::Debuff, Var::Green, Var::Blue], var: Var::Siphon }, Combo { units: vec![Var::Debuff, Var::Red, Var::Blue], var: Var::Invert }, + Combo { units: vec![Var::Block, Var::Red, Var::Red], var: Var::Parry }, + Combo { units: vec![Var::Block, Var::Green, Var::Green], var: Var::Reflect }, + Combo { units: vec![Var::Block, Var::Blue, Var::Blue], var: Var::Corrupt }, + Combo { units: vec![Var::Block, Var::Red, Var::Green], var: Var::Taunt }, + Combo { units: vec![Var::Block, Var::Green, Var::Blue], var: Var::Shield }, + Combo { units: vec![Var::Block, Var::Red, Var::Blue], var: Var::Recharge }, + Combo { units: vec![Var::Stun, Var::Red, Var::Red], var: Var::Strangle }, Combo { units: vec![Var::Stun, Var::Green, Var::Green], var: Var::Throw }, Combo { units: vec![Var::Stun, Var::Blue, Var::Blue], var: Var::Ruin }, - // Combo { units: vec![Var::Stun, Var::Red, Var::Green], var: Var::Strike }, + Combo { units: vec![Var::Stun, Var::Red, Var::Green], var: Var::Banish }, Combo { units: vec![Var::Stun, Var::Green, Var::Blue], var: Var::Silence }, Combo { units: vec![Var::Stun, Var::Red, Var::Blue], var: Var::Hex }, + Combo { units: vec![Var::Attack, Var::Red, Var::Red], var: Var::Strike }, + Combo { units: vec![Var::Attack, Var::Green, Var::Green], var: Var::Heal }, + Combo { units: vec![Var::Attack, Var::Blue, Var::Blue], var: Var::Blast }, + Combo { units: vec![Var::Attack, Var::Red, Var::Green], var: Var::Purify }, + Combo { units: vec![Var::Attack, Var::Green, Var::Blue], var: Var::Decay }, + // Combo { units: vec![Var::Attack, Var::Red, Var::Blue], var: Var::Blast }, + Combo { units: vec![Var::Damage, Var::Red, Var::Red], var: Var::RedDamageI }, Combo { units: vec![Var::Damage, Var::Green, Var::Green], var: Var::GreenDamageI }, Combo { units: vec![Var::Damage, Var::Blue, Var::Blue], var: Var::BlueDamageI },