Change some spec values

This commit is contained in:
Mashy 2019-04-04 11:34:41 +10:00
parent 706ad1d243
commit 34ed44cc57

View File

@ -73,45 +73,45 @@ impl Spec {
// Upgrades to Damage Spec // Upgrades to Damage Spec
Spec::Damage => modified + base.pct(5), Spec::Damage => modified + base.pct(5),
Spec::RedDamageI => modified + { Spec::RedDamageI => modified + {
let mut pct = 5; let mut pct = 10;
if team_colours.red >= 5 { pct += 5 }; if team_colours.red >= 5 { pct += 10 };
if team_colours.red >= 10 { pct += 10 }; if team_colours.red >= 10 { pct += 20 };
if team_colours.red >= 20 { pct += 20 }; if team_colours.red >= 20 { pct += 40 };
base.pct(pct) base.pct(pct)
}, },
Spec::GreenDamageI => modified + { Spec::GreenDamageI => modified + {
let mut pct = 5; let mut pct = 10;
if team_colours.green >= 5 { pct += 5 }; if team_colours.green >= 5 { pct += 10 };
if team_colours.green >= 10 { pct += 10 }; if team_colours.green >= 10 { pct += 20 };
if team_colours.green >= 20 { pct += 20 }; if team_colours.green >= 20 { pct += 40 };
base.pct(pct) base.pct(pct)
}, },
Spec::BlueDamageI => modified + { Spec::BlueDamageI => modified + {
let mut pct = 5; let mut pct = 10;
if team_colours.blue >= 5 { pct += 10 }; if team_colours.blue >= 5 { pct += 10 };
if team_colours.blue >= 10 { pct += 20 }; if team_colours.blue >= 10 { pct += 20 };
if team_colours.blue >= 20 { pct += 30 }; if team_colours.blue >= 20 { pct += 40 };
base.pct(pct) base.pct(pct)
}, },
Spec::GRDI => modified + { Spec::GRDI => modified + {
let mut pct = 5; let mut pct = 5;
if team_colours.green >= 2 && team_colours.red >= 2 { pct += 5 }; if team_colours.green >= 2 && team_colours.red >= 2 { pct += 10 };
if team_colours.green >= 5 && team_colours.red >= 5 { pct += 10 }; if team_colours.green >= 5 && team_colours.red >= 5 { pct += 15 };
if team_colours.green >= 10 && team_colours.red >= 10 { pct += 20 }; if team_colours.green >= 10 && team_colours.red >= 10 { pct += 30 };
base.pct(pct) base.pct(pct)
}, },
Spec::GBDI => modified + { Spec::GBDI => modified + {
let mut pct = 5; let mut pct = 5;
if team_colours.green >= 2 && team_colours.blue >= 2 { pct += 5 }; if team_colours.green >= 2 && team_colours.blue >= 2 { pct += 10 };
if team_colours.green >= 5 && team_colours.blue >= 5 { pct += 10 }; if team_colours.green >= 5 && team_colours.blue >= 5 { pct += 15 };
if team_colours.green >= 10 && team_colours.blue >= 10 { pct += 20 }; if team_colours.green >= 10 && team_colours.blue >= 10 { pct += 30 };
base.pct(pct) base.pct(pct)
}, },
Spec::RBDI => modified + { Spec::RBDI => modified + {
let mut pct = 5; let mut pct = 5;
if team_colours.blue >= 2 && team_colours.red >= 2 { pct += 5 }; if team_colours.blue >= 2 && team_colours.red >= 2 { pct += 10 };
if team_colours.blue >= 5 && team_colours.red >= 5 { pct += 10 }; if team_colours.blue >= 5 && team_colours.red >= 5 { pct += 15 };
if team_colours.blue >= 10 && team_colours.red >= 10 { pct += 20 }; if team_colours.blue >= 10 && team_colours.red >= 10 { pct += 30 };
base.pct(pct) base.pct(pct)
}, },
// Upgrades to speed Spec // Upgrades to speed Spec
@ -162,45 +162,45 @@ impl Spec {
// Upgrades to HP Spec // Upgrades to HP Spec
Spec::Hp => modified + base.pct(5), Spec::Hp => modified + base.pct(5),
Spec::LifeI => modified + { Spec::LifeI => modified + {
let mut mult: u64 = 10; let mut mult: u64 = 15;
if team_colours.red >= 5 { mult += 20 }; if team_colours.red >= 5 { mult += 25 };
if team_colours.red >= 10 { mult += 30 }; if team_colours.red >= 10 { mult += 50 };
if team_colours.red >= 20 { mult += 50 }; if team_colours.red >= 20 { mult += 75 };
mult * team_colours.green as u64 mult * team_colours.green as u64
}, },
Spec::RedShieldI => modified + { Spec::RedShieldI => modified + {
let mut mult: u64 = 10; let mut mult: u64 = 15;
if team_colours.red >= 5 { mult += 20 }; if team_colours.red >= 5 { mult += 25 };
if team_colours.red >= 10 { mult += 30 }; if team_colours.red >= 10 { mult += 50 };
if team_colours.red >= 20 { mult += 50 }; if team_colours.red >= 20 { mult += 75 };
mult * team_colours.red as u64 mult * team_colours.red as u64
}, },
Spec::BlueShieldI => modified + { Spec::BlueShieldI => modified + {
let mut mult: u64 = 10; let mut mult: u64 = 15;
if team_colours.red >= 5 { mult += 20 }; if team_colours.red >= 5 { mult += 25 };
if team_colours.red >= 10 { mult += 30 }; if team_colours.red >= 10 { mult += 50 };
if team_colours.red >= 20 { mult += 50 }; if team_colours.red >= 20 { mult += 75 };
mult * team_colours.blue as u64 mult * team_colours.blue as u64
}, },
Spec::LRSI => modified + { Spec::LRSI => modified + {
let mut mult: u64 = 5; let mut mult: u64 = 10;
if team_colours.green >= 2 && team_colours.red >= 2 { mult += 5 }; if team_colours.green >= 2 && team_colours.red >= 2 { mult += 10 };
if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 }; if team_colours.green >= 5 && team_colours.red >= 5 { mult += 25 };
if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 }; 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::LBSI => modified + {
let mut mult: u64 = 5; let mut mult: u64 = 10;
if team_colours.green >= 2 && team_colours.red >= 2 { mult += 5 }; if team_colours.green >= 2 && team_colours.red >= 2 { mult += 10 };
if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 }; if team_colours.green >= 5 && team_colours.red >= 5 { mult += 25 };
if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 }; 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::RBSI => modified + {
let mut mult: u64 = 5; let mut mult: u64 = 10;
if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 5 }; if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 10 };
if team_colours.blue >= 5 && team_colours.red >= 5 { mult += 10 }; if team_colours.blue >= 5 && team_colours.red >= 5 { mult += 25 };
if team_colours.blue >= 10 && team_colours.red >= 10 { mult += 20 }; if team_colours.blue >= 10 && team_colours.red >= 10 { mult += 50 };
mult * (team_colours.blue + team_colours.red) as u64 mult * (team_colours.blue + team_colours.red) as u64
}, },
} }