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

Merge branch 'tos' into release/1.5.4

Browse Source
This commit is contained in:
ntr
2019-10-10 15:33:24 +11:00
parent 5e41789f52 7c81fd1e32
commit d8adff0203
7 changed files with 1127 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/skill.rs
+7 -7
View File
@@ -294,7 +294,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) ->
match event {
Event::Damage { amount, skill, mitigation: _, colour: c } => {
if target.affected(Effect::Electric) {
if target.affected(Effect::Electric) && !skill.is_tick() {
let ConstructEffect { effect: _, duration: _, meta, tick: _ } = target.effects.iter()
.find(|e| e.effect == Effect::Electric).unwrap().clone();
match meta {
@@ -786,9 +786,9 @@ impl Skill {
Skill::ReflectPlus => 70,
Skill::ReflectPlusPlus => 100,
Skill::Recharge=> 85, //Recharge red and blue life (heal)
Skill::RechargePlus => 130,
Skill::RechargePlusPlus => 200,
Skill::Recharge=> 70, //Recharge red and blue life (heal)
Skill::RechargePlus => 110,
Skill::RechargePlusPlus => 170,
Skill::Sustain => 120, // Recharge red life (heal)
Skill::SustainPlus => 150,
@@ -907,9 +907,9 @@ impl Skill {
Skill::AbsorbPlusPlus => vec![ConstructEffect {effect: Effect::Absorb, duration: 4,
meta: Some(EffectMeta::Skill(Skill::AbsorptionPlusPlus)), tick: None}],
Skill::Absorption => vec![ConstructEffect {effect: Effect::Absorption, duration: 5, meta: None, tick: None}],
Skill::AbsorptionPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 7, meta: None, tick: None}],
Skill::AbsorptionPlusPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 9, meta: None, tick: None}],
Skill::Absorption => vec![ConstructEffect {effect: Effect::Absorption, duration: 3, meta: None, tick: None}],
Skill::AbsorptionPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 5, meta: None, tick: None}],
Skill::AbsorptionPlusPlus => vec![ConstructEffect {effect: Effect::Absorption, duration: 7, meta: None, tick: None}],
Skill::Hybrid => vec![ConstructEffect {effect: Effect::Hybrid, duration: 2,
meta: Some(EffectMeta::Multiplier(150)), tick: None }],