From 2e1b298bbf0eed10cc38a4db4767dec979f21be6 Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 23 Oct 2019 12:08:21 +1000 Subject: [PATCH] remove client from deciding event stages wip --- client/src/animations.utils.jsx | 2 -- client/src/events.jsx | 2 -- server/src/skill.rs | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/client/src/animations.utils.jsx b/client/src/animations.utils.jsx index 38da27d5..95389eeb 100644 --- a/client/src/animations.utils.jsx +++ b/client/src/animations.utils.jsx @@ -75,8 +75,6 @@ function getObjects(resolution, stages, game, account) { function getSequence(resolution) { if (!resolution.event) return []; if (resolution.event[0] === 'Inversion') return []; - if (['TargetKo', 'Ko'].includes(resolution.event[0])) return []; - if (['Skill', 'AoeSkill'].includes(resolution.event[0])) return ['START_SKILL', 'END_SKILL']; switch (resolution.stages) { case 'AllStages': return ['START_SKILL', 'END_SKILL', 'POST_SKILL']; diff --git a/client/src/events.jsx b/client/src/events.jsx index 3db2ce7b..945c2b59 100644 --- a/client/src/events.jsx +++ b/client/src/events.jsx @@ -67,8 +67,6 @@ function registerEvents(store) { // stop fetching the game state til animations are done const newRes = game.resolved.slice(currentGame.resolved.length); return eachSeries(newRes, (r, cb) => { - if (['Disable', 'TargetKo'].includes(r.event[0])) return cb(); - // convert server enum into anims keywords // todo make serersideonly const sequence = animations.getSequence(r); diff --git a/server/src/skill.rs b/server/src/skill.rs index d4685c2a..f7254101 100644 --- a/server/src/skill.rs +++ b/server/src/skill.rs @@ -342,7 +342,7 @@ fn post_resolve(_skill: Skill, game: &mut Game, mut resolutions: Resolutions) -> }; if target.is_ko() { - resolutions.push(Resolution::new(&source, &target).event(Event::Ko())); + resolutions.push(Resolution::new(&source, &target).event(Event::Ko()).stages(EventStages::PostOnly)); target.effects.clear(); }