This commit is contained in:
ntr 2019-12-10 12:25:23 +10:00
parent e0ee05ca33
commit 5ad13968d6
3 changed files with 10 additions and 7 deletions

View File

@ -3,6 +3,8 @@
last round of animations skipped cause no skill phase to add new vec last round of animations skipped cause no skill phase to add new vec
ko constructs are still casting ko constructs are still casting
check silence skill multiplier
check for ko in cast_modifier check for ko in cast_modifier
tick skips for triage etc tick skips for triage etc

View File

@ -129,6 +129,7 @@ pub enum Stat {
Speed, Speed,
Cooldowns, Cooldowns,
EffectsCount,
Skills(Colour), Skills(Colour),
} }
@ -496,8 +497,9 @@ impl Construct {
Stat::Speed => self.speed(), Stat::Speed => self.speed(),
Stat::Cooldowns => unimplemented!(), Stat::Cooldowns => self.skills.iter().filter(|cs| cs.cd.is_some()).count(),
Stat::Skills(Colour) => unimplemented!(), Stat::Skills(colour) => self.skills.iter().filter(|cs| cs.skill.colours().contains(&colour)).count(),
Stat::EffectsCount => self.effects.len(),
} }
} }

View File

@ -570,15 +570,14 @@ impl Game {
Value::Fixed { value } => *value, Value::Fixed { value } => *value,
Value::Cooldowns { construct, mult } => unimplemented!(), Value::Cooldowns { construct, mult } =>
self.construct_by_id(*construct).unwrap().stat(Stat::Cooldowns).pct(*mult),
Value::Effects { construct, mult } => Value::Effects { construct, mult } =>
self.construct_by_id(*construct).unwrap().effects.len().pct(*mult), self.construct_by_id(*construct).unwrap().stat(Stat::EffectsCount).pct(*mult),
Value::ColourSkills { construct, colour, mult } => Value::ColourSkills { construct, colour, mult } =>
self.construct_by_id(*construct).unwrap().skills.iter() self.construct_by_id(*construct).unwrap().stat(Stat::Skills(*colour)).pct(*mult),
.filter(|cs| cs.)
.count(),
Value::DamageTaken { construct, colour, mult } => Value::DamageTaken { construct, colour, mult } =>
events.iter().fold(0, |dmg, e| match e { events.iter().fold(0, |dmg, e| match e {