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

move decay dmg to top

Browse Source
This commit is contained in:
ntr 2019-12-11 18:51:58 +10:00
parent 9fefb508f9
commit 89e7b49304
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/game.construct.anim.text.jsx
View File

@ -56,7 +56,7 @@ class AnimText extends preact.Component {
} }
if (type === 'Healing') { if (type === 'Healing') {
const { amount, overhealing, colour } = event; const { amount, overhealing, colour } = event;
return <h1><span class={colour.toLowerCase()}>{amount} ({overhealing}OH)</span></h1>; return <h1><span class={colour.toLowerCase()}>{amount} ({overhealing} OH)</span></h1>;
} }
if (type === 'Inversion') return <h1><span>INVERT</span></h1>; if (type === 'Inversion') return <h1><span>INVERT</span></h1>;
if (type === 'Reflection') return <h1><span>REFLECT</span></h1>; if (type === 'Reflection') return <h1><span>REFLECT</span></h1>;

18
core/src/skill.rs
View File

@ -354,6 +354,11 @@ impl Cast {
], ],
Skill::Decay => vec![ Skill::Decay => vec![
Action::Damage {
construct: self.target,
colour: Colour::Blue,
values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
},
Action::Effect { Action::Effect {
construct: self.target, construct: self.target,
effect: ConstructEffect { effect: Effect::Wither, duration: 3, meta: Some(EffectMeta::Multiplier(50)) }, effect: ConstructEffect { effect: Effect::Wither, duration: 3, meta: Some(EffectMeta::Multiplier(50)) },
@ -367,13 +372,13 @@ impl Cast {
construct: self.target, construct: self.target,
effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks
}, },
],
Skill::DecayPlus => vec![
Action::Damage { Action::Damage {
construct: self.target, construct: self.target,
colour: Colour::Blue, colour: Colour::Blue,
values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }], values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
}, },
],
Skill::DecayPlus => vec![
Action::Effect { Action::Effect {
construct: self.target, construct: self.target,
effect: ConstructEffect { effect: Effect::Wither, duration: 3, meta: Some(EffectMeta::Multiplier(35)) }, effect: ConstructEffect { effect: Effect::Wither, duration: 3, meta: Some(EffectMeta::Multiplier(35)) },
@ -387,13 +392,13 @@ impl Cast {
construct: self.target, construct: self.target,
effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks
}, },
],
Skill::DecayPlusPlus => vec![
Action::Damage { Action::Damage {
construct: self.target, construct: self.target,
colour: Colour::Blue, colour: Colour::Blue,
values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }], values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
}, },
],
Skill::DecayPlusPlus => vec![
Action::Effect { Action::Effect {
construct: self.target, construct: self.target,
effect: ConstructEffect { effect: Effect::Wither, duration: 4, meta: Some(EffectMeta::Multiplier(20)) }, effect: ConstructEffect { effect: Effect::Wither, duration: 4, meta: Some(EffectMeta::Multiplier(20)) },
@ -407,11 +412,6 @@ impl Cast {
construct: self.target, construct: self.target,
effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks effect: ConstructEffect { effect: Effect::Decayed, duration: 1, meta: None }, // immunity to additional ticks
}, },
Action::Damage {
construct: self.target,
colour: Colour::Blue,
values: vec![Value::Stat { construct: self.source, stat: Stat::BluePower, mult: self.skill.multiplier() }],
},
], ],
Skill::DecayTick | Skill::DecayTick |
Skill::DecayTickPlus | Skill::DecayTickPlus |