From 34ed44cc573e4a065ef033917e23e8c3c69a5e4d Mon Sep 17 00:00:00 2001 From: Mashy Date: Thu, 4 Apr 2019 11:34:41 +1000 Subject: [PATCH] Change some spec values --- server/src/spec.rs | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/server/src/spec.rs b/server/src/spec.rs index 74394647..a05cc3f3 100644 --- a/server/src/spec.rs +++ b/server/src/spec.rs @@ -73,45 +73,45 @@ impl Spec { // Upgrades to Damage Spec Spec::Damage => modified + base.pct(5), Spec::RedDamageI => modified + { - let mut pct = 5; - if team_colours.red >= 5 { pct += 5 }; - if team_colours.red >= 10 { pct += 10 }; - if team_colours.red >= 20 { pct += 20 }; + let mut pct = 10; + if team_colours.red >= 5 { pct += 10 }; + if team_colours.red >= 10 { pct += 20 }; + if team_colours.red >= 20 { pct += 40 }; base.pct(pct) }, Spec::GreenDamageI => modified + { - let mut pct = 5; - if team_colours.green >= 5 { pct += 5 }; - if team_colours.green >= 10 { pct += 10 }; - if team_colours.green >= 20 { pct += 20 }; + let mut pct = 10; + if team_colours.green >= 5 { pct += 10 }; + if team_colours.green >= 10 { pct += 20 }; + if team_colours.green >= 20 { pct += 40 }; base.pct(pct) }, Spec::BlueDamageI => modified + { - let mut pct = 5; + let mut pct = 10; if team_colours.blue >= 5 { pct += 10 }; if team_colours.blue >= 10 { pct += 20 }; - if team_colours.blue >= 20 { pct += 30 }; + if team_colours.blue >= 20 { pct += 40 }; base.pct(pct) }, Spec::GRDI => modified + { let mut pct = 5; - if team_colours.green >= 2 && team_colours.red >= 2 { pct += 5 }; - if team_colours.green >= 5 && team_colours.red >= 5 { pct += 10 }; - if team_colours.green >= 10 && team_colours.red >= 10 { pct += 20 }; + if team_colours.green >= 2 && team_colours.red >= 2 { pct += 10 }; + if team_colours.green >= 5 && team_colours.red >= 5 { pct += 15 }; + if team_colours.green >= 10 && team_colours.red >= 10 { pct += 30 }; base.pct(pct) }, Spec::GBDI => modified + { let mut pct = 5; - if team_colours.green >= 2 && team_colours.blue >= 2 { pct += 5 }; - if team_colours.green >= 5 && team_colours.blue >= 5 { pct += 10 }; - if team_colours.green >= 10 && team_colours.blue >= 10 { pct += 20 }; + if team_colours.green >= 2 && team_colours.blue >= 2 { pct += 10 }; + if team_colours.green >= 5 && team_colours.blue >= 5 { pct += 15 }; + if team_colours.green >= 10 && team_colours.blue >= 10 { pct += 30 }; base.pct(pct) }, Spec::RBDI => modified + { let mut pct = 5; - if team_colours.blue >= 2 && team_colours.red >= 2 { pct += 5 }; - if team_colours.blue >= 5 && team_colours.red >= 5 { pct += 10 }; - if team_colours.blue >= 10 && team_colours.red >= 10 { pct += 20 }; + if team_colours.blue >= 2 && team_colours.red >= 2 { pct += 10 }; + if team_colours.blue >= 5 && team_colours.red >= 5 { pct += 15 }; + if team_colours.blue >= 10 && team_colours.red >= 10 { pct += 30 }; base.pct(pct) }, // Upgrades to speed Spec @@ -162,45 +162,45 @@ impl Spec { // Upgrades to HP Spec Spec::Hp => modified + base.pct(5), Spec::LifeI => modified + { - let mut mult: u64 = 10; - if team_colours.red >= 5 { mult += 20 }; - if team_colours.red >= 10 { mult += 30 }; - if team_colours.red >= 20 { mult += 50 }; + let mut mult: u64 = 15; + if team_colours.red >= 5 { mult += 25 }; + if team_colours.red >= 10 { mult += 50 }; + if team_colours.red >= 20 { mult += 75 }; mult * team_colours.green as u64 }, Spec::RedShieldI => modified + { - let mut mult: u64 = 10; - if team_colours.red >= 5 { mult += 20 }; - if team_colours.red >= 10 { mult += 30 }; - if team_colours.red >= 20 { mult += 50 }; + let mut mult: u64 = 15; + if team_colours.red >= 5 { mult += 25 }; + if team_colours.red >= 10 { mult += 50 }; + if team_colours.red >= 20 { mult += 75 }; mult * team_colours.red as u64 }, Spec::BlueShieldI => modified + { - let mut mult: u64 = 10; - if team_colours.red >= 5 { mult += 20 }; - if team_colours.red >= 10 { mult += 30 }; - if team_colours.red >= 20 { mult += 50 }; + let mut mult: u64 = 15; + if team_colours.red >= 5 { mult += 25 }; + if team_colours.red >= 10 { mult += 50 }; + if team_colours.red >= 20 { mult += 75 }; mult * team_colours.blue as u64 }, Spec::LRSI => modified + { - let mut mult: u64 = 5; - if team_colours.green >= 2 && team_colours.red >= 2 { mult += 5 }; - if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 }; - if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 }; + 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 + { - let mut mult: u64 = 5; - if team_colours.green >= 2 && team_colours.red >= 2 { mult += 5 }; - if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 }; - if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 }; + 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 + { - let mut mult: u64 = 5; - if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 5 }; - if team_colours.blue >= 5 && team_colours.red >= 5 { mult += 10 }; - if team_colours.blue >= 10 && team_colours.red >= 10 { mult += 20 }; + 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 }; + if team_colours.blue >= 10 && team_colours.red >= 10 { mult += 50 }; mult * (team_colours.blue + team_colours.red) as u64 }, }