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

hastestrike / hybridblast + triggers (Attack no longer triggers)

Browse Source
This commit is contained in:
Mashy 2019-11-06 17:08:31 +10:00
parent b737d91f58
commit b4a52576d2
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/skill.rs
View File

@ -89,10 +89,15 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
if source.affected(Effect::Haste) { if source.affected(Effect::Haste) {
match skill { match skill {
Skill::Attack | Skill::Slay |
Skill::Slay| Skill::SlayPlus |
Skill::Chaos| Skill::SlayPlusPlus |
Skill::Strike=> { Skill::Chaos |
Skill::ChaosPlus |
Skill::ChaosPlusPlus |
Skill::Strike |
Skill::StrikePlus |
Skill::StrikePlusPlus => {
let amount = source.speed().pct(Skill::HasteStrike.multiplier()); let amount = source.speed().pct(Skill::HasteStrike.multiplier());
target.deal_red_damage(Skill::HasteStrike, amount) target.deal_red_damage(Skill::HasteStrike, amount)
.into_iter() .into_iter()
@ -105,8 +110,14 @@ pub fn resolve(skill: Skill, source: &mut Construct, target: &mut Construct, mut
if source.affected(Effect::Hybrid) { if source.affected(Effect::Hybrid) {
match skill { match skill {
Skill::Blast| Skill::Blast|
Skill::Chaos| Skill::BlastPlus |
Skill::Siphon=> { Skill::BlastPlusPlus |
Skill::Chaos |
Skill::ChaosPlus |
Skill::ChaosPlusPlus |
Skill::Siphon |
Skill::SiphonPlus |
Skill::SiphonPlusPlus => {
let amount = source.green_power().pct(Skill::HybridBlast.multiplier()); let amount = source.green_power().pct(Skill::HybridBlast.multiplier());
target.deal_blue_damage(Skill::HybridBlast, amount) target.deal_blue_damage(Skill::HybridBlast, amount)
.into_iter() .into_iter()