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

fix electrocute action order

Browse Source
This commit is contained in:
Mashy 2019-12-20 11:06:33 +10:00
parent 49bf35970b
commit d307241f75
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/skill.rs
View File

@ -1675,12 +1675,6 @@ impl Electrocute {
fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) { fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) {
let amount = game.value(Value::Stat { construct: cast.source, stat: Stat::BluePower }).pct(values.damage_multiplier()); let amount = game.value(Value::Stat { construct: cast.source, stat: Stat::BluePower }).pct(values.damage_multiplier());
game.action(cast,
Action::Remove {
construct: cast.source,
effect: Effect::Electric,
}
);
game.action(cast, game.action(cast,
Action::Effect { Action::Effect {
construct: cast.target, construct: cast.target,
@ -1695,6 +1689,13 @@ fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) {
amount, amount,
}, },
); );
game.action(cast,
Action::Remove {
construct: cast.source,
effect: Effect::Electric,
}
);
} }
fn electrocute_tick(cast: Cast, game: &mut Game) { fn electrocute_tick(cast: Cast, game: &mut Game) {
@ -1853,7 +1854,7 @@ fn link(cast: Cast, game: &mut Game, values: Link) {
Action::Damage { Action::Damage {
construct: cast.target, construct: cast.target,
colour: Colour::Blue, colour: Colour::Blue,
amount: amount, amount,
}, },
); );
} }