From 2a13de5bc29daec6979f64559e476d7e8ec53eb3 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 10 Apr 2019 11:10:53 +1000 Subject: [PATCH] rename specs --- client/src/components/constants.jsx | 6 +++--- client/src/utils.jsx | 6 +++--- server/src/spec.rs | 18 +++++++++--------- server/src/vbox.rs | 24 ++++++++++++------------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/client/src/components/constants.jsx b/client/src/components/constants.jsx index 655a5c05..6549b313 100644 --- a/client/src/components/constants.jsx +++ b/client/src/components/constants.jsx @@ -247,19 +247,19 @@ module.exports = { thresholds: [5, 10, 20], }, - LRSI: { + GRLI: { description: 'Increased life and red shield', colours: ['green', 'red'], thresholds: [2, 5, 10], }, - LBSI: { + GBLI: { description: 'Increased life and blue shield', colours: ['green', 'blue'], thresholds: [2, 5, 10], }, - RBSI: { + RBLI: { description: 'Increased red and blue shield', colours: ['red', 'blue'], thresholds: [2, 5, 10], diff --git a/client/src/utils.jsx b/client/src/utils.jsx index f46adc23..2a5a6535 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -69,9 +69,9 @@ const SPECS = { GreenLifeI: { colour: 'green', caption: 'Life', svg: shapes.square }, RedLifeI: { colour: 'red', caption: 'Life', svg: shapes.square }, BlueLifeI: { colour: 'blue', caption: 'Life', svg: shapes.square }, - LRSI: { colour: 'yellow', caption: 'Life', svg: shapes.square }, - LBSI: { colour: 'cyan', caption: 'Life', svg: shapes.square }, - RBSI: { colour: 'purple', caption: 'Life', svg: shapes.square }, + GRLI: { colour: 'yellow', caption: 'Life', svg: shapes.square }, + GBLI: { colour: 'cyan', caption: 'Life', svg: shapes.square }, + RBLI: { colour: 'purple', caption: 'Life', svg: shapes.square }, Damage: { colour: 'white', caption: 'Damage', svg: shapes.circle }, RedDamageI: { colour: 'red', caption: 'DamageI', svg: shapes.circle }, diff --git a/server/src/spec.rs b/server/src/spec.rs index 38f8c660..017abd2d 100644 --- a/server/src/spec.rs +++ b/server/src/spec.rs @@ -15,9 +15,9 @@ pub enum Spec { GreenLifeI, RedLifeI, BlueLifeI, - LRSI, - LBSI, - RBSI, + GRLI, + GBLI, + RBLI, Damage, RedDamageI, @@ -61,9 +61,9 @@ impl Spec { 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], + Spec::GRLI => vec![Stat::GreenLife, Stat::RedLife], + Spec::GBLI => vec![Stat::GreenLife, Stat::BlueLife], + Spec::RBLI => vec![Stat::BlueLife, Stat::RedLife], } } @@ -182,21 +182,21 @@ impl Spec { if team_colours.blue >= 20 { mult += 75 }; mult * team_colours.blue as u64 }, - Spec::LRSI => modified + { + Spec::GRLI => modified + { let mut mult: u64 = 10; if team_colours.green >= 2 && team_colours.red >= 2 { mult += 10 }; if team_colours.green >= 5 && team_colours.red >= 5 { mult += 25 }; if team_colours.green >= 10 && team_colours.red >= 10 { mult += 50 }; mult * (team_colours.green + team_colours.red) as u64 }, - Spec::LBSI => modified + { + Spec::GBLI => modified + { let mut mult: u64 = 10; if team_colours.green >= 2 && team_colours.red >= 2 { mult += 10 }; if team_colours.green >= 5 && team_colours.red >= 5 { mult += 25 }; if team_colours.green >= 10 && team_colours.red >= 10 { mult += 50 }; mult * (team_colours.green + team_colours.red) as u64 }, - Spec::RBSI => modified + { + Spec::RBLI => modified + { let mut mult: u64 = 10; if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 10 }; if team_colours.blue >= 5 && team_colours.red >= 5 { mult += 25 }; diff --git a/server/src/vbox.rs b/server/src/vbox.rs index 98b53a51..de93bc17 100644 --- a/server/src/vbox.rs +++ b/server/src/vbox.rs @@ -42,9 +42,9 @@ pub enum Var { GreenLifeI, RedLifeI, BlueLifeI, - LRSI, - LBSI, - RBSI, + GRLI, + GBLI, + RBLI, // Damage Upgrades RedDamageI, @@ -234,9 +234,9 @@ impl Var { Var::RBDI => Some(Spec::RBDI), Var::Life => Some(Spec::Life), - Var::LRSI => Some(Spec::LRSI), - Var::LBSI => Some(Spec::LBSI), - Var::RBSI => Some(Spec::RBSI), + Var::GRLI => Some(Spec::GRLI), + Var::GBLI => Some(Spec::GBLI), + Var::RBLI => Some(Spec::RBLI), Var::GreenLifeI => Some(Spec::GreenLifeI), Var::RedLifeI => Some(Spec::RedLifeI), Var::BlueLifeI => Some(Spec::BlueLifeI), @@ -311,9 +311,9 @@ impl From for Var { Spec::RBDI => Var::RBDI, Spec::Life => Var::Life, - Spec::LRSI => Var::LRSI, - Spec::LBSI => Var::LBSI, - Spec::RBSI => Var::RBSI, + Spec::GRLI => Var::GRLI, + Spec::GBLI => Var::GBLI, + Spec::RBLI => Var::RBLI, Spec::GreenLifeI => Var::GreenLifeI, Spec::RedLifeI => Var::RedLifeI, Spec::BlueLifeI => Var::BlueLifeI, @@ -375,9 +375,9 @@ fn get_combos() -> Vec { 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::Life, Var::Red, Var::Green], var: Var::GRLI }, + Combo { units: vec![Var::Life, Var::Green, Var::Blue], var: Var::GBLI }, + Combo { units: vec![Var::Life, Var::Red, Var::Blue], var: Var::RBLI }, Combo { units: vec![Var::Speed, Var::Red, Var::Red], var: Var::RedSpeedI }, Combo { units: vec![Var::Speed, Var::Green, Var::Green], var: Var::GreenSpeedI },