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

delete hex (wasn't actually in game)

Browse Source
This commit is contained in:
Mashy 2019-09-16 17:04:41 +10:00
parent a512bcb76c
commit b52b6a5334
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/effect.rs
View File

@ -13,7 +13,6 @@ pub enum Effect {
Sustain, Sustain,
Curse, Curse,
Haste, Haste,
Hex,
Hybrid, Hybrid,
Invert, Invert,
Counter, Counter,
@ -73,9 +72,6 @@ impl Effect {
Effect::Banish => true, Effect::Banish => true,
Effect::Sustain => [ Effect::Sustain => [
Skill::Stun, Skill::Stun,
Skill::Hex,
Skill::HexPlus,
Skill::HexPlusPlus,
Skill::Silence, Skill::Silence,
Skill::SilencePlus, Skill::SilencePlus,
Skill::SilencePlusPlus, Skill::SilencePlusPlus,
@ -97,7 +93,6 @@ impl Effect {
match self { match self {
Effect::Stun => true, Effect::Stun => true,
Effect::Hex => true,
Effect::Banish => true, Effect::Banish => true,
Effect::Silence => skill.colours().contains(&Colour::Blue), Effect::Silence => skill.colours().contains(&Colour::Blue),
Effect::Restrict => skill.colours().contains(&Colour::Red), Effect::Restrict => skill.colours().contains(&Colour::Red),
@ -168,7 +163,6 @@ impl Effect {
Effect::Intercept => Some(Colour::Green), Effect::Intercept => Some(Colour::Green),
// magic // magic
Effect::Hex => Some(Colour::Blue),
Effect::Curse => Some(Colour::Blue), Effect::Curse => Some(Colour::Blue),
Effect::Banish => None, Effect::Banish => None,
// Effect::Banish => rng.gen_bool(0.5), // Effect::Banish => rng.gen_bool(0.5),

15
server/src/item.rs
View File

@ -143,12 +143,6 @@ pub enum Item {
#[serde(rename = "Decay++")] #[serde(rename = "Decay++")]
DecayPlusPlus, DecayPlusPlus,
Hex,
#[serde(rename = "Hex+")]
HexPlus,
#[serde(rename = "Hex++")]
HexPlusPlus,
Haste, Haste,
#[serde(rename = "Haste+")] #[serde(rename = "Haste+")]
HastePlus, HastePlus,
@ -726,12 +720,6 @@ impl Item {
Item::HealPlus | Item::HealPlus |
Item::HealPlusPlus => format!("Heals target for {:?}% GreenPower.", self.into_skill().unwrap().multiplier()), 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::Hybrid|
Item::HybridPlus | Item::HybridPlus |
Item::HybridPlusPlus => format!( Item::HybridPlusPlus => format!(
@ -1066,9 +1054,6 @@ impl From<Skill> for Item {
Skill::Heal => Item::Heal, Skill::Heal => Item::Heal,
Skill::HealPlus => Item::HealPlus, Skill::HealPlus => Item::HealPlus,
Skill::HealPlusPlus => Item::HealPlusPlus, Skill::HealPlusPlus => Item::HealPlusPlus,
Skill::Hex => Item::Hex,
Skill::HexPlus => Item::HexPlus,
Skill::HexPlusPlus => Item::HexPlusPlus,
Skill::Hybrid => Item::Hybrid, Skill::Hybrid => Item::Hybrid,
Skill::HybridPlus => Item::HybridPlus, Skill::HybridPlus => Item::HybridPlus,
Skill::HybridPlusPlus => Item::HybridPlusPlus, Skill::HybridPlusPlus => Item::HybridPlusPlus,