diff --git a/client/src/utils.jsx b/client/src/utils.jsx index dc1ef701..f46adc23 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -65,10 +65,10 @@ const STATS = { }; const SPECS = { - GreenLife: { colour: 'green', caption: 'Life', svg: shapes.square }, + Life: { colour: 'white', caption: 'Life', svg: shapes.square }, + GreenLifeI: { colour: 'green', caption: 'Life', svg: shapes.square }, RedLifeI: { colour: 'red', caption: 'Life', svg: shapes.square }, BlueLifeI: { colour: 'blue', caption: 'Life', svg: shapes.square }, - LifeI: { colour: 'green', caption: 'Life', svg: shapes.square }, LRSI: { colour: 'yellow', caption: 'Life', svg: shapes.square }, LBSI: { colour: 'cyan', caption: 'Life', svg: shapes.square }, RBSI: { colour: 'purple', caption: 'Life', svg: shapes.square }, diff --git a/server/src/skill.rs b/server/src/skill.rs index 620eb4fd..e5745a9d 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -63,7 +63,7 @@ pub fn resolve(skill: Skill, source: &mut Cryp, target: &mut Cryp, mut resolutio Skill::Reflect => reflect(source, target, resolutions), Skill::Riposte => panic!("riposte should not be caste"), Skill::Ruin => ruin(source, target, resolutions), - Skill::Life => shield(source, target, resolutions), // target is immune to magic damage and fx + Skill::Shield => shield(source, target, resolutions), // target is immune to magic damage and fx Skill::Silence => silence(source, target, resolutions), // target cannot cast spells Skill::Siphon => siphon(source, target, resolutions), Skill::SiphonTick => siphon_tick(source, target, resolutions), // hot @@ -261,7 +261,7 @@ pub enum Effect { Hatred, // magic immunity - Life, + Shield, // effects over time Triage, @@ -283,7 +283,7 @@ impl Effect { Category::Red => true, _ => false, }, - Effect::Life => match skill.category() { + Effect::Shield => match skill.category() { Category::Blue => true, Category::Red => false, _ => false, @@ -416,7 +416,7 @@ impl Effect { Effect::Hostility => Category::BlueBuff, // magic immunity - Effect::Life => Category::BlueBuff, + Effect::Shield => Category::BlueBuff, Effect::Invert => Category::GreenBuff, // effects over time @@ -470,7 +470,7 @@ impl Effect { Effect::Corrupt => 2, Effect::Corruption => 3, - Effect::Life => 2, + Effect::Shield => 2, Effect::Triage => 3, Effect::Decay => 3, @@ -564,7 +564,7 @@ pub enum Skill { // Purity // ----------------- Empower, - Life, + Shield, Silence, Purify, Purge, @@ -608,7 +608,7 @@ impl Skill { Skill::SiphonTick => None, Skill::Curse => Some(1), Skill::Empower => Some(1), - Skill::Life => None, + Skill::Shield => None, Skill::Silence => Some(1), Skill::Purify => None, Skill::Purge => None, @@ -663,7 +663,7 @@ impl Skill { Skill::TriageTick => Category::GreenTick, // hot Skill::Throw => Category::Green, Skill::Empower => Category::Green, - Skill::Life => Category::Green, + Skill::Shield => Category::Green, Skill::Purify => Category::Green, Skill::Recharge => Category::Green, Skill::Reflect => Category::Green, @@ -1063,8 +1063,8 @@ fn siphon_tick(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) - } fn shield(source: &mut Cryp, target: &mut Cryp, mut results: Resolutions) -> Resolutions { - let shield = CrypEffect::new(Effect::Life); - results.push(Resolution::new(source, target).event(target.add_effect(Skill::Life, shield))); + let shield = CrypEffect::new(Effect::Shield); + results.push(Resolution::new(source, target).event(target.add_effect(Skill::Shield, shield))); return results; } @@ -1485,7 +1485,7 @@ mod tests { // // ----------------- // Empower, // Slay, -// Life, +// Shield, // Silence, // Inquiry, // Purify, diff --git a/server/src/vbox.rs b/server/src/vbox.rs index de1aead3..98b53a51 100644 --- a/server/src/vbox.rs +++ b/server/src/vbox.rs @@ -198,7 +198,7 @@ impl Var { Var::Recharge => Some(Skill::Recharge), Var::Reflect => Some(Skill::Reflect), Var::Ruin => Some(Skill::Ruin), - Var::Life => Some(Skill::Life), + Var::Shield => Some(Skill::Shield), Var::Silence => Some(Skill::Silence), // Var::Slay => Some(Skill::Slay), Var::Slow => Some(Skill::Slow), @@ -268,7 +268,7 @@ impl From for Var { Skill::Recharge => Var::Recharge, Skill::Reflect => Var::Reflect, Skill::Ruin => Var::Ruin, - Skill::Life => Var::Life, + Skill::Shield => Var::Shield, Skill::Silence => Var::Silence, Skill::Siphon => Var::Siphon, Skill::Slow => Var::Slow,