move combos

This commit is contained in:
ntr
2019-05-22 17:44:42 +10:00
parent cf3cef3f31
commit caaca4fb05
2 changed files with 121 additions and 56 deletions
+6 -6
View File
@@ -248,10 +248,10 @@ function resoCrypHealth(resolution, currentGame) {
if (type === 'Damage') {
const { amount, mitigation, colour } = event;
cryp.green_life.value -= amount;
if (colour === 'RedDamage') {
if (colour === 'Red') {
cryp.red_life.value -= mitigation;
}
if (colour === 'BlueDamage') {
if (colour === 'Blue') {
cryp.blue_life.value -= mitigation;
}
}
@@ -312,13 +312,13 @@ function eventClasses(resolution, cryp) {
// Deal damage to cryp and return effect
if (target && postSkill) {
if (colour === 'RedDamage') {
if (colour === 'Red') {
return 'red-damage';
}
if (colour === 'BlueDamage') {
if (colour === 'Blue') {
return 'blue-damage';
}
if (colour === 'GreenDamage') return 'green-damage';
if (colour === 'Green') return 'green-damage';
}
}
@@ -399,7 +399,7 @@ function getCombatSequence(event) {
|| (event[1].skill === 'Decay' && event[1].effect === 'Wither'))) return ['POST_SKILL'];
if (['Damage'].includes(event[0])
&& ((event[1].skill === 'Chaos' && event[1].colour === 'RedDamage')
&& ((event[1].skill === 'Chaos' && event[1].colour === 'Red')
|| event[1].skill === 'Silence'
|| event[1].skill === 'Snare')) return ['POST_SKILL'];