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

life name changes server

Browse Source
This commit is contained in:
ntr 2019-04-09 16:12:17 +10:00
parent 4cf2b0a7bc
commit 94f07153dc
4 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ module.exports = {
colours: '2 Blue', colours: '2 Blue',
}, },
Life: { Shield: {
description: 'grants immunity to magical skills to target cryp', description: 'grants immunity to magical skills to target cryp',
colours: '1 Green 1 Blue', colours: '1 Green 1 Blue',
}, },
@ -236,31 +236,31 @@ module.exports = {
}, },
RedLifeI: { RedLifeI: {
description: 'Increased red Life', description: 'Increased red shield',
colours: ['red'], colours: ['red'],
thresholds: [5, 10, 20], thresholds: [5, 10, 20],
}, },
BlueLifeI: { BlueLifeI: {
description: 'Increased blue Life', description: 'Increased blue shield',
colours: ['blue'], colours: ['blue'],
thresholds: [5, 10, 20], thresholds: [5, 10, 20],
}, },
LRSI: { LRSI: {
description: 'Increased life and red Life', description: 'Increased life and red shield',
colours: ['green', 'red'], colours: ['green', 'red'],
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
}, },
LBSI: { LBSI: {
description: 'Increased life and blue Life', description: 'Increased life and blue shield',
colours: ['green', 'blue'], colours: ['green', 'blue'],
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
}, },
RBSI: { RBSI: {
description: 'Increased red and blue Life', description: 'Increased red and blue shield',
colours: ['red', 'blue'], colours: ['red', 'blue'],
thresholds: [2, 5, 10], thresholds: [2, 5, 10],
}, },

2
server/src/cryp.rs
View File

@ -814,7 +814,7 @@ mod tests {
.named(&"redboi".to_string()); .named(&"redboi".to_string());
cryp.learn_mut(Skill::Strike); 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::RedDamageI).unwrap(); cryp.spec_add(Spec::RedDamageI).unwrap();
cryp.spec_add(Spec::BlueLifeI).unwrap(); cryp.spec_add(Spec::BlueLifeI).unwrap();

24
server/src/spec.rs
View File

@ -11,8 +11,8 @@ pub enum Spec {
RBSpeedI, RBSpeedI,
// Pure redLife has to come first as it applies the base amount // Pure redLife has to come first as it applies the base amount
// that is multiplied // that is multiplied
GreenLife, Life,
LifeI, GreenLifeI,
RedLifeI, RedLifeI,
BlueLifeI, BlueLifeI,
LRSI, LRSI,
@ -57,10 +57,10 @@ impl Spec {
Spec::GBSpeedI => vec![Stat::Speed], Spec::GBSpeedI => vec![Stat::Speed],
Spec::RBSpeedI => vec![Stat::Speed], Spec::RBSpeedI => vec![Stat::Speed],
Spec::GreenLife => vec![Stat::GreenLife], Spec::Life => vec![Stat::GreenLife],
Spec::RedLifeI => vec![Stat::RedLife], Spec::RedLifeI => vec![Stat::RedLife],
Spec::BlueLifeI => vec![Stat::BlueLife], Spec::BlueLifeI => vec![Stat::BlueLife],
Spec::LifeI => vec![Stat::GreenLife], Spec::GreenLifeI => vec![Stat::GreenLife],
Spec::LRSI => vec![Stat::GreenLife, Stat::RedLife], Spec::LRSI => vec![Stat::GreenLife, Stat::RedLife],
Spec::LBSI => vec![Stat::GreenLife, Stat::BlueLife], Spec::LBSI => vec![Stat::GreenLife, Stat::BlueLife],
Spec::RBSI => vec![Stat::BlueLife, Stat::RedLife], Spec::RBSI => vec![Stat::BlueLife, Stat::RedLife],
@ -160,12 +160,12 @@ impl Spec {
}, },
// Upgrades to HP Spec // Upgrades to HP Spec
Spec::GreenLife => modified + base.pct(5), Spec::Life => modified + base.pct(5),
Spec::LifeI => modified + { Spec::GreenLifeI => modified + {
let mut mult: u64 = 15; let mut mult: u64 = 15;
if team_colours.red >= 5 { mult += 25 }; if team_colours.green >= 5 { mult += 25 };
if team_colours.red >= 10 { mult += 50 }; if team_colours.green >= 10 { mult += 50 };
if team_colours.red >= 20 { mult += 75 }; if team_colours.green >= 20 { mult += 75 };
mult * team_colours.green as u64 mult * team_colours.green as u64
}, },
Spec::RedLifeI => modified + { Spec::RedLifeI => modified + {
@ -177,9 +177,9 @@ impl Spec {
}, },
Spec::BlueLifeI => modified + { Spec::BlueLifeI => modified + {
let mut mult: u64 = 15; let mut mult: u64 = 15;
if team_colours.red >= 5 { mult += 25 }; if team_colours.blue >= 5 { mult += 25 };
if team_colours.red >= 10 { mult += 50 }; if team_colours.blue >= 10 { mult += 50 };
if team_colours.red >= 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::LRSI => modified + {

36
server/src/vbox.rs
View File

@ -35,11 +35,11 @@ pub enum Var {
// specs // specs
// Base // Base
Damage, Damage,
GreenLife, Life,
Speed, Speed,
// Lifes Upgrades // Lifes Upgrades
LifeI, GreenLifeI,
RedLifeI, RedLifeI,
BlueLifeI, BlueLifeI,
LRSI, LRSI,
@ -79,7 +79,7 @@ pub enum Var {
Reflect, Reflect,
Recharge, Recharge,
Ruin, Ruin,
Life, Shield,
Silence, Silence,
Slay, Slay,
Slow, Slow,
@ -134,7 +134,7 @@ impl Var {
Var::Stun => 2, Var::Stun => 2,
Var::Damage => 3, Var::Damage => 3,
Var::GreenLife => 3, Var::Life => 3,
Var::Speed => 3, Var::Speed => 3,
_ => { _ => {
@ -233,11 +233,11 @@ impl Var {
Var::GBDI => Some(Spec::GBDI), Var::GBDI => Some(Spec::GBDI),
Var::RBDI => Some(Spec::RBDI), Var::RBDI => Some(Spec::RBDI),
Var::GreenLife => Some(Spec::GreenLife), Var::Life => Some(Spec::Life),
Var::LifeI => Some(Spec::LifeI),
Var::LRSI => Some(Spec::LRSI), Var::LRSI => Some(Spec::LRSI),
Var::LBSI => Some(Spec::LBSI), Var::LBSI => Some(Spec::LBSI),
Var::RBSI => Some(Spec::RBSI), Var::RBSI => Some(Spec::RBSI),
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),
@ -310,11 +310,11 @@ impl From<Spec> for Var {
Spec::GBDI => Var::GBDI, Spec::GBDI => Var::GBDI,
Spec::RBDI => Var::RBDI, Spec::RBDI => Var::RBDI,
Spec::GreenLife => Var::GreenLife, Spec::Life => Var::Life,
Spec::LifeI => Var::LifeI,
Spec::LRSI => Var::LRSI, Spec::LRSI => Var::LRSI,
Spec::LBSI => Var::LBSI, Spec::LBSI => Var::LBSI,
Spec::RBSI => Var::RBSI, Spec::RBSI => Var::RBSI,
Spec::GreenLifeI => Var::GreenLifeI,
Spec::RedLifeI => Var::RedLifeI, Spec::RedLifeI => Var::RedLifeI,
Spec::BlueLifeI => Var::BlueLifeI, Spec::BlueLifeI => Var::BlueLifeI,
// _ => panic!("{:?} not implemented as a var", spec), // _ => panic!("{:?} not implemented as a var", spec),
@ -372,12 +372,12 @@ fn get_combos() -> Vec<Combo> {
Combo { units: vec![Var::Damage, Var::Green, Var::Blue], var: Var::GBDI }, 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::Damage, Var::Red, Var::Blue], var: Var::RBDI },
Combo { units: vec![Var::GreenLife, Var::Red, Var::Red], var: Var::RedLifeI }, Combo { units: vec![Var::Life, Var::Red, Var::Red], var: Var::RedLifeI },
Combo { units: vec![Var::GreenLife, Var::Green, Var::Green], var: Var::LifeI }, Combo { units: vec![Var::Life, Var::Green, Var::Green], var: Var::GreenLifeI },
Combo { units: vec![Var::GreenLife, Var::Blue, Var::Blue], var: Var::BlueLifeI }, Combo { units: vec![Var::Life, Var::Blue, Var::Blue], var: Var::BlueLifeI },
Combo { units: vec![Var::GreenLife, Var::Red, Var::Green], var: Var::LRSI }, Combo { units: vec![Var::Life, Var::Red, Var::Green], var: Var::LRSI },
Combo { units: vec![Var::GreenLife, Var::Green, Var::Blue], var: Var::LBSI }, Combo { units: vec![Var::Life, 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::Blue], var: Var::RBSI },
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 },
@ -407,15 +407,9 @@ impl Vbox {
pub fn new(account_id: Uuid, instance_id: Uuid) -> Vbox { pub fn new(account_id: Uuid, instance_id: Uuid) -> Vbox {
// line them up with the columns of the vbox // line them up with the columns of the vbox
let starting_items = vec![ let starting_items = vec![
Var::Red,
Var::Attack, Var::Attack,
Var::GreenLife,
Var::Green,
Var::Attack, Var::Attack,
Var::Speed,
Var::Blue,
Var::Attack, Var::Attack,
Var::Damage,
]; ];
let mut vbox = Vbox { let mut vbox = Vbox {
@ -464,7 +458,7 @@ impl Vbox {
let specs = vec![ let specs = vec![
(Var::Damage, 1), (Var::Damage, 1),
(Var::GreenLife, 1), (Var::Life, 1),
(Var::Speed, 1), (Var::Speed, 1),
]; ];