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

client/assets/styles/game.less

@@ -197,9 +197,6 @@
 }
 
 .combat-anim {
-    max-width: 100%;
-    max-height: 100%;
-    height: 100%;
     width: 100%;
     display: flex;
     flex-flow: column;
@@ -300,7 +297,7 @@
     pointer-events: none;
 }
 
-.resolving .skills button {
+.animating .skills {
     opacity: 0;
 }
 

client/src/animations.socket.jsx

@@ -53,7 +53,6 @@ function createSocket(store) {
                     timeout - TIMES.POST_SKILL_DURATION_MS
                 );
             }
-            return false;
             return setTimeout(() => {
                 store.dispatch(actions.setAnimSource(null));
                 store.dispatch(actions.setAnimTarget(null));

client/src/components/game.construct.jsx

@@ -94,7 +94,7 @@ class GameConstruct extends Component {
             .map(j => <SkillBtn key={j} construct={construct} i={j} j={i} animating={animating} />);
 
         let crypSkills = <div> &nbsp; </div>;
-        if (player && !animating) crypSkills = (<div class="skills"> {skills} </div>);
+        if (player) crypSkills = (<div class="skills"> {skills} </div>);
 
         const effects = construct.effects.length
             ? construct.effects.map(c => <div key={c.effect}>{c.effect} - {c.duration}T</div>)

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();