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

link description & cleanup

Browse Source
This commit is contained in:
Mashy 2019-09-16 15:25:21 +10:00
parent de17035ff7
commit 6045a77bb6
2 changed files with 179 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/effect.rs
View File

@ -38,7 +38,6 @@ pub enum Effect {
Absorption, Absorption,
// magic immunity // magic immunity
Link,
// effects over time // effects over time
Triage, Triage,
@ -125,8 +124,6 @@ impl Effect {
Effect::Haste => vec![Stat::Speed], Effect::Haste => vec![Stat::Speed],
Effect::Slow => vec![Stat::Speed], Effect::Slow => vec![Stat::Speed],
Effect::Link => vec![Stat::BlueDamageTaken, Stat::GreenDamageTaken, Stat::RedDamageTaken],
_ => vec![], _ => vec![],
} }
} }
@ -146,8 +143,6 @@ impl Effect {
_ => 100, _ => 100,
}), }),
Effect::Link => value >> 1,
Effect::Absorption => value + match meta { Effect::Absorption => value + match meta {
Some(EffectMeta::AddedDamage(d)) => d, Some(EffectMeta::AddedDamage(d)) => d,
_ => panic!("absorb meta not damage"), _ => panic!("absorb meta not damage"),
@ -194,7 +189,6 @@ impl Effect {
// magic // magic
Effect::Hybrid => Some(Colour::Green), Effect::Hybrid => Some(Colour::Green),
Effect::Link => Some(Colour::Green),
Effect::Invert => Some(Colour::Green), Effect::Invert => Some(Colour::Green),
// effects over time // effects over time

21
server/src/item.rs
View File

@ -785,9 +785,11 @@ impl Item {
Item::Link| Item::Link|
Item::LinkPlus | Item::LinkPlus |
Item::LinkPlusPlus => format!( Item::LinkPlusPlus => format!(
"Caster links with target. Linked constructs split incoming Damage evenly. "Form a link with target swapping relative life values.
Recharges target BlueLife based on {:?}% of BluePower", If the target construct has more green life than caster, {:?}% of green life difference as blue damage to the target and heal to the caster.
self.into_skill().unwrap().multiplier()), Stuns caster for {:?}T in the process.",
self.into_skill().unwrap().multiplier(),
self.into_skill().unwrap().effect()[0].get_duration()),
Item::Silence| Item::Silence|
Item::SilencePlus | Item::SilencePlus |
@ -813,10 +815,9 @@ impl Item {
Item::Restrict| Item::Restrict|
Item::RestrictPlus | Item::RestrictPlus |
Item::RestrictPlusPlus => format!( Item::RestrictPlusPlus => format!(
"Block the target from using red skills for {:?}T and deals {:?}% RedPower as red damage. {}", "Block the target from using red skills for {:?}T and deals {:?}% RedPower as red damage. Deals 35% more damage per red skill on target",
self.into_skill().unwrap().effect()[0].get_duration(), self.into_skill().unwrap().effect()[0].get_duration(),
self.into_skill().unwrap().multiplier(), self.into_skill().unwrap().multiplier()),
"Deals 35% more damage per red skill on target"),
Item::Bash| Item::Bash|
Item::BashPlus | Item::BashPlus |
@ -998,22 +999,18 @@ impl Item {
Item::LifeGBPlusPlus => vec![Item::LifeGBPlus, Item::LifeGBPlus, Item::LifeGBPlus], Item::LifeGBPlusPlus => vec![Item::LifeGBPlus, Item::LifeGBPlus, Item::LifeGBPlus],
Item::LifeRBPlusPlus => vec![Item::LifeRBPlus, Item::LifeRBPlus, Item::LifeRBPlus], Item::LifeRBPlusPlus => vec![Item::LifeRBPlus, Item::LifeRBPlus, Item::LifeRBPlus],
Item::SpeedRR => vec![Item::Speed, Item::Red, Item::Red], Item::SpeedRR => vec![Item::Speed, Item::Red, Item::Red],
Item::SpeedGG => vec![Item::Speed, Item::Green, Item::Green], Item::SpeedGG => vec![Item::Speed, Item::Green, Item::Green],
Item::SpeedBB => vec![Item::Speed, Item::Blue, Item::Blue], Item::SpeedBB => vec![Item::Speed, Item::Blue, Item::Blue],
Item::SpeedRG => vec![Item::Speed, Item::Red, Item::Green], Item::SpeedRG => vec![Item::Speed, Item::Red, Item::Green],
Item::SpeedGB => vec![Item::Speed, Item::Green, Item::Blue], Item::SpeedGB => vec![Item::Speed, Item::Green, Item::Blue],
Item::SpeedRB => vec![Item::Speed, Item::Red, Item::Blue], Item::SpeedRB => vec![Item::Speed, Item::Red, Item::Blue],
Item::SpeedRRPlus => vec![Item::SpeedRR, Item::SpeedRR, Item::SpeedRR], Item::SpeedRRPlus => vec![Item::SpeedRR, Item::SpeedRR, Item::SpeedRR],
Item::SpeedGGPlus => vec![Item::SpeedGG, Item::SpeedGG, Item::SpeedGG], Item::SpeedGGPlus => vec![Item::SpeedGG, Item::SpeedGG, Item::SpeedGG],
Item::SpeedBBPlus => vec![Item::SpeedBB, Item::SpeedBB, Item::SpeedBB], Item::SpeedBBPlus => vec![Item::SpeedBB, Item::SpeedBB, Item::SpeedBB],
Item::SpeedRGPlus => vec![Item::SpeedRG, Item::SpeedRG, Item::SpeedRG], Item::SpeedRGPlus => vec![Item::SpeedRG, Item::SpeedRG, Item::SpeedRG],
Item::SpeedGBPlus => vec![Item::SpeedGB, Item::SpeedGB, Item::SpeedGB], Item::SpeedGBPlus => vec![Item::SpeedGB, Item::SpeedGB, Item::SpeedGB],
Item::SpeedRBPlus => vec![Item::SpeedRB, Item::SpeedRB, Item::SpeedRB], Item::SpeedRBPlus => vec![Item::SpeedRB, Item::SpeedRB, Item::SpeedRB],
Item::SpeedRRPlusPlus => vec![Item::SpeedRRPlus, Item::SpeedRRPlus, Item::SpeedRRPlus], Item::SpeedRRPlusPlus => vec![Item::SpeedRRPlus, Item::SpeedRRPlus, Item::SpeedRRPlus],
Item::SpeedGGPlusPlus => vec![Item::SpeedGGPlus, Item::SpeedGGPlus, Item::SpeedGGPlus], Item::SpeedGGPlusPlus => vec![Item::SpeedGGPlus, Item::SpeedGGPlus, Item::SpeedGGPlus],
Item::SpeedBBPlusPlus => vec![Item::SpeedBBPlus, Item::SpeedBBPlus, Item::SpeedBBPlus], Item::SpeedBBPlusPlus => vec![Item::SpeedBBPlus, Item::SpeedBBPlus, Item::SpeedBBPlus],
@ -1062,7 +1059,7 @@ impl From<Skill> for Item {
Skill::DecayPlusPlus => Item::DecayPlusPlus, Skill::DecayPlusPlus => Item::DecayPlusPlus,
Skill::Electrify => Item::Electrify, Skill::Electrify => Item::Electrify,
Skill::ElectrifyPlus => Item::ElectrifyPlus, Skill::ElectrifyPlus => Item::ElectrifyPlus,
Skill::ElectrifyPlusPlus => Item::ElectrifyPlusPlus, Skill::ElectrifyPlusPlus=> Item::ElectrifyPlusPlus,
Skill::Haste => Item::Haste, Skill::Haste => Item::Haste,
Skill::HastePlus => Item::HastePlus, Skill::HastePlus => Item::HastePlus,
Skill::HastePlusPlus => Item::HastePlusPlus, Skill::HastePlusPlus => Item::HastePlusPlus,
@ -1077,7 +1074,7 @@ impl From<Skill> for Item {
Skill::HybridPlusPlus => Item::HybridPlusPlus, Skill::HybridPlusPlus => Item::HybridPlusPlus,
Skill::Intercept => Item::Intercept, Skill::Intercept => Item::Intercept,
Skill::InterceptPlus => Item::InterceptPlus, Skill::InterceptPlus => Item::InterceptPlus,
Skill::InterceptPlusPlus => Item::InterceptPlusPlus, Skill::InterceptPlusPlus=> Item::InterceptPlusPlus,
Skill::Invert => Item::Invert, Skill::Invert => Item::Invert,
Skill::InvertPlus => Item::InvertPlus, Skill::InvertPlus => Item::InvertPlus,
Skill::InvertPlusPlus => Item::InvertPlusPlus, Skill::InvertPlusPlus => Item::InvertPlusPlus,