diff --git a/client/src/utils.jsx b/client/src/utils.jsx index 349679c5..b2c715fb 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -241,30 +241,15 @@ function convertItem(v) { function effectInfo(i) { // FIX ME - return 'effect info to be fixed'; - - /*const hybridBlast = 25; + const hybridBlast = 25; const hasteStrike = 30; function multiplier(s) { // Update later to use server info in future - if (s === 'CounterAttack') return 120; - if (s === 'CounterAttack+') return 160; - if (s === 'CounterAttack++') return 230; - - if (s === 'DecayTick') return 33; - if (s === 'DecayTick+') return 45; - if (s === 'DecayTick++') return 70; - - if (s === 'SiphonTick') return 25; - if (s === 'SiphonTick+') return 30; - if (s === 'SiphonTick++') return 40; - - if (s === 'TriageTick') return 75; - if (s === 'TriageTick+') return 110; - if (s === 'TriageTick++') return 140; - - if (s === 'Electrocute' || s === 'ElectrocuteTick') return 80; - if (s === 'Electrocute+' || s === 'ElectrocuteTick+') return 100; - if (s === 'Electrocute++' || s === 'ElectrocuteTick++') return 130; + if (s === 'CounterAttack') return 115; + if (s === 'CounterAttack+') return 130; + if (s === 'CounterAttack++') return 160; + if (s === 'Electrocute') return 80; + if (s === 'Electrocute+') return 90; + if (s === 'Electrocute++') return 100; return 0; } @@ -289,16 +274,16 @@ function effectInfo(i) { case 'Vulnerable': return `Construct will take ${i.meta[1] - 100}% increased red damage`; case 'Silence': return 'Disable construct from casting any blue skills'; case 'Wither': return `Construct will take ${100 - i.meta[1]}% reduced healing`; // - case 'Decay': return `Construct will take ${multiplier(i.tick.skill)}% of caster's BluePower as blue damage each turn.`; // + case 'Decay': return `Construct will take ${i.meta[1].amount} blue damage each turn.`; // case 'Electric': return `Attacks against this construct will apply Electrocute dealing ${multiplier(i.meta[1])}% of construct BluePower as blue damage each turn.`; - case 'Electrocute': return `Construct will take ${multiplier(i.tick.skill)}% of caster's BluePower as blue damage each turn.`; + case 'Electrocute': return `Construct will take ${i.meta[1].amount} blue damage each turn.`; case 'Absorb': return 'If construct takes damage, Absorption will be applied increasing RedPower and BluePower based on damage taken.'; case 'Absorption': return `Increasing construct RedPower and BluePower by ${i.meta[1]}`; - case 'Triage': return `Construct will be healed for ${multiplier(i.tick.skill)}% of caster's GreenPower each turn.`; - case 'Siphon': return `Construct will take ${multiplier(i.tick.skill)}% of caster's BluePower + GreenPower as blue damage each turn, healing the caster.`; + case 'Triage': return `Construct will be healed for ${i.meta[1].amount} green life each turn.`; + case 'Siphon': return `Construct will take ${i.meta[1].amount} blue damage each turn, healing the caster.`; default: return 'Missing Effect Text'; - }*/ + } } module.exports = { diff --git a/core/src/skill.rs b/core/src/skill.rs index 6599ba96..8360e8dc 100644 --- a/core/src/skill.rs +++ b/core/src/skill.rs @@ -1688,13 +1688,13 @@ fn electrocute(cast: Cast, game: &mut Game, values: Electrocute) { game.action(cast, Action::Remove { construct: cast.source, - effect: Effect::Electrocute, + effect: Effect::Electric, } ); game.action(cast, Action::Effect { construct: cast.target, - effect: ConstructEffect { effect: Effect::Electric, duration: values.duration(), meta: + effect: ConstructEffect { effect: Effect::Electrocute, duration: values.duration(), meta: Some(EffectMeta::CastTick { source: cast.source, target: cast.target, skill: Skill::ElectrocuteTick, speed: cast.speed, amount }) }, }, );