Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0

This commit is contained in:
ntr 2019-12-19 15:43:24 +10:00
commit 5b5b8d3740

View File

@ -59,11 +59,16 @@ class GameConstruct extends preact.Component {
player,
} = this.props;
const ko = construct.green_life.value === 0 ? 'ko' : '';
// construct green_life comes from game state and won't update during animations
// treat the construct as ko for the remainder of the anims if ko event occurs
const ko = construct.green_life.value === 0 || this.ko ? 'ko' : '';
const koEvent = () => {
if (resolution) {
const [type, variant] = resolution.event;
if (variant.construct === construct.id && type === 'Ko') return 'ko-transition';
if (variant.construct === construct.id && type === 'Ko') {
this.ko = true;
return 'ko-transition';
}
}
return '';
};