diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a58fa60..5195fed7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ - Purify - Now removes all effects on target - - Applies "Purified" increasing healing taken + - Applies "Pure" increasing healing taken - Purge - Now removes all effects on target diff --git a/client/src/utils.jsx b/client/src/utils.jsx index c23e9012..a14c684e 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -282,7 +282,7 @@ function effectInfo(i) { case 'Restrict': return 'Disable construct from casting any red skills'; case 'Stun': return 'Stunned construct cannot use skills'; case 'Intercept': return 'Redirect any skills on team to this target construct'; - case 'Purified': return `Construct will take ${i.meta[1] - 100}% increased healing`; + case 'Pure': return `Construct will take ${i.meta[1] - 100}% increased healing`; 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`; // diff --git a/server/src/effect.rs b/server/src/effect.rs index 77d110f9..e1a87604 100644 --- a/server/src/effect.rs +++ b/server/src/effect.rs @@ -16,7 +16,7 @@ pub enum Effect { Hybrid, Intercept, Invert, - Purified, + Pure, Purge, Reflect, Restrict, @@ -104,7 +104,7 @@ impl Effect { Effect::Block => vec![Stat::RedDamageTaken, Stat::BlueDamageTaken], Effect::Buff => vec![Stat::BluePower, Stat::RedPower, Stat::Speed], Effect::Slow => vec![Stat::Speed], - + // Power changes Effect::Absorption => vec![Stat::RedPower, Stat::BluePower], Effect::Amplify => vec![Stat::RedPower, Stat::BluePower], @@ -112,7 +112,7 @@ impl Effect { // Damage taken changes Effect::Curse => vec![Stat::RedDamageTaken, Stat::BlueDamageTaken], - Effect::Purified => vec![Stat::GreenDamageTaken], // increased green taken + Effect::Pure => vec![Stat::GreenDamageTaken], // increased green taken Effect::Vulnerable => vec![Stat::RedDamageTaken], Effect::Wither => vec![Stat::GreenDamageTaken], // reduced green taken @@ -133,7 +133,7 @@ impl Effect { Effect::Haste | Effect::Slow | Effect::Hybrid | - Effect::Purified | + Effect::Pure | Effect::Wither => value.pct(match meta { Some(EffectMeta::Multiplier(d)) => d, _ => 100, @@ -194,7 +194,7 @@ impl Effect { Effect::Decay => Some(Colour::Blue), Effect::Regen => Some(Colour::Green), Effect::Siphon => Some(Colour::Blue), - Effect::Purified => Some(Colour::Green), + Effect::Pure => Some(Colour::Green), Effect::Ko => None, } diff --git a/server/src/item.rs b/server/src/item.rs index 4903ec00..72639073 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -832,7 +832,7 @@ impl Item { Item::PurifyPlus | Item::PurifyPlusPlus => format!( "Remove all effects and heals for {:?}% GreenPower per effect removed. - Applies Purified increasing healing taken by {:?}%.", + Applies Pure increasing healing taken by {:?}%.", self.into_skill().unwrap().multiplier(), self.into_skill().unwrap().effect()[0].get_multiplier() - 100), diff --git a/server/src/names.rs b/server/src/names.rs index 16f0dfcc..07cc6ff0 100644 --- a/server/src/names.rs +++ b/server/src/names.rs @@ -44,7 +44,7 @@ const FIRSTS: [&'static str; 53] = [ "orbiting", "piscine", "polar", - "purified", + "pure", "recalcitrant", "rogue", "sealed", diff --git a/server/src/skill.rs b/server/src/skill.rs index cc700cd6..ec67ed14 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -853,7 +853,7 @@ impl Skill { Skill::HybridBlast => 50, Skill::HasteStrike => 60, - + Skill::Absorb=> 95, Skill::AbsorbPlus => 120, Skill::AbsorbPlusPlus => 155, @@ -1028,11 +1028,11 @@ impl Skill { Skill::TriagePlusPlus => vec![ConstructEffect {effect: Effect::Triage, duration: 4, meta: Some(EffectMeta::Skill(Skill::TriageTickPlusPlus)), tick: None}], - Skill::Purify => vec![ConstructEffect { effect: Effect::Purified, duration: 2, + Skill::Purify => vec![ConstructEffect { effect: Effect::Pure, duration: 2, meta: Some(EffectMeta::Multiplier(150)), tick: None}], - Skill::PurifyPlus => vec![ConstructEffect { effect: Effect::Purified, duration: 2, + Skill::PurifyPlus => vec![ConstructEffect { effect: Effect::Pure, duration: 2, meta: Some(EffectMeta::Multiplier(175)), tick: None}], - Skill::PurifyPlusPlus => vec![ConstructEffect { effect: Effect::Purified, duration: 2, + Skill::PurifyPlusPlus => vec![ConstructEffect { effect: Effect::Pure, duration: 2, meta: Some(EffectMeta::Multiplier(200)), tick: None}], _ => { @@ -1052,7 +1052,7 @@ impl Skill { Skill::Strike=> None, Skill::StrikePlus => None, Skill::StrikePlusPlus => None, - + Skill::Counter| Skill::CounterPlus | Skill::CounterPlusPlus => None, // avoid all damage @@ -1800,7 +1800,7 @@ fn siphon_tick(source: &mut Construct, target: &mut Construct, mut results: Reso fn link(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions { results.push(Resolution::new(source, target).event(target.add_effect(skill, skill.effect()[0]))); - + let amount = source.blue_power().pct(skill.multiplier().saturating_mul(target.effects.len() as u64)); target.deal_blue_damage(skill, amount) .into_iter()