diff --git a/server/src/events.rs b/server/src/events.rs index ca1ce5af..da9fe692 100644 --- a/server/src/events.rs +++ b/server/src/events.rs @@ -132,12 +132,12 @@ impl Events { }, Event::Subscribe(id, obj) => { - info!("subscribe id={:?} object={:?}", id, obj); + trace!("subscribe id={:?} object={:?}", id, obj); match self.clients.get_mut(&id) { Some(client) => { client.subs.insert(obj); - info!("client={:?} subscriptions={:?}", id, client.subs.len()); + trace!("client={:?} subscriptions={:?}", id, client.subs.len()); Ok(()) }, None => return Err(format_err!("unknown client {:?}", id)) @@ -145,12 +145,12 @@ impl Events { }, Event::Unsubscribe(id, obj) => { - info!("unsubscribe id={:?} object={:?}", id, obj); + trace!("unsubscribe id={:?} object={:?}", id, obj); match self.clients.get_mut(&id) { Some(mut client) => { client.subs.remove(&obj); - info!("unsubscribe subscriptions removed={:?}", client.subs.len()); + trace!("unsubscribe subscriptions removed={:?}", client.subs.len()); Ok(()) }, None => return Err(format_err!("unknown client {:?}", id)) @@ -158,7 +158,7 @@ impl Events { }, Event::Push(id, msg) => { - info!("push id={:?}", id); + trace!("push id={:?}", id); let mut subs = 0; let mut dead = vec![]; @@ -177,11 +177,11 @@ impl Events { } if !dead.is_empty() { - info!("dead connections={:?}", dead.len()); + trace!("dead connections={:?}", dead.len()); dead.iter().for_each(|id| self.remove_client(*id)); } - info!("push subscribers={:?}", subs); + trace!("push subscribers={:?}", subs); Ok(()) }, diff --git a/server/src/skill.rs b/server/src/skill.rs index abd132a4..04fd4d4f 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -503,181 +503,181 @@ pub enum Skill { AmplifyPlus, #[serde(rename = "Amplify++")] AmplifyPlusPlus, - + Absorb, #[serde(rename = "Absorb+")] AbsorbPlus, #[serde(rename = "Absorb++")] AbsorbPlusPlus, - + Banish, #[serde(rename = "Banish+")] BanishPlus, #[serde(rename = "Banish++")] BanishPlusPlus, - + Bash, #[serde(rename = "Bash+")] BashPlus, #[serde(rename = "Bash++")] BashPlusPlus, - + Blast, #[serde(rename = "Blast+")] BlastPlus, #[serde(rename = "Blast++")] BlastPlusPlus, - + Chaos, #[serde(rename = "Chaos+")] ChaosPlus, #[serde(rename = "Chaos++")] ChaosPlusPlus, - + Sustain, #[serde(rename = "Sustain+")] SustainPlus, #[serde(rename = "Sustain++")] SustainPlusPlus, - + Electrify, #[serde(rename = "Electrify+")] ElectrifyPlus, #[serde(rename = "Electrify++")] ElectrifyPlusPlus, - + Curse, #[serde(rename = "Curse+")] CursePlus, #[serde(rename = "Curse++")] CursePlusPlus, - + Decay, #[serde(rename = "Decay+")] DecayPlus, #[serde(rename = "Decay++")] DecayPlusPlus, - + Hex, #[serde(rename = "Hex+")] HexPlus, #[serde(rename = "Hex++")] HexPlusPlus, - + Haste, #[serde(rename = "Haste+")] HastePlus, #[serde(rename = "Haste++")] HastePlusPlus, - + Heal, #[serde(rename = "Heal+")] HealPlus, #[serde(rename = "Heal++")] HealPlusPlus, - + Hybrid, #[serde(rename = "Hybrid+")] HybridPlus, #[serde(rename = "Hybrid++")] HybridPlusPlus, - + Invert, #[serde(rename = "Invert+")] InvertPlus, #[serde(rename = "Invert++")] InvertPlusPlus, - + Counter, #[serde(rename = "Counter+")] CounterPlus, #[serde(rename = "Counter++")] CounterPlusPlus, - + Purge, #[serde(rename = "Purge+")] PurgePlus, #[serde(rename = "Purge++")] PurgePlusPlus, - + Purify, #[serde(rename = "Purify+")] PurifyPlus, #[serde(rename = "Purify++")] PurifyPlusPlus, - + Reflect, #[serde(rename = "Reflect+")] ReflectPlus, #[serde(rename = "Reflect++")] ReflectPlusPlus, - + Recharge, #[serde(rename = "Recharge+")] RechargePlus, #[serde(rename = "Recharge++")] RechargePlusPlus, - + Ruin, #[serde(rename = "Ruin+")] RuinPlus, #[serde(rename = "Ruin++")] RuinPlusPlus, - + Link, #[serde(rename = "Link+")] LinkPlus, #[serde(rename = "Link++")] LinkPlusPlus, - + Silence, #[serde(rename = "Silence+")] SilencePlus, #[serde(rename = "Silence++")] SilencePlusPlus, - + Slay, #[serde(rename = "Slay+")] SlayPlus, #[serde(rename = "Slay++")] SlayPlusPlus, - + Sleep, #[serde(rename = "Sleep+")] SleepPlus, #[serde(rename = "Sleep++")] SleepPlusPlus, - + Restrict, #[serde(rename = "Restrict+")] RestrictPlus, #[serde(rename = "Restrict++")] RestrictPlusPlus, - + Strike, #[serde(rename = "Strike+")] StrikePlus, #[serde(rename = "Strike++")] StrikePlusPlus, - + Siphon, #[serde(rename = "Siphon+")] SiphonPlus, #[serde(rename = "Siphon++")] SiphonPlusPlus, - + Intercept, #[serde(rename = "Intercept+")] InterceptPlus, #[serde(rename = "Intercept++")] InterceptPlusPlus, - + Break, #[serde(rename = "Break+")] BreakPlus, #[serde(rename = "Break++")] BreakPlusPlus, - + Triage, #[serde(rename = "Triage+")] TriagePlus, @@ -695,7 +695,7 @@ pub enum Skill { CounterAttackPlus, #[serde(rename = "CounterAttack++")] CounterAttackPlusPlus, - + Electrocute, #[serde(rename = "Electrocute+")] ElectrocutePlus, @@ -1758,17 +1758,16 @@ fn purge(source: &mut Construct, target: &mut Construct, mut results: Resolution .event(Event::Removal { effect: ce.effect, construct_effects: target.effects.clone() })); } - let mut turns = 0; + let mut turns = 1; for cs in target.skills.iter_mut() { if Effect::Purge.disables_skill(cs.skill) { turns += 1; } } - if turns > 0 { - let mut effect = skill.effect()[0]; - effect.duration = effect.duration * turns; - results.push(Resolution::new(source, target).event(target.add_effect(skill, effect)).stages(EventStages::PostOnly)); - } + + let mut effect = skill.effect()[0]; + effect.duration = effect.duration * turns; + results.push(Resolution::new(source, target).event(target.add_effect(skill, effect)).stages(EventStages::PostOnly)); return results; }