ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

few more skills back in

Browse Source
This commit is contained in:
ntr 2019-03-26 20:37:27 +11:00
parent 5f3b4d9354
commit d73e798646
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/WORKLOG.md
View File

@ -18,10 +18,11 @@
cryp vbox cryp vbox
update defensives in skill.rs update defensives in skill.rs
ensure all skills impl
ez
Skill::Slay -> red attack with bonus somethingorother for blue / maim no healing Skill::Slay -> red attack with bonus somethingorother for blue / maim no healing
consolidate buffs debuffs and disables
no more red/blue
siphon test siphon test
make parry semi-aggressive make parry semi-aggressive

4
server/src/skill.rs
View File

@ -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 { fn purge(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Resolutions {
for (i, ce) in target.effects.clone().iter_mut().enumerate() { 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); target.effects.remove(i);
results.push(Resolution::new(source, target).event(Event::Removal { effect: ce.effect })); 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 { fn purify(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Resolutions {
for (i, ce) in target.effects.clone().iter_mut().enumerate() { 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); target.effects.remove(i);
results.push(Resolution::new(source, target).event(Event::Removal { effect: ce.effect })); results.push(Resolution::new(source, target).event(Event::Removal { effect: ce.effect }));
} }

30
server/src/vbox.rs
View File

@ -329,20 +329,6 @@ struct Combo {
fn get_combos() -> Vec<Combo> { fn get_combos() -> Vec<Combo> {
let mut combinations = 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::Red, Var::Red], var: Var::Empower },
Combo { units: vec![Var::Buff, Var::Green, Var::Green], var: Var::Triage }, 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::Blue, Var::Blue], var: Var::Hostility },
@ -357,13 +343,27 @@ fn get_combos() -> Vec<Combo> {
Combo { units: vec![Var::Debuff, Var::Green, Var::Blue], var: Var::Siphon }, 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::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::Red, Var::Red], var: Var::Strangle },
Combo { units: vec![Var::Stun, Var::Green, Var::Green], var: Var::Throw }, 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::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::Green, Var::Blue], var: Var::Silence },
Combo { units: vec![Var::Stun, Var::Red, Var::Blue], var: Var::Hex }, 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::Red, Var::Red], var: Var::RedDamageI },
Combo { units: vec![Var::Damage, Var::Green, Var::Green], var: Var::GreenDamageI }, 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::Blue, Var::Blue], var: Var::BlueDamageI },