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

u64 mult

Browse Source
This commit is contained in:
ntr 2019-03-29 22:23:00 +11:00
parent cfcbe1c7e1
commit 09f6617094
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/skill.rs
View File

@ -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 { 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) target.deal_blue_damage(Skill::DecayTick, amount)
.into_iter() .into_iter()
.for_each(|e| results.push(Resolution::new(source, target).event(e))); .for_each(|e| results.push(Resolution::new(source, target).event(e)));

12
server/src/spec.rs
View File

@ -162,42 +162,42 @@ 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 = 10; let mut mult: u64 = 10;
if team_colours.red >= 5 { mult += 20 }; if team_colours.red >= 5 { mult += 20 };
if team_colours.red >= 10 { mult += 30 }; if team_colours.red >= 10 { mult += 30 };
if team_colours.red >= 20 { mult += 50 }; if team_colours.red >= 20 { mult += 50 };
mult * team_colours.green as u64 mult * team_colours.green as u64
}, },
Spec::RedShieldI => modified + { Spec::RedShieldI => modified + {
let mut mult = 10; let mut mult: u64 = 10;
if team_colours.red >= 5 { mult += 20 }; if team_colours.red >= 5 { mult += 20 };
if team_colours.red >= 10 { mult += 30 }; if team_colours.red >= 10 { mult += 30 };
if team_colours.red >= 20 { mult += 50 }; if team_colours.red >= 20 { mult += 50 };
mult * team_colours.red as u64 mult * team_colours.red as u64
}, },
Spec::BlueShieldI => modified + { Spec::BlueShieldI => modified + {
let mut mult = 10; let mut mult: u64 = 10;
if team_colours.red >= 5 { mult += 20 }; if team_colours.red >= 5 { mult += 20 };
if team_colours.red >= 10 { mult += 30 }; if team_colours.red >= 10 { mult += 30 };
if team_colours.red >= 20 { mult += 50 }; if team_colours.red >= 20 { mult += 50 };
(mult * team_colours.blue) as u64 (mult * team_colours.blue) as u64
}, },
Spec::LRSI => modified + { 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 >= 2 && team_colours.red >= 2 { mult += 5 };
if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 }; if team_colours.green >= 5 && team_colours.red >= 5 { mult += 10 };
if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 }; if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 };
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 = 5; let mut mult: u64 = 5;
if team_colours.green >= 2 && team_colours.red >= 2 { mult += 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 >= 5 && team_colours.red >= 5 { mult += 10 };
if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 }; if team_colours.green >= 10 && team_colours.red >= 10 { mult += 20 };
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 = 5; let mut mult: u64 = 5;
if team_colours.blue >= 2 && team_colours.red >= 2 { mult += 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 >= 5 && team_colours.red >= 5 { mult += 10 };
if team_colours.blue >= 10 && team_colours.red >= 10 { mult += 20 }; if team_colours.blue >= 10 && team_colours.red >= 10 { mult += 20 };