diff --git a/client/src/components/anims/sleep.jsx b/client/src/components/anims/sleep.jsx index ba861d46..60d51982 100644 --- a/client/src/components/anims/sleep.jsx +++ b/client/src/components/anims/sleep.jsx @@ -83,7 +83,7 @@ class Sleep extends Component { rotate: 180, easing: 'linear', loop: true, - duration: TIMES.TARGET_DURATION_MS + TIMES.POST_SKILL_DURATION_MS, + duration: TIMES.TARGET_DURATION_MS, })); this.animations.push(anime({ @@ -97,7 +97,7 @@ class Sleep extends Component { this.animations.push(anime({ targets: ['#charges'], opacity: 1, - delay: anime.stagger(TIMES.TARGET_DURATION_MS * 0.015, { start: TIMES.TARGET_DELAY_MS }), + delay: anime.stagger(TIMES.TARGET_DURATION_MS * 0.01), easing: 'easeInOutSine', })); diff --git a/core/src/skill.rs b/core/src/skill.rs index b75ddeca..6599ba96 100644 --- a/core/src/skill.rs +++ b/core/src/skill.rs @@ -1309,19 +1309,19 @@ impl Absorption { fn absorption(cast: Cast, game: &mut Game, values: Absorption) { game.action(cast, Action::Remove { - construct: cast.source, + construct: cast.target, effect: Effect::Absorb, } ); game.action(cast, Action::Effect { - construct: cast.source, + construct: cast.target, effect: ConstructEffect { effect: Effect::Absorption, duration: values.duration(), meta: Some(EffectMeta::AddedDamage(0)) }, } ); game.action(cast, Action::SetEffectMeta { - construct: cast.source, + construct: cast.target, effect: Effect::Absorption, amount: game.value(Value::DamageReceived { construct: cast.source, colour: Colour::Blue }).pct(100), }, @@ -1580,12 +1580,13 @@ impl 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()); game.action(cast, - Action::Damage { + Action::Effect { construct: cast.target, - colour: Colour::Blue, - amount, + effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta: + Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) }, } ); + game.action(cast, Action::Effect { construct: cast.target, @@ -1596,13 +1597,15 @@ fn decay(cast: Cast, game: &mut Game, values: Decay) { }, } ); + game.action(cast, - Action::Effect { + Action::Damage { construct: cast.target, - effect: ConstructEffect { effect: Effect::Decay, duration: values.decay_duration(), meta: - Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::DecayTick, speed: cast.speed, amount }) }, + colour: Colour::Blue, + amount, } ); + game.action(cast, Action::Effect { construct: cast.target, @@ -1685,7 +1688,7 @@ fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) { game.action(cast, Action::Remove { construct: cast.source, - effect: Effect::Electric, + effect: Effect::Electrocute, } ); game.action(cast,