From 94f07153dc39bbfd9f017fa007c4239633a22435 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 9 Apr 2019 16:12:17 +1000 Subject: [PATCH] life name changes server --- client/src/components/constants.jsx | 12 ++++----- server/src/cryp.rs | 2 +- server/src/spec.rs | 28 ++++++++++---------- server/src/vbox.rs | 40 ++++++++++++----------------- 4 files changed, 38 insertions(+), 44 deletions(-) diff --git a/client/src/components/constants.jsx b/client/src/components/constants.jsx index b14c81db..655a5c05 100644 --- a/client/src/components/constants.jsx +++ b/client/src/components/constants.jsx @@ -121,7 +121,7 @@ module.exports = { colours: '2 Blue', }, - Life: { + Shield: { description: 'grants immunity to magical skills to target cryp', colours: '1 Green 1 Blue', }, @@ -236,31 +236,31 @@ module.exports = { }, RedLifeI: { - description: 'Increased red Life', + description: 'Increased red shield', colours: ['red'], thresholds: [5, 10, 20], }, BlueLifeI: { - description: 'Increased blue Life', + description: 'Increased blue shield', colours: ['blue'], thresholds: [5, 10, 20], }, LRSI: { - description: 'Increased life and red Life', + description: 'Increased life and red shield', colours: ['green', 'red'], thresholds: [2, 5, 10], }, LBSI: { - description: 'Increased life and blue Life', + description: 'Increased life and blue shield', colours: ['green', 'blue'], thresholds: [2, 5, 10], }, RBSI: { - description: 'Increased red and blue Life', + description: 'Increased red and blue shield', colours: ['red', 'blue'], thresholds: [2, 5, 10], }, diff --git a/server/src/cryp.rs b/server/src/cryp.rs index 807be4c8..db2de73e 100644 --- a/server/src/cryp.rs +++ b/server/src/cryp.rs @@ -814,7 +814,7 @@ mod tests { .named(&"redboi".to_string()); cryp.learn_mut(Skill::Strike); - cryp.spec_add(Spec::LifeI).unwrap(); + cryp.spec_add(Spec::GreenLifeI).unwrap(); cryp.spec_add(Spec::RedDamageI).unwrap(); cryp.spec_add(Spec::RedDamageI).unwrap(); cryp.spec_add(Spec::BlueLifeI).unwrap(); diff --git a/server/src/spec.rs b/server/src/spec.rs index c6713059..38f8c660 100644 --- a/server/src/spec.rs +++ b/server/src/spec.rs @@ -11,8 +11,8 @@ pub enum Spec { RBSpeedI, // Pure redLife has to come first as it applies the base amount // that is multiplied - GreenLife, - LifeI, + Life, + GreenLifeI, RedLifeI, BlueLifeI, LRSI, @@ -57,10 +57,10 @@ impl Spec { Spec::GBSpeedI => vec![Stat::Speed], Spec::RBSpeedI => vec![Stat::Speed], - Spec::GreenLife => vec![Stat::GreenLife], - Spec::RedLifeI => vec![Stat::RedLife], - Spec::BlueLifeI => vec![Stat::BlueLife], - Spec::LifeI => vec![Stat::GreenLife], + Spec::Life => vec![Stat::GreenLife], + Spec::RedLifeI => vec![Stat::RedLife], + Spec::BlueLifeI => vec![Stat::BlueLife], + Spec::GreenLifeI => vec![Stat::GreenLife], Spec::LRSI => vec![Stat::GreenLife, Stat::RedLife], Spec::LBSI => vec![Stat::GreenLife, Stat::BlueLife], Spec::RBSI => vec![Stat::BlueLife, Stat::RedLife], @@ -160,12 +160,12 @@ impl Spec { }, // Upgrades to HP Spec - Spec::GreenLife => modified + base.pct(5), - Spec::LifeI => modified + { + Spec::Life => modified + base.pct(5), + Spec::GreenLifeI => modified + { let mut mult: u64 = 15; - if team_colours.red >= 5 { mult += 25 }; - if team_colours.red >= 10 { mult += 50 }; - if team_colours.red >= 20 { mult += 75 }; + if team_colours.green >= 5 { mult += 25 }; + if team_colours.green >= 10 { mult += 50 }; + if team_colours.green >= 20 { mult += 75 }; mult * team_colours.green as u64 }, Spec::RedLifeI => modified + { @@ -177,9 +177,9 @@ impl Spec { }, Spec::BlueLifeI => modified + { let mut mult: u64 = 15; - if team_colours.red >= 5 { mult += 25 }; - if team_colours.red >= 10 { mult += 50 }; - if team_colours.red >= 20 { mult += 75 }; + if team_colours.blue >= 5 { mult += 25 }; + if team_colours.blue >= 10 { mult += 50 }; + if team_colours.blue >= 20 { mult += 75 }; mult * team_colours.blue as u64 }, Spec::LRSI => modified + { diff --git a/server/src/vbox.rs b/server/src/vbox.rs index 37e17ae1..de1aead3 100644 --- a/server/src/vbox.rs +++ b/server/src/vbox.rs @@ -35,11 +35,11 @@ pub enum Var { // specs // Base Damage, - GreenLife, + Life, Speed, // Lifes Upgrades - LifeI, + GreenLifeI, RedLifeI, BlueLifeI, LRSI, @@ -79,7 +79,7 @@ pub enum Var { Reflect, Recharge, Ruin, - Life, + Shield, Silence, Slay, Slow, @@ -134,7 +134,7 @@ impl Var { Var::Stun => 2, Var::Damage => 3, - Var::GreenLife => 3, + Var::Life => 3, Var::Speed => 3, _ => { @@ -233,13 +233,13 @@ impl Var { Var::GBDI => Some(Spec::GBDI), Var::RBDI => Some(Spec::RBDI), - Var::GreenLife => Some(Spec::GreenLife), - Var::LifeI => Some(Spec::LifeI), + Var::Life => Some(Spec::Life), Var::LRSI => Some(Spec::LRSI), Var::LBSI => Some(Spec::LBSI), Var::RBSI => Some(Spec::RBSI), - Var::RedLifeI => Some(Spec::RedLifeI), - Var::BlueLifeI => Some(Spec::BlueLifeI), + Var::GreenLifeI => Some(Spec::GreenLifeI), + Var::RedLifeI => Some(Spec::RedLifeI), + Var::BlueLifeI => Some(Spec::BlueLifeI), _ => None, } @@ -310,11 +310,11 @@ impl From for Var { Spec::GBDI => Var::GBDI, Spec::RBDI => Var::RBDI, - Spec::GreenLife => Var::GreenLife, - Spec::LifeI => Var::LifeI, + Spec::Life => Var::Life, Spec::LRSI => Var::LRSI, Spec::LBSI => Var::LBSI, Spec::RBSI => Var::RBSI, + Spec::GreenLifeI => Var::GreenLifeI, Spec::RedLifeI => Var::RedLifeI, Spec::BlueLifeI => Var::BlueLifeI, // _ => panic!("{:?} not implemented as a var", spec), @@ -372,12 +372,12 @@ fn get_combos() -> Vec { 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::GreenLife, Var::Red, Var::Red], var: Var::RedLifeI }, - Combo { units: vec![Var::GreenLife, Var::Green, Var::Green], var: Var::LifeI }, - Combo { units: vec![Var::GreenLife, Var::Blue, Var::Blue], var: Var::BlueLifeI }, - Combo { units: vec![Var::GreenLife, Var::Red, Var::Green], var: Var::LRSI }, - Combo { units: vec![Var::GreenLife, Var::Green, Var::Blue], var: Var::LBSI }, - Combo { units: vec![Var::GreenLife, Var::Red, Var::Blue], var: Var::RBSI }, + Combo { units: vec![Var::Life, Var::Red, Var::Red], var: Var::RedLifeI }, + Combo { units: vec![Var::Life, Var::Green, Var::Green], var: Var::GreenLifeI }, + Combo { units: vec![Var::Life, Var::Blue, Var::Blue], var: Var::BlueLifeI }, + Combo { units: vec![Var::Life, Var::Red, Var::Green], var: Var::LRSI }, + Combo { units: vec![Var::Life, Var::Green, Var::Blue], var: Var::LBSI }, + Combo { units: vec![Var::Life, 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 }, @@ -407,15 +407,9 @@ impl Vbox { pub fn new(account_id: Uuid, instance_id: Uuid) -> Vbox { // line them up with the columns of the vbox let starting_items = vec![ - Var::Red, Var::Attack, - Var::GreenLife, - Var::Green, Var::Attack, - Var::Speed, - Var::Blue, Var::Attack, - Var::Damage, ]; let mut vbox = Vbox { @@ -464,7 +458,7 @@ impl Vbox { let specs = vec![ (Var::Damage, 1), - (Var::GreenLife, 1), + (Var::Life, 1), (Var::Speed, 1), ];