From 556557089d978d8f4df703bdfdc9f88ee180e4b7 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 26 Mar 2019 19:05:37 +1100 Subject: [PATCH] alignment --- server/src/vbox.rs | 88 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/server/src/vbox.rs b/server/src/vbox.rs index 329bc972..c324c4c6 100644 --- a/server/src/vbox.rs +++ b/server/src/vbox.rs @@ -329,61 +329,61 @@ 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::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::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::Amplify }, - Combo { units: vec![Var::Buff, Var::Red, Var::Green], var: Var::Clutch }, - // Combo { units: vec![Var::Buff, Var::Green, Var::Blue], var: Var::Heal }, - Combo { units: vec![Var::Buff, Var::Red, Var::Blue], var: Var::Haste }, + 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 }, + Combo { units: vec![Var::Buff, Var::Red, Var::Green], var: Var::Clutch }, + Combo { units: vec![Var::Buff, Var::Green, Var::Blue], var: Var::Amplify }, + Combo { units: vec![Var::Buff, Var::Red, Var::Blue], var: Var::Haste }, - Combo { units: vec![Var::Debuff, Var::Red, Var::Red], var: Var::Snare }, - Combo { units: vec![Var::Debuff, Var::Green, Var::Green], var: Var::Purge }, - Combo { units: vec![Var::Debuff, Var::Blue, Var::Blue], var: Var::Curse }, - Combo { units: vec![Var::Debuff, Var::Red, Var::Green], var: Var::Slow }, - 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::Debuff, Var::Red, Var::Red], var: Var::Snare }, + Combo { units: vec![Var::Debuff, Var::Green, Var::Green], var: Var::Purge }, + Combo { units: vec![Var::Debuff, Var::Blue, Var::Blue], var: Var::Curse }, + Combo { units: vec![Var::Debuff, Var::Red, Var::Green], var: Var::Slow }, + 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::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::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::Green, Var::Blue], var: Var::Silence }, - Combo { units: vec![Var::Stun, Var::Red, Var::Blue], var: Var::Hex }, + 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::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 }, - Combo { units: vec![Var::Damage, Var::Red, Var::Green], var: Var::GRDI }, - Combo { units: vec![Var::Damage, Var::Green, Var::Blue], var: Var::GBDI }, - Combo { units: vec![Var::Damage, Var::Red, Var::Blue], var: Var::RBDI }, + 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 }, + Combo { units: vec![Var::Damage, Var::Red, Var::Green], var: Var::GRDI }, + Combo { units: vec![Var::Damage, Var::Green, Var::Blue], var: Var::GBDI }, + Combo { units: vec![Var::Damage, Var::Red, Var::Blue], var: Var::RBDI }, - Combo { units: vec![Var::Hp, Var::Red, Var::Red], var: Var::RedShieldI }, - Combo { units: vec![Var::Hp, Var::Green, Var::Green], var: Var::LifeI }, - Combo { units: vec![Var::Hp, Var::Blue, Var::Blue], var: Var::BlueShieldI }, - Combo { units: vec![Var::Hp, Var::Red, Var::Green], var: Var::LRSI }, - Combo { units: vec![Var::Hp, Var::Green, Var::Blue], var: Var::LBSI }, - Combo { units: vec![Var::Hp, Var::Red, Var::Blue], var: Var::RBSI }, + Combo { units: vec![Var::Hp, Var::Red, Var::Red], var: Var::RedShieldI }, + Combo { units: vec![Var::Hp, Var::Green, Var::Green], var: Var::LifeI }, + Combo { units: vec![Var::Hp, Var::Blue, Var::Blue], var: Var::BlueShieldI }, + Combo { units: vec![Var::Hp, Var::Red, Var::Green], var: Var::LRSI }, + Combo { units: vec![Var::Hp, Var::Green, Var::Blue], var: Var::LBSI }, + Combo { units: vec![Var::Hp, Var::Red, Var::Blue], var: Var::RBSI }, - Combo { units: vec![Var::Speed, Var::Red, Var::Red], var: Var::RedSpeedI }, - Combo { units: vec![Var::Speed, Var::Green, Var::Green], var: Var::GreenSpeedI }, - Combo { units: vec![Var::Speed, Var::Blue, Var::Blue], var: Var::BlueSpeedI }, - Combo { units: vec![Var::Speed, Var::Red, Var::Green], var: Var::GRSpeedI }, - Combo { units: vec![Var::Speed, Var::Green, Var::Blue], var: Var::GBSpeedI }, - Combo { units: vec![Var::Speed, Var::Red, Var::Blue], var: Var::RBSpeedI }, + Combo { units: vec![Var::Speed, Var::Red, Var::Red], var: Var::RedSpeedI }, + Combo { units: vec![Var::Speed, Var::Green, Var::Green], var: Var::GreenSpeedI }, + Combo { units: vec![Var::Speed, Var::Blue, Var::Blue], var: Var::BlueSpeedI }, + Combo { units: vec![Var::Speed, Var::Red, Var::Green], var: Var::GRSpeedI }, + Combo { units: vec![Var::Speed, Var::Green, Var::Blue], var: Var::GBSpeedI }, + Combo { units: vec![Var::Speed, Var::Red, Var::Blue], var: Var::RBSpeedI }, ];