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

electrocute effect, move decay effect first

Browse Source
This commit is contained in:
Mashy 2019-12-18 16:44:53 +10:00
parent 90bffcb6b7
commit 388cf2400c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/skill.rs
View File

@ -1580,12 +1580,13 @@ impl Decay {
fn decay(cast: Cast, game: &mut Game, values: Decay) { fn decay(cast: Cast, game: &mut Game, values: Decay) {
let amount = game.value(Value::Stat { construct: cast.source, stat: Stat::BluePower }).pct(values.decay_dmg_multiplier()); let amount = game.value(Value::Stat { construct: cast.source, stat: Stat::BluePower }).pct(values.decay_dmg_multiplier());
game.action(cast, game.action(cast,
Action::Damage { Action::Effect {
construct: cast.target, construct: cast.target,
colour: Colour::Blue, effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta:
amount, Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) },
} }
); );
game.action(cast, game.action(cast,
Action::Effect { Action::Effect {
construct: cast.target, construct: cast.target,
@ -1596,13 +1597,15 @@ fn decay(cast: Cast, game: &mut Game, values: Decay) {
}, },
} }
); );
game.action(cast, game.action(cast,
Action::Effect { Action::Damage {
construct: cast.target, construct: cast.target,
effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta: colour: Colour::Blue,
Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) }, amount,
} }
); );
game.action(cast, game.action(cast,
Action::Effect { Action::Effect {
construct: cast.target, construct: cast.target,
@ -1685,7 +1688,7 @@ fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) {
game.action(cast, game.action(cast,
Action::Remove { Action::Remove {
construct: cast.source, construct: cast.source,
effect: Effect::Electric, effect: Effect::Electrocute,
} }
); );
game.action(cast, game.action(cast,