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

rename specs

Browse Source
This commit is contained in:
ntr 2019-04-10 11:10:53 +10:00
parent 2bd59262eb
commit 2a13de5bc2
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/constants.jsx
View File

@ -247,19 +247,19 @@ module.exports = {
thresholds: [5, 10, 20], thresholds: [5, 10, 20],
}, },
LRSI: { GRLI: {
description: 'Increased life and red shield', description: 'Increased life and red shield',
colours: ['green', 'red'], colours: ['green', 'red'],
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
}, },
LBSI: { GBLI: {
description: 'Increased life and blue shield', description: 'Increased life and blue shield',
colours: ['green', 'blue'], colours: ['green', 'blue'],
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
}, },
RBSI: { RBLI: {
description: 'Increased red and blue shield', description: 'Increased red and blue shield',
colours: ['red', 'blue'], colours: ['red', 'blue'],
thresholds: [2, 5, 10], thresholds: [2, 5, 10],

6
client/src/utils.jsx
View File

@ -69,9 +69,9 @@ const SPECS = {
GreenLifeI: { colour: 'green', caption: 'Life', svg: shapes.square }, GreenLifeI: { colour: 'green', caption: 'Life', svg: shapes.square },
RedLifeI: { colour: 'red', caption: 'Life', svg: shapes.square }, RedLifeI: { colour: 'red', caption: 'Life', svg: shapes.square },
BlueLifeI: { colour: 'blue', caption: 'Life', svg: shapes.square }, BlueLifeI: { colour: 'blue', caption: 'Life', svg: shapes.square },
LRSI: { colour: 'yellow', caption: 'Life', svg: shapes.square }, GRLI: { colour: 'yellow', caption: 'Life', svg: shapes.square },
LBSI: { colour: 'cyan', caption: 'Life', svg: shapes.square }, GBLI: { colour: 'cyan', caption: 'Life', svg: shapes.square },
RBSI: { colour: 'purple', caption: 'Life', svg: shapes.square }, RBLI: { colour: 'purple', caption: 'Life', svg: shapes.square },
Damage: { colour: 'white', caption: 'Damage', svg: shapes.circle }, Damage: { colour: 'white', caption: 'Damage', svg: shapes.circle },
RedDamageI: { colour: 'red', caption: 'DamageI', svg: shapes.circle }, RedDamageI: { colour: 'red', caption: 'DamageI', svg: shapes.circle },

18
server/src/spec.rs
View File

@ -15,9 +15,9 @@ pub enum Spec {
GreenLifeI, GreenLifeI,
RedLifeI, RedLifeI,
BlueLifeI, BlueLifeI,
LRSI, GRLI,
LBSI, GBLI,
RBSI, RBLI,
Damage, Damage,
RedDamageI, RedDamageI,
@ -61,9 +61,9 @@ impl Spec {
Spec::RedLifeI => vec![Stat::RedLife], Spec::RedLifeI => vec![Stat::RedLife],
Spec::BlueLifeI => vec![Stat::BlueLife], Spec::BlueLifeI => vec![Stat::BlueLife],
Spec::GreenLifeI => vec![Stat::GreenLife], Spec::GreenLifeI => vec![Stat::GreenLife],
Spec::LRSI => vec![Stat::GreenLife, Stat::RedLife], Spec::GRLI => vec![Stat::GreenLife, Stat::RedLife],
Spec::LBSI => vec![Stat::GreenLife, Stat::BlueLife], Spec::GBLI => vec![Stat::GreenLife, Stat::BlueLife],
Spec::RBSI => vec![Stat::BlueLife, Stat::RedLife], Spec::RBLI => vec![Stat::BlueLife, Stat::RedLife],
} }
} }
@ -182,21 +182,21 @@ impl Spec {
if team_colours.blue >= 20 { mult += 75 }; if team_colours.blue >= 20 { mult += 75 };
mult * team_colours.blue as u64 mult * team_colours.blue as u64
}, },
Spec::LRSI => modified + { Spec::GRLI => modified + {
let mut mult: u64 = 10; let mut mult: u64 = 10;
if team_colours.green >= 2 && team_colours.red >= 2 { mult += 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 >= 5 && team_colours.red >= 5 { mult += 25 };
if team_colours.green >= 10 && team_colours.red >= 10 { mult += 50 }; if team_colours.green >= 10 && team_colours.red >= 10 { mult += 50 };
mult * (team_colours.green + team_colours.red) as u64 mult * (team_colours.green + team_colours.red) as u64
}, },
Spec::LBSI => modified + { Spec::GBLI => modified + {
let mut mult: u64 = 10; let mut mult: u64 = 10;
if team_colours.green >= 2 && team_colours.red >= 2 { mult += 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 >= 5 && team_colours.red >= 5 { mult += 25 };
if team_colours.green >= 10 && team_colours.red >= 10 { mult += 50 }; if team_colours.green >= 10 && team_colours.red >= 10 { mult += 50 };
mult * (team_colours.green + team_colours.red) as u64 mult * (team_colours.green + team_colours.red) as u64
}, },
Spec::RBSI => modified + { Spec::RBLI => modified + {
let mut mult: u64 = 10; let mut mult: u64 = 10;
if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 10 }; if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 10 };
if team_colours.blue >= 5 && team_colours.red >= 5 { mult += 25 }; if team_colours.blue >= 5 && team_colours.red >= 5 { mult += 25 };

24
server/src/vbox.rs
View File

@ -42,9 +42,9 @@ pub enum Var {
GreenLifeI, GreenLifeI,
RedLifeI, RedLifeI,
BlueLifeI, BlueLifeI,
LRSI, GRLI,
LBSI, GBLI,
RBSI, RBLI,
// Damage Upgrades // Damage Upgrades
RedDamageI, RedDamageI,
@ -234,9 +234,9 @@ impl Var {
Var::RBDI => Some(Spec::RBDI), Var::RBDI => Some(Spec::RBDI),
Var::Life => Some(Spec::Life), Var::Life => Some(Spec::Life),
Var::LRSI => Some(Spec::LRSI), Var::GRLI => Some(Spec::GRLI),
Var::LBSI => Some(Spec::LBSI), Var::GBLI => Some(Spec::GBLI),
Var::RBSI => Some(Spec::RBSI), Var::RBLI => Some(Spec::RBLI),
Var::GreenLifeI => Some(Spec::GreenLifeI), Var::GreenLifeI => Some(Spec::GreenLifeI),
Var::RedLifeI => Some(Spec::RedLifeI), Var::RedLifeI => Some(Spec::RedLifeI),
Var::BlueLifeI => Some(Spec::BlueLifeI), Var::BlueLifeI => Some(Spec::BlueLifeI),
@ -311,9 +311,9 @@ impl From<Spec> for Var {
Spec::RBDI => Var::RBDI, Spec::RBDI => Var::RBDI,
Spec::Life => Var::Life, Spec::Life => Var::Life,
Spec::LRSI => Var::LRSI, Spec::GRLI => Var::GRLI,
Spec::LBSI => Var::LBSI, Spec::GBLI => Var::GBLI,
Spec::RBSI => Var::RBSI, Spec::RBLI => Var::RBLI,
Spec::GreenLifeI => Var::GreenLifeI, Spec::GreenLifeI => Var::GreenLifeI,
Spec::RedLifeI => Var::RedLifeI, Spec::RedLifeI => Var::RedLifeI,
Spec::BlueLifeI => Var::BlueLifeI, Spec::BlueLifeI => Var::BlueLifeI,
@ -375,9 +375,9 @@ fn get_combos() -> Vec<Combo> {
Combo { units: vec![Var::Life, Var::Red, Var::Red], var: Var::RedLifeI }, 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::Green, Var::Green], var: Var::GreenLifeI },
Combo { units: vec![Var::Life, Var::Blue, Var::Blue], var: Var::BlueLifeI }, 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::Red, Var::Green], var: Var::GRLI },
Combo { units: vec![Var::Life, Var::Green, Var::Blue], var: Var::LBSI }, Combo { units: vec![Var::Life, Var::Green, Var::Blue], var: Var::GBLI },
Combo { units: vec![Var::Life, Var::Red, Var::Blue], var: Var::RBSI }, 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::Red, Var::Red], var: Var::RedSpeedI },
Combo { units: vec![Var::Speed, Var::Green, Var::Green], var: Var::GreenSpeedI }, Combo { units: vec![Var::Speed, Var::Green, Var::Green], var: Var::GreenSpeedI },