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

inc base dmg, reduce health, specs bonuses are purely threshold from team colour

Browse Source
This commit is contained in:
Mashy 2019-09-06 13:40:29 +10:00
parent 849a89ac4e
commit 547127b9eb
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WORKLOG.md
View File

@ -24,7 +24,6 @@
* add speed to descriptions * add speed to descriptions
* clear skill (if currently targetted) * clear skill (if currently targetted)
* increase power to speed up early rounds
* only login / logout / register http * only login / logout / register http

10
server/src/construct.rs
View File

@ -220,13 +220,13 @@ impl Construct {
id, id,
account: id, account: id,
img: Uuid::new_v4(), 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 }, 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 }, 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_power: ConstructStat { base: 320, value: 300, max: 300, stat: Stat::GreenPower },
green_life: ConstructStat { base: 1024, value: 1024, max: 1024, stat: Stat::GreenLife }, green_life: ConstructStat { base: 950, value: 950, max: 950, stat: Stat::GreenLife },
speed: ConstructStat { base: 128, value: 128, max: 128, stat: Stat::Speed }, speed: ConstructStat { base: 100, value: 100, max: 100, stat: Stat::Speed },
// evasion: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::Evasion }, // evasion: ConstructStat { base: 0, value: 0, max: 0, stat: Stat::Evasion },
skills: vec![], skills: vec![],
effects: vec![], effects: vec![],

14
server/src/spec.rs
View File

@ -1,6 +1,5 @@
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 {
@ -29,9 +28,11 @@ impl SpecValues {
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 { pub fn calc_multi (&self, c: &Colours) -> u64 {
self.multi * (c.red + c.green + c.blue) as u64 self.multi * (c.red + c.green + c.blue) as u64
} }
*/
} }
@ -711,10 +712,8 @@ impl Spec {
Spec::SpeedBBPlusPlus | Spec::SpeedBBPlusPlus |
Spec::SpeedRGPlusPlus | Spec::SpeedRGPlusPlus |
Spec::SpeedGBPlusPlus | Spec::SpeedGBPlusPlus |
Spec::SpeedRBPlusPlus => modified + { Spec::SpeedRBPlusPlus => modified + base.pct(self.values().max_value(player_colours)),
base.pct(cmp::min(self.values().calc_multi(construct_colours),
self.values().max_value(player_colours)))
},
// Flat bonus // Flat bonus
Spec::Life => modified + self.values().base, Spec::Life => modified + self.values().base,
Spec::LifeRR| Spec::LifeRR|
@ -734,10 +733,7 @@ impl Spec {
Spec::LifeBBPlusPlus | Spec::LifeBBPlusPlus |
Spec::LifeRGPlusPlus | Spec::LifeRGPlusPlus |
Spec::LifeGBPlusPlus | Spec::LifeGBPlusPlus |
Spec::LifeRBPlusPlus => modified + { Spec::LifeRBPlusPlus => modified + self.values().max_value(player_colours),
cmp::min(self.values().calc_multi(construct_colours),
self.values().max_value(player_colours))
},
} }
} }
} }