From 09f6617094c2ab0324c511bc0d5cd8410e0ea36f Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 29 Mar 2019 22:23:00 +1100 Subject: [PATCH] u64 mult --- server/src/skill.rs | 2 +- server/src/spec.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/src/skill.rs b/server/src/skill.rs index bca93410..542369f5 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -948,7 +948,7 @@ fn decay(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Reso } fn decay_tick(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Resolutions { - let amount = source.blue_damage(); + let amount = source.blue_damage() / 2; target.deal_blue_damage(Skill::DecayTick, amount) .into_iter() .for_each(|e| results.push(Resolution::new(source, target).event(e))); diff --git a/server/src/spec.rs b/server/src/spec.rs index 538cc856..4e5e2165 100644 --- a/server/src/spec.rs +++ b/server/src/spec.rs @@ -162,42 +162,42 @@ impl Spec { // Upgrades to HP Spec Spec::Hp => modified + base.pct(5), Spec::LifeI => modified + { - let mut mult = 10; + 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 }; mult * team_colours.green as u64 }, Spec::RedShieldI => modified + { - let mut mult = 10; + 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 }; mult * team_colours.red as u64 }, Spec::BlueShieldI => modified + { - let mut mult = 10; + 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 }; (mult * team_colours.blue) as u64 }, Spec::LRSI => modified + { - let mut mult = 5; + 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 }; mult * (team_colours.green + team_colours.red) as u64 }, Spec::LBSI => modified + { - let mut mult = 5; + 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 }; mult * (team_colours.green + team_colours.red) as u64 }, Spec::RBSI => modified + { - let mut mult = 5; + 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 };