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

rework spec calculation system

Browse Source
This commit is contained in:
Mashy 2019-05-29 13:15:56 +10:00
parent fc07bffb93
commit ab5a38f86f
3 changed files with 206 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
server/src/construct.rs
View File

@ -899,6 +899,30 @@ mod tests {
construct.spec_add(Spec::PowerRRI).unwrap(); construct.spec_add(Spec::PowerRRI).unwrap();
construct.spec_add(Spec::PowerGGI).unwrap(); construct.spec_add(Spec::PowerGGI).unwrap();
construct.spec_add(Spec::PowerBBI).unwrap(); construct.spec_add(Spec::PowerBBI).unwrap();
construct.learn_mut(Skill::StrikeIII); // 18 reds (24 total)
let player_colours = Colours {
red: 5,
green: 15,
blue: 25,
};
construct.apply_modifiers(&player_colours);
assert!(construct.red_power.value == construct.red_power.base + construct.red_power.base.pct(80));
assert!(construct.green_power.value == construct.green_power.base + construct.green_power.base.pct(120));
assert!(construct.blue_power.value == construct.blue_power.base + construct.blue_power.base.pct(160));
return;
}
#[test]
fn construct_player_modifiers_base_test() {
let mut construct = Construct::new()
.named(&"player player".to_string());
construct.spec_add(Spec::Power).unwrap();
construct.spec_add(Spec::Life).unwrap();
let player_colours = Colours { let player_colours = Colours {
red: 5, red: 5,
@ -909,9 +933,35 @@ mod tests {
construct.apply_modifiers(&player_colours); construct.apply_modifiers(&player_colours);
assert!(construct.red_power.value == construct.red_power.base + construct.red_power.base.pct(20)); assert!(construct.red_power.value == construct.red_power.base + construct.red_power.base.pct(20));
assert!(construct.green_power.value == construct.green_power.base + construct.green_power.base.pct(40)); assert!(construct.green_power.value == construct.green_power.base + construct.green_power.base.pct(20));
assert!(construct.blue_power.value == construct.blue_power.base + construct.blue_power.base.pct(80)); assert!(construct.blue_power.value == construct.blue_power.base + construct.blue_power.base.pct(20));
assert!(construct.green_life.value == construct.green_life.base + 150);
return; return;
} }
#[test]
fn construct_player_modifiers_spec_bonus_test() {
let mut construct = Construct::new()
.named(&"player player".to_string());
construct.spec_add(Spec::PowerRRI).unwrap();
construct.spec_add(Spec::PowerGGI).unwrap();
construct.spec_add(Spec::PowerBBI).unwrap();
let player_colours = Colours {
red: 5,
green: 0,
blue: 0,
};
construct.apply_modifiers(&player_colours);
assert!(construct.red_power.value == construct.red_power.base + construct.red_power.base.pct(60));
assert!(construct.green_power.value == construct.green_power.base + construct.green_power.base.pct(40));
assert!(construct.blue_power.value == construct.blue_power.base + construct.blue_power.base.pct(40));
return;
}
} }

7
server/src/item.rs
View File

@ -793,6 +793,9 @@ impl From<Skill> for Item {
Skill::ChaosI => Item::ChaosI, Skill::ChaosI => Item::ChaosI,
Skill::ChaosII => Item::ChaosII, Skill::ChaosII => Item::ChaosII,
Skill::ChaosIII => Item::ChaosIII, Skill::ChaosIII => Item::ChaosIII,
Skill::CorruptI => Item::CorruptI,
Skill::CorruptII => Item::CorruptII,
Skill::CorruptIII => Item::CorruptIII,
Skill::ClutchI => Item::ClutchI, Skill::ClutchI => Item::ClutchI,
Skill::ClutchII => Item::ClutchII, Skill::ClutchII => Item::ClutchII,
Skill::ClutchIII => Item::ClutchIII, Skill::ClutchIII => Item::ClutchIII,
@ -873,9 +876,6 @@ impl From<Skill> for Item {
Skill::TriageI => Item::TriageI, Skill::TriageI => Item::TriageI,
Skill::TriageII => Item::TriageII, Skill::TriageII => Item::TriageII,
Skill::TriageIII => Item::TriageIII, Skill::TriageIII => Item::TriageIII,
Skill::CorruptI => Item::CorruptI,
Skill::CorruptII => Item::CorruptII,
Skill::CorruptIII => Item::CorruptIII,
// Convert subskills into parent skills // Convert subskills into parent skills
Skill::CorruptionI => Item::CorruptI, Skill::CorruptionI => Item::CorruptI,
@ -891,7 +891,6 @@ impl From<Skill> for Item {
Skill::HatredII => Item::HostilityII, Skill::HatredII => Item::HostilityII,
Skill::HatredIII => Item::HostilityIII, Skill::HatredIII => Item::HostilityIII,
Skill::HasteStrike => Item::HasteI, Skill::HasteStrike => Item::HasteI,
Skill::ImpureBlast => Item::ImpurityI, Skill::ImpureBlast => Item::ImpurityI,
Skill::RiposteI => Item::ParryI, Skill::RiposteI => Item::ParryI,
Skill::RiposteII => Item::ParryII, Skill::RiposteII => Item::ParryII,

168
server/src/spec.rs
View File

@ -1,5 +1,6 @@
use construct::{Stat, Colours}; use construct::{Stat, Colours};
use util::{IntPct}; use util::{IntPct};
use std::cmp;
#[derive(Debug,Clone,Serialize,Deserialize)] #[derive(Debug,Clone,Serialize,Deserialize)]
pub struct SpecBonus { pub struct SpecBonus {
@ -19,13 +20,18 @@ impl SpecBonus {
#[derive(Debug,Clone,Serialize,Deserialize)] #[derive(Debug,Clone,Serialize,Deserialize)]
pub struct SpecValues { pub struct SpecValues {
pub base: u64, pub base: u64,
pub multi: u64,
pub bonuses: Vec<SpecBonus>, pub bonuses: Vec<SpecBonus>,
} }
impl SpecValues { impl SpecValues {
pub fn calc_value (&self, c: &Colours) -> u64 { pub fn max_value (&self, c: &Colours) -> u64 {
self.bonuses.iter().fold(self.base, |acc, s| acc + s.get_bonus(c)) self.bonuses.iter().fold(self.base, |acc, s| acc + s.get_bonus(c))
} }
pub fn calc_multi (&self, c: &Colours) -> u64 {
self.multi * (c.red + c.green + c.blue) as u64
}
} }
@ -88,213 +94,213 @@ impl Spec {
pub fn values(&self) -> SpecValues { pub fn values(&self) -> SpecValues {
match *self { match *self {
Spec::Power => SpecValues { Spec::Power => SpecValues {
base: 5, multi: 0, base: 20,
bonuses: vec![] bonuses: vec![]
}, },
Spec::PowerRRI => SpecValues { Spec::PowerRRI => SpecValues {
base: 10, multi: 10, base: 40,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 40 },
SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 20 }, SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 40 },
SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 40 } SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 40 }
], ],
}, },
Spec::PowerGGI => SpecValues { Spec::PowerGGI => SpecValues {
base: 10, multi: 10, base: 40,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 40 },
SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 20 }, SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 40 },
SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 40 } SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 40 }
], ],
}, },
Spec::PowerBBI => SpecValues { Spec::PowerBBI => SpecValues {
base: 10, multi: 10, base: 40,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 40 },
SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 20 }, SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 40 },
SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 40 } SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 40 }
], ],
}, },
Spec::PowerRGI => SpecValues { Spec::PowerRGI => SpecValues {
base: 5, multi: 7, base: 25,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 25 },
SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 15 }, SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 25 },
SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 30 } SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 25 }
], ],
}, },
Spec::PowerGBI => SpecValues { Spec::PowerGBI => SpecValues {
base: 5, multi: 7, base: 25,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 25 },
SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 15 }, SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 25 },
SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 30 } SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 25 }
], ],
}, },
Spec::PowerRBI => SpecValues { Spec::PowerRBI => SpecValues {
base: 5, multi: 7, base: 25,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 10 }, SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 25 },
SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 15 }, SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 25 },
SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 30 } SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 25 }
], ],
}, },
Spec::Speed => SpecValues { Spec::Speed => SpecValues {
base: 5, multi: 0, base: 40,
bonuses: vec![] bonuses: vec![]
}, },
Spec::SpeedRRI => SpecValues { Spec::SpeedRRI => SpecValues {
base: 10, multi: 20, base: 80,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 80 },
SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 20 }, SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 80 },
SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 40 } SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 80 }
], ],
}, },
Spec::SpeedGGI => SpecValues { Spec::SpeedGGI => SpecValues {
base: 10, multi: 20, base: 80,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 80 },
SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 20 }, SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 80 },
SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 40 } SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 80 }
], ],
}, },
Spec::SpeedBBI => SpecValues { Spec::SpeedBBI => SpecValues {
base: 10, multi: 20, base: 80,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 80 },
SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 20 }, SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 80 },
SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 40 } SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 80 }
], ],
}, },
Spec::SpeedRGI => SpecValues { Spec::SpeedRGI => SpecValues {
base: 5, multi: 15, base: 60,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 60 },
SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 15 }, SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 60 },
SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 30 } SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 60 }
], ],
}, },
Spec::SpeedGBI => SpecValues { Spec::SpeedGBI => SpecValues {
base: 5, multi: 15, base: 60,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 60 },
SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 15 }, SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 60 },
SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 30 } SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 60 }
], ],
}, },
Spec::SpeedRBI => SpecValues { Spec::SpeedRBI => SpecValues {
base: 5, multi: 15, base: 60,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 10 }, SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 60 },
SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 15 }, SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 60 },
SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 30 } SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 60 }
], ],
}, },
Spec::Life => SpecValues { Spec::Life => SpecValues {
base: 5, multi: 0, base: 150,
bonuses: vec![]}, bonuses: vec![]},
Spec::LifeRRI => SpecValues { Spec::LifeRRI => SpecValues {
base: 10, multi: 75, base: 300,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 5, green: 0, blue: 0 }, bonus: 300 },
SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 20 }, SpecBonus { req: Colours { red: 10, green: 0, blue: 0 }, bonus: 300 },
SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 40 } SpecBonus { req: Colours { red: 20, green: 0, blue: 0 }, bonus: 300 }
], ],
}, },
Spec::LifeGGI => SpecValues { Spec::LifeGGI => SpecValues {
base: 10, multi: 75, base: 300,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 5, blue: 0 }, bonus: 300 },
SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 20 }, SpecBonus { req: Colours { red: 0, green: 10, blue: 0 }, bonus: 300 },
SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 40 } SpecBonus { req: Colours { red: 0, green: 20, blue: 0 }, bonus: 300 }
], ],
}, },
Spec::LifeBBI => SpecValues { Spec::LifeBBI => SpecValues {
base: 10, multi: 75, base: 300,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 0, blue: 5 }, bonus: 300 },
SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 20 }, SpecBonus { req: Colours { red: 0, green: 0, blue: 10 }, bonus: 300 },
SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 40 } SpecBonus { req: Colours { red: 0, green: 0, blue: 20 }, bonus: 300 }
], ],
}, },
Spec::LifeRGI => SpecValues { Spec::LifeRGI => SpecValues {
base: 5, multi: 50, base: 200,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 10 }, SpecBonus { req: Colours { red: 2, green: 2, blue: 0 }, bonus: 200 },
SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 15 }, SpecBonus { req: Colours { red: 5, green: 5, blue: 0 }, bonus: 200 },
SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 30 } SpecBonus { req: Colours { red: 10, green: 10, blue: 0 }, bonus: 200 }
], ],
}, },
Spec::LifeGBI => SpecValues { Spec::LifeGBI => SpecValues {
base: 5, multi: 50, base: 200,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 10 }, SpecBonus { req: Colours { red: 0, green: 2, blue: 2 }, bonus: 200 },
SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 15 }, SpecBonus { req: Colours { red: 0, green: 5, blue: 5 }, bonus: 200 },
SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 30 } SpecBonus { req: Colours { red: 0, green: 10, blue: 10 }, bonus: 200 }
], ],
}, },
Spec::LifeRBI => SpecValues { Spec::LifeRBI => SpecValues {
base: 5, multi: 50, base: 200,
bonuses: vec![ bonuses: vec![
SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 10 }, SpecBonus { req: Colours { red: 2, green: 0, blue: 2 }, bonus: 200 },
SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 15 }, SpecBonus { req: Colours { red: 5, green: 0, blue: 5 }, bonus: 200 },
SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 30 } SpecBonus { req: Colours { red: 10, green: 0, blue: 10 }, bonus: 200 }
], ],
}, },
} }
} }
pub fn apply(&self, modified: u64, base: u64, construct_colours: &Colours, player_colours: &Colours) -> u64 { pub fn apply(&self, modified: u64, base: u64, construct_colours: &Colours, player_colours: &Colours) -> u64 {
let construct_colour_total: u64 = (construct_colours.red + construct_colours.green + construct_colours.blue) as u64;
match *self { match *self {
// Upgrades to Power Spec // Percentage multipliers based on base value
Spec::Power | Spec::Power |
Spec::Speed => modified + base.pct(self.values().base),
Spec::PowerRRI | Spec::PowerRRI |
Spec::PowerGGI | Spec::PowerGGI |
Spec::PowerBBI | Spec::PowerBBI |
Spec::PowerRGI | Spec::PowerRGI |
Spec::PowerGBI | Spec::PowerGBI |
Spec::PowerRBI | Spec::PowerRBI |
Spec::Speed |
Spec::SpeedRRI | Spec::SpeedRRI |
Spec::SpeedGGI | Spec::SpeedGGI |
Spec::SpeedBBI | Spec::SpeedBBI |
Spec::SpeedRGI | Spec::SpeedRGI |
Spec::SpeedGBI | Spec::SpeedGBI |
Spec::SpeedRBI => modified + { Spec::SpeedRBI => modified + {
base.pct(self.values().calc_value(player_colours)) base.pct(cmp::min(self.values().calc_multi(construct_colours),
self.values().max_value(player_colours)))
}, },
// Flat bonus
Spec::Life | Spec::Life => modified + self.values().base,
Spec::LifeRRI | Spec::LifeRRI |
Spec::LifeGGI | Spec::LifeGGI |
Spec::LifeBBI | Spec::LifeBBI |
Spec::LifeRGI | Spec::LifeRGI |
Spec::LifeGBI | Spec::LifeGBI |
Spec::LifeRBI => modified + { Spec::LifeRBI => modified + {
construct_colour_total * self.values().calc_value(player_colours) cmp::min(self.values().calc_multi(construct_colours),
self.values().max_value(player_colours))
}, },
} }
} }