Merge branch 'master' of ssh://cryps.gg:40022/~/cryps

This commit is contained in:
ntr 2019-04-17 15:17:09 +10:00
commit 6a719dbb9d
2 changed files with 11 additions and 1 deletions

View File

@ -203,9 +203,13 @@ function getCombatSequence(event) {
if (!event) return false; if (!event) return false;
// Skip combat animations depending on event type, expandable in future // Skip combat animations depending on event type, expandable in future
const dotTicks = ['DecayTick', 'CorruptionTick', 'TriageTick', 'SiphonTick', 'StrangleTick']; 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]) if (['Ko'].includes(event[0])
|| (event[1].skill === 'Throw' && event[1].effect === 'Vulnerable')) return ['POST_SKILL']; || (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']; return ['START_SKILL', 'END_SKILL', 'POST_SKILL'];
} }

View File

@ -30,6 +30,7 @@ authentication endpoint
generate new token and return generate new token and return
attach token to websocket attach token to websocket
ez ez
Base Items - Buff / Debuff / Stun should be equippable / usable skills
var / skill info rpc var / skill info rpc
thresholds / bonuses thresholds / bonuses
@ -43,11 +44,16 @@ push events
make strike *really* hit first / resolve at same time? make strike *really* hit first / resolve at same time?
## SOON ## SOON
* Add missing combo - (Red + Blue + Attack) - Duplicated ???
* Client side confirmation that you've made all decisions
* vbox drops chances * vbox drops chances
* 50% spec, 25% colour etc * 50% spec, 25% colour etc
* confirm cryp without skill ready * confirm cryp without skill ready
* draw big warning ! * draw big warning !
* confirm all (turn timeouts) 10 - 15 seconds
* iconography * iconography
* combo skills * combo skills