diff --git a/server/src/effect.rs b/server/src/effect.rs index b9489a2a..5b3d6bba 100644 --- a/server/src/effect.rs +++ b/server/src/effect.rs @@ -13,7 +13,6 @@ pub enum Effect { Sustain, Curse, Haste, - Hex, Hybrid, Invert, Counter, @@ -73,9 +72,6 @@ impl Effect { Effect::Banish => true, Effect::Sustain => [ Skill::Stun, - Skill::Hex, - Skill::HexPlus, - Skill::HexPlusPlus, Skill::Silence, Skill::SilencePlus, Skill::SilencePlusPlus, @@ -97,7 +93,6 @@ impl Effect { match self { Effect::Stun => true, - Effect::Hex => true, Effect::Banish => true, Effect::Silence => skill.colours().contains(&Colour::Blue), Effect::Restrict => skill.colours().contains(&Colour::Red), @@ -168,7 +163,6 @@ impl Effect { Effect::Intercept => Some(Colour::Green), // magic - Effect::Hex => Some(Colour::Blue), Effect::Curse => Some(Colour::Blue), Effect::Banish => None, // Effect::Banish => rng.gen_bool(0.5), diff --git a/server/src/item.rs b/server/src/item.rs index 3d6e2d2f..928a2850 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -143,12 +143,6 @@ pub enum Item { #[serde(rename = "Decay++")] DecayPlusPlus, - Hex, - #[serde(rename = "Hex+")] - HexPlus, - #[serde(rename = "Hex++")] - HexPlusPlus, - Haste, #[serde(rename = "Haste+")] HastePlus, @@ -726,12 +720,6 @@ impl Item { Item::HealPlus | Item::HealPlusPlus => format!("Heals target for {:?}% GreenPower.", self.into_skill().unwrap().multiplier()), - Item::Hex| - Item::HexPlus | - Item::HexPlusPlus => format!("Blue based skill that applies Hex for {:?}T. \ - Hexed targets cannot cast any skills.", - self.into_skill().unwrap().effect()[0].get_duration()), - Item::Hybrid| Item::HybridPlus | Item::HybridPlusPlus => format!( @@ -1066,9 +1054,6 @@ impl From for Item { Skill::Heal => Item::Heal, Skill::HealPlus => Item::HealPlus, Skill::HealPlusPlus => Item::HealPlusPlus, - Skill::Hex => Item::Hex, - Skill::HexPlus => Item::HexPlus, - Skill::HexPlusPlus => Item::HexPlusPlus, Skill::Hybrid => Item::Hybrid, Skill::HybridPlus => Item::HybridPlus, Skill::HybridPlusPlus => Item::HybridPlusPlus,