changed dmg bonus

This commit is contained in:
Mashy 2019-03-21 15:45:25 +10:00
parent 21988ccc77
commit 5fab9e6936

View File

@ -66,25 +66,16 @@ impl Spec {
match *self { match *self {
Spec::RedDamageI => modified + { Spec::RedDamageI => modified + {
let mut pct = 5; let mut bonus = base.pct(5) as u64;
if team_colours.red >= 5 { pct += 5 }; bonus + apply_bonus(vec![team_colours.red], vec![5, 10, 20], vec![bonus, bonus * 2, bonus * 4])
if team_colours.red >= 10 { pct += 10 };
if team_colours.red >= 20 { pct += 20 };
base.pct(pct)
}, },
Spec::GreenDamageI => modified + { Spec::GreenDamageI => modified + {
let mut pct = 5; let mut bonus = base.pct(5) as u64;
if team_colours.green >= 5 { pct += 5 }; bonus + apply_bonus(vec![team_colours.green], vec![5, 10, 20], vec![bonus, bonus * 2, bonus * 4])
if team_colours.green >= 10 { pct += 10 };
if team_colours.green >= 20 { pct += 20 };
base.pct(pct)
}, },
Spec::BlueDamageI => modified + { Spec::BlueDamageI => modified + {
let mut pct = 5; let mut bonus = base.pct(5) as u64;
if team_colours.blue >= 5 { pct += 10 }; bonus + apply_bonus(vec![team_colours.blue], vec![5, 10, 20], vec![bonus, bonus * 2, bonus * 4])
if team_colours.blue >= 10 { pct += 20 };
if team_colours.blue >= 20 { pct += 30 };
base.pct(pct)
}, },
Spec::SpeedI => modified + base.pct(5), Spec::SpeedI => modified + base.pct(5),
@ -118,5 +109,4 @@ impl Spec {
}, },
} }
} }
} }