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

client/src/components/animations.jsx

@@ -64,7 +64,7 @@ class ConstructAnimation extends Component {
             constructId,
         } = animTarget;
 
-        if (construct.id !== constructId) return false;
+        if (!constructId.includes(construct.id)) return false;
 
         // find target animation
         const chooseAnim = (skill) => {

client/src/components/anims/block.jsx

@@ -27,15 +27,9 @@ class Block extends Component {
                 xmlns="http://www.w3.org/2000/svg"
                 transform="rotate(180)"
                 viewBox="0 0 256 256">
-                <polygon
-                    points='128,168 80,240 176,240'
-                    id="charge"/>
-                <polyline
-                    points='176,240 212,216 128,96 44,216 80,240'
-                    id="charge"/>
-                <polyline
-                    points='212,216 248,192 128,24 8,192 44,216'
-                    id="charge"/>
+                <polygon points='128,168 80,240 176,240'/>
+                <polyline points='176,240 212,216 128,96 44,216 80,240'/>
+                <polyline points='212,216 248,192 128,24 8,192 44,216'/>
             </svg>
         );
     }

client/src/components/anims/buff.jsx

@@ -22,7 +22,7 @@ class Buff extends Component {
         return (
             <svg
                 id='buff'
-                class="skill-animation"
+                class="skill-animation white"
                 version="1.1"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 200 200">

client/src/components/anims/debuff.jsx

@@ -22,7 +22,7 @@ class Debuff extends Component {
         return (
             <svg
                 id='debuff'
-                class="skill-animation"
+                class="skill-animation white"
                 version="1.1"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 200 200"

client/src/components/anims/ruin.jsx

@@ -98,7 +98,12 @@ class Ruin extends Component {
     componentWillUnmount() {
         for (let i = this.animations.length - 1; i >= 0; i--) {
             this.animations[i].reset();
-        } this.props.animCb();
+        }
+        try {
+            this.props.animCb();
+        } catch (e) {
+            console.log(e);
+        }
     }
 }
 

client/src/components/construct.jsx

@@ -132,7 +132,7 @@ class ConstructAvatar extends Component {
         }
 
         // this is the target
-        if (animTarget && animTarget.constructId === construct.id) {
+        if (animTarget && animTarget.constructId.includes(construct.id)) {
             // console.warn(construct.name, 'should update')
             return true;
         }
@@ -141,7 +141,7 @@ class ConstructAvatar extends Component {
         const prevSrc = this.props.animSource && this.props.animSource.constructId === construct.id;
         if (prevSrc && !animSource) return true;
 
-        const prevTarget = this.props.animTarget && this.props.animTarget.constructId === construct.id;
+        const prevTarget = this.props.animTarget && this.props.animTarget.constructId.includes(construct.id);
         if (prevTarget && !animTarget) return true;
 
         // console.warn(construct.name, 'not updating');

client/src/components/game.construct.jsx

@@ -8,12 +8,8 @@ const { ConstructAvatar, ConstructText } = require('./construct');
 const { ConstructAnimation } = require('./animations');
 const shapes = require('./shapes');
 
-
 const SkillBtn = require('./skill.btn');
 
-
-const actions = require('../actions');
-
 const addState = connect(
     function receiveState(state) {
         const {