From 0974a24eb872420b68e0e8b75a5fef9d77d62419 Mon Sep 17 00:00:00 2001 From: Mashy Date: Tue, 16 Apr 2019 10:09:46 +1000 Subject: [PATCH] Remove KO delay and filter blur --- client/cryps.css | 4 ++-- client/src/events.jsx | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/client/cryps.css b/client/cryps.css index 2441a4f0..54417fec 100644 --- a/client/cryps.css +++ b/client/cryps.css @@ -588,12 +588,12 @@ header { .cryp-box.ko { animation: none; - opacity: 0.5; + opacity: 0.35; filter: grayscale(100%); } .cryp-box.unfocus { - filter: blur(5px); + opacity: 0.65; } text.combat-text { diff --git a/client/src/events.jsx b/client/src/events.jsx index b13423de..96ad39be 100644 --- a/client/src/events.jsx +++ b/client/src/events.jsx @@ -24,8 +24,11 @@ function registerEvents(store) { const newRes = game.resolved.slice(currentGame.resolved.length); return eachSeries(newRes, (r, cb) => { if (['Disable', 'TargetKo'].includes(r.event[0])) return cb(); - // Create 3 new events for combat animations - const sequence = ['START_SKILL', 'END_SKILL', 'POST_SKILL']; + // Create sub events for combat animations + // Some types only need to animate final effect + const sequence = ['Ko'].includes(r.event[0]) + ? ['POST_SKILL'] + : ['START_SKILL', 'END_SKILL', 'POST_SKILL']; return eachSeries(sequence, (stage, sCb) => { const stagedR = Object.create(r); stagedR.stage = stage;