This commit is contained in:
ntr 2019-07-19 19:07:03 +10:00
parent bd517a1926
commit adf6700049
3 changed files with 12 additions and 7 deletions

View File

@ -72,7 +72,7 @@ class GameConstruct extends Component {
} = this.props; } = this.props;
const ko = construct.green_life.value === 0 ? 'ko' : ''; const ko = construct.green_life.value === 0 ? 'ko' : '';
const classes = eventClasses(game, account, resolution, construct); const classes = eventClasses(game, account, resolution, construct, animText);
const stats = ['RedLife', 'GreenLife', 'BlueLife'].map((s, j) => ( const stats = ['RedLife', 'GreenLife', 'BlueLife'].map((s, j) => (
<div key={j} alt={STATS[s].stat}> <div key={j} alt={STATS[s].stat}>

View File

@ -66,7 +66,12 @@ function registerEvents(store) {
if (sequence.includes('START_SKILL')) store.dispatch(actions.setAnimSource(anims.animSource)); if (sequence.includes('START_SKILL')) store.dispatch(actions.setAnimSource(anims.animSource));
if (sequence.includes('END_SKILL')) store.dispatch(actions.setAnimTarget(anims.animTarget)); if (sequence.includes('END_SKILL')) store.dispatch(actions.setAnimTarget(anims.animTarget));
if (sequence.includes('POST_SKILL')) store.dispatch(actions.setAnimText(text)); if (sequence.includes('POST_SKILL')) {
setTimeout(
() => store.dispatch(actions.setAnimText(text)),
timeout - 1000,
);
}
return setTimeout(() => { return setTimeout(() => {
store.dispatch(actions.setAnimSource(null)); store.dispatch(actions.setAnimSource(null));

View File

@ -85,7 +85,7 @@ const STATS = {
}, },
}; };
function eventClasses(game, account, resolution, construct) { function eventClasses(game, account, resolution, construct, postSkill) {
if (!resolution) return ''; if (!resolution) return '';
const source = construct.id === resolution.source.id; const source = construct.id === resolution.source.id;
const target = construct.id === resolution.target.id; const target = construct.id === resolution.target.id;
@ -130,7 +130,7 @@ function eventClasses(game, account, resolution, construct) {
} }
if (type === 'Healing') { if (type === 'Healing') {
if (target) { if (target && postSkill) {
construct.green_life.value = resolution.target.green; construct.green_life.value = resolution.target.green;
return 'green-damage'; return 'green-damage';
} }
@ -138,17 +138,17 @@ function eventClasses(game, account, resolution, construct) {
if (type === 'Effect') { if (type === 'Effect') {
const { construct_effects: constructEffects } = event; const { construct_effects: constructEffects } = event;
if (target) construct.effects = constructEffects; if (target && postSkill) construct.effects = constructEffects;
} }
if (type === 'Removal') { if (type === 'Removal') {
const { construct_effects: constructEffects } = event; const { construct_effects: constructEffects } = event;
if (target) construct.effects = constructEffects; if (target && postSkill) construct.effects = constructEffects;
} }
if (type === 'Recharge') { if (type === 'Recharge') {
const { red, blue } = event; const { red, blue } = event;
if (target) { if (target && postSkill) {
if (red > 0 && blue > 0) { if (red > 0 && blue > 0) {
construct.red_life.value = resolution.target.red; construct.red_life.value = resolution.target.red;
construct.blue_life.value = resolution.target.blue; construct.blue_life.value = resolution.target.blue;