diff --git a/WORKLOG.md b/WORKLOG.md index c1b2d1ee..3489c8da 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -24,7 +24,6 @@ * add speed to descriptions * clear skill (if currently targetted) -* increase power to speed up early rounds * only login / logout / register http diff --git a/server/src/construct.rs b/server/src/construct.rs index 652acb1b..5f2e0bb5 100644 --- a/server/src/construct.rs +++ b/server/src/construct.rs @@ -220,13 +220,13 @@ impl Construct { id, account: id, img: Uuid::new_v4(), - red_power: ConstructStat { base: 256, value: 256, max: 256, stat: Stat::RedPower }, + red_power: ConstructStat { base: 320, value: 320, max: 320, stat: Stat::RedPower }, red_life: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::RedLife }, - blue_power: ConstructStat { base: 256, value: 256, max: 256, stat: Stat::BluePower }, + blue_power: ConstructStat { base: 320, value: 320, max: 320, stat: Stat::BluePower }, blue_life: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::BlueLife }, - green_power: ConstructStat { base: 256, value: 256, max: 256, stat: Stat::GreenPower }, - green_life: ConstructStat { base: 1024, value: 1024, max: 1024, stat: Stat::GreenLife }, - speed: ConstructStat { base: 128, value: 128, max: 128, stat: Stat::Speed }, + green_power: ConstructStat { base: 320, value: 300, max: 300, stat: Stat::GreenPower }, + green_life: ConstructStat { base: 950, value: 950, max: 950, stat: Stat::GreenLife }, + speed: ConstructStat { base: 100, value: 100, max: 100, stat: Stat::Speed }, // evasion: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::Evasion }, skills: vec![], effects: vec![], diff --git a/server/src/spec.rs b/server/src/spec.rs index 0f6b5125..443bdf18 100644 --- a/server/src/spec.rs +++ b/server/src/spec.rs @@ -1,6 +1,5 @@ use construct::{Stat, Colours}; use util::{IntPct}; -use std::cmp; #[derive(Debug,Clone,Serialize,Deserialize)] pub struct SpecBonus { @@ -29,9 +28,11 @@ impl SpecValues { 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 } +*/ } @@ -711,10 +712,8 @@ impl Spec { Spec::SpeedBBPlusPlus | Spec::SpeedRGPlusPlus | Spec::SpeedGBPlusPlus | - Spec::SpeedRBPlusPlus => modified + { - base.pct(cmp::min(self.values().calc_multi(construct_colours), - self.values().max_value(player_colours))) - }, + Spec::SpeedRBPlusPlus => modified + base.pct(self.values().max_value(player_colours)), + // Flat bonus Spec::Life => modified + self.values().base, Spec::LifeRR| @@ -734,10 +733,7 @@ impl Spec { Spec::LifeBBPlusPlus | Spec::LifeRGPlusPlus | Spec::LifeGBPlusPlus | - Spec::LifeRBPlusPlus => modified + { - cmp::min(self.values().calc_multi(construct_colours), - self.values().max_value(player_colours)) - }, + Spec::LifeRBPlusPlus => modified + self.values().max_value(player_colours), } } }