From c2731c1eea794c860dca5597df416c23ea190d80 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 16 Sep 2019 21:43:25 +1000 Subject: [PATCH] stop skills repainting --- client/assets/styles/game.less | 4 ++-- client/src/components/game.construct.jsx | 2 +- client/src/components/game.jsx | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/assets/styles/game.less b/client/assets/styles/game.less index bbe14129..88620afe 100644 --- a/client/assets/styles/game.less +++ b/client/assets/styles/game.less @@ -199,7 +199,7 @@ .combat-anim { max-width: 100%; max-height: 100%; - height: 100%; + // height: 100%; width: 100%; display: flex; flex-flow: column; @@ -300,7 +300,7 @@ pointer-events: none; } -.resolving .skills button { +.animating .skills { opacity: 0; } diff --git a/client/src/components/game.construct.jsx b/client/src/components/game.construct.jsx index 01d81cdf..ea4db106 100644 --- a/client/src/components/game.construct.jsx +++ b/client/src/components/game.construct.jsx @@ -94,7 +94,7 @@ class GameConstruct extends Component { .map(j => ); let crypSkills =
 
; - if (player && !animating) crypSkills = (
{skills}
); + if (player) crypSkills = (
{skills}
); const effects = construct.effects.length ? construct.effects.map(c =>
{c.effect} - {c.duration}T
) diff --git a/client/src/components/game.jsx b/client/src/components/game.jsx index 95c34691..88cc3a1d 100644 --- a/client/src/components/game.jsx +++ b/client/src/components/game.jsx @@ -12,7 +12,7 @@ const addState = connect( ws, game, account, - resolution, + animating, activeSkill, activeConstruct, } = state; @@ -32,7 +32,7 @@ const addState = connect( return { game, account, - resolution, + animating, activeSkill, activeConstruct, selectSkillTarget, @@ -57,7 +57,7 @@ function Game(props) { const { game, account, - resolution, + animating, setActiveSkill, setActiveConstruct, } = props; @@ -87,7 +87,7 @@ function Game(props) { ); } - const gameClasses = `game ${resolution ? 'resolving': ''}`; + const gameClasses = `game ${animating ? 'animating' : ''}`; function gameClick(e) { e.stopPropagation();