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
Download Patch File Download Diff File Expand all files Collapse all files
server/src/spec.rs
+9 -9
View File
@@ -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 };
server/src/vbox.rs
+12 -12
View File
@@ -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<Spec> 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> {
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 },