From b0ffd8ea36edbe20a530923261fabdaad78f7b0e Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 17 Apr 2019 13:26:32 +1000 Subject: [PATCH 1/2] Skip for immunity --- client/src/utils.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/utils.jsx b/client/src/utils.jsx index b6bb2928..ed98d007 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -203,9 +203,13 @@ function getCombatSequence(event) { if (!event) return false; // Skip combat animations depending on event type, expandable in future const dotTicks = ['DecayTick', 'CorruptionTick', 'TriageTick', 'SiphonTick', 'StrangleTick']; + if (dotTicks.includes(event[1].skill)) return ['END_SKILL', 'POST_SKILL']; + + if (['Immunity'].includes(event[0])) return ['START_SKILL', 'POST_SKILL']; + if (['Ko'].includes(event[0]) || (event[1].skill === 'Throw' && event[1].effect === 'Vulnerable')) return ['POST_SKILL']; - if (dotTicks.includes(event[1].skill)) return ['END_SKILL', 'POST_SKILL']; + return ['START_SKILL', 'END_SKILL', 'POST_SKILL']; } From d686cc58c2921ad0f0878715ab2d585a84ed871a Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 17 Apr 2019 14:04:06 +1000 Subject: [PATCH 2/2] worklog --- server/WORKLOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/WORKLOG.md b/server/WORKLOG.md index 6aff1be5..f546c7d2 100644 --- a/server/WORKLOG.md +++ b/server/WORKLOG.md @@ -30,6 +30,7 @@ authentication endpoint generate new token and return attach token to websocket ez +Base Items - Buff / Debuff / Stun should be equippable / usable skills consolidate buffs debuffs and disables no more red/blue @@ -47,11 +48,16 @@ push events make strike *really* hit first / resolve at same time? ## SOON + +* Add missing combo - (Red + Blue + Attack) - Duplicated ??? +* Client side confirmation that you've made all decisions + * vbox drops chances * 50% spec, 25% colour etc * confirm cryp without skill ready * draw big warning ! + * confirm all (turn timeouts) 10 - 15 seconds * iconography * combo skills