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

client/assets/styles/game.less

@@ -130,6 +130,9 @@
         margin-bottom: 0.25em;
         text-align: center;
         grid-area: name;
+        span {
+            background-color: black;
+        }
     }
 
     .skills {
@@ -138,9 +141,15 @@
             width: 100%;
             height: 2em;
             margin-right: 1em;
+            span {
+                background-color: black;
+            }
         }
         button.active {
             background: #2c2c2c;
+            span {
+                background-color: #2c2c2c;
+            }
         }
     }
 
@@ -151,6 +160,9 @@
         width: 100%;
         text-align: center;
         font-size: 1.5em;
+        span {
+            background-color: black;
+        }
     }
 
     .stats {
@@ -232,6 +244,7 @@
     padding-left: 1em;
     padding-right: 1em;
     text-align: center;
+    background-color: black;
     svg {
         display: inline;
         height: 1em;

client/src/components/buttons.jsx

@@ -8,33 +8,33 @@ module.exports = {
     Slay: () => 'red-green-border',
     Siphon: () => 'blue-green-border',
     // Stun
-    Link: () => 'blue-green-border',
     Bash: () => 'red-border',
-    Sleep: () => 'green-border',
     Ruin: () => 'blue-border',
-    Break: () => 'red-green-border',
+    Sleep: () => 'green-border',
     Banish: () => 'red-blue-border',
+    Break: () => 'red-green-border',
+    Link: () => 'blue-green-border',
     // Block
     Counter: () => 'red-border',
-    Purify: () => 'green-border',
     Electrify: () => 'blue-border',
+    Purify: () => 'green-border',
+    Recharge: () => 'red-blue-border',
     Sustain: () => 'red-green-border',
     Reflect: () => 'blue-green-border',
-    Recharge: () => 'blue-red-border',
     // Buff
     Intercept: () => 'red-border',
-    Triage: () => 'green-border',
-    Haste: () => 'red-green-border',
     Absorb: () => 'blue-border',
-    Hybrid: () => 'blue-green-border',
+    Triage: () => 'green-border',
     Amplify: () => 'red-blue-border',
+    Haste: () => 'red-green-border',
+    Hybrid: () => 'blue-green-border',
     // Debuff
     Restrict: () => 'red-border',
-    Purge: () => 'green-border',
     Silence: () => 'blue-border',
+    Purge: () => 'green-border',
+    Curse: () => 'red-blue-border',
     Invert: () => 'red-green-border',
     Decay: () => 'blue-green-border',
-    Curse: () => 'red-blue-border',
 
     //     // Lifes Upgrades
     // LifeGG: () => 'green-border',

client/src/components/construct.jsx

@@ -111,7 +111,7 @@ function constructText(props) {
         ? animText.text
         : construct.name;
 
-    return <h3 class={'name'}>{text}</h3>;
+    return <h3 class={'name'}><span>{text}</span></h3>;
 }
 
 module.exports = {

client/src/components/game.construct.jsx

@@ -153,11 +153,11 @@ class GameConstruct extends Component {
             }
             const effects = construct.effects.length
                 ? construct.effects.map(c =>
-                    <div
-                        key={c.effect}
-                        onMouseOver={e => hoverInfo(e, c)}
-                        onMouseOut={e => hoverInfo(e, null)}
-                    > {c.effect} - {c.duration}T</div>)
+                    <div key={c.effect}>
+                        <span key={c.effect} onMouseOver={e => hoverInfo(e, c)}
+                            onMouseOut={e => hoverInfo(e, null)}> {c.effect} - {c.duration}T
+                        </span>
+                    </div>)
                 : null;
             return (<div class="effects"> {effects} </div>);
         };

client/src/components/skill.btn.jsx

@@ -91,7 +91,7 @@ function Skill(props) {
             onMouseOut={e => hoverInfo(e, null)}
             type="submit"
             onClick={onClick}>
-            {s.skill} {cdText}
+            <span>{s.skill} {cdText}</span>
         </button>
     );
 }

client/src/events.jsx

@@ -74,7 +74,7 @@ function registerEvents(store) {
                 // stop fetching the game state til animations are done
                 const newRes = game.resolved.slice(currentGame.resolved.length);
                 return eachSeries(newRes, (r, cb) => {
-                    if (!r.event || r.stages === '') return cb();
+                    if (!r.event) return cb();
                     const timeout = animations.getTime(r.stages);
                     const anims = animations.getObjects(r, game, account);
                     const text = animations.getText(r);

client/src/utils.jsx

@@ -240,6 +240,8 @@ function convertItem(v) {
 }
 
 function effectInfo(i) {
+    const hybridBlast = 25;
+    const hasteStrike = 30;
     function multiplier(s) { // Update later to use server info in future
         if (s === 'CounterAttack') return 120;
         if (s === 'CounterAttack+') return 160;
@@ -270,9 +272,9 @@ function effectInfo(i) {
     case 'Buff': return `Increases construct RedPower BluePower SpeedStat by ${i.meta[1] - 100}%`;
     case 'Sustain': return 'Construct cannot be KO while active. Additionally provides immunity to disables';
     case 'Curse': return `Construct will take ${i.meta[1] - 100}% increased red and blue damage`;
-    case 'Haste': return `Construct has  ${i.meta[1] - 100}% increased SpeedStat. Red attack skills will trigger a HasteStrike dealing 30% SpeedStat as red damage.`;
-    case 'Hybrid': return `Construct has  ${i.meta[1] - 100}% increased GreenPower. Blue attack skills will trigger a HybridBlast dealing 25% GreenPower as red damage.`;
-    case 'Invert': return 'Reverses damage and healing. Healing will damage this construct and damage will heal.';
+    case 'Haste': return `Construct has  ${i.meta[1] - 100}% increased SpeedStat. Red attack skills will trigger a HasteStrike dealing ${hasteStrike}% SpeedStat as red damage.`;
+    case 'Hybrid': return `Construct has  ${i.meta[1] - 100}% increased GreenPower. Blue attack skills will trigger a HybridBlast dealing ${hybridBlast}% GreenPower as red damage.`;
+    case 'Invert': return 'Reverse healing/recharge into damage and damage into healing/recharge.';
     case 'Counter': return `Red damage taken by this construct will trigger a CounterAttack. CounterAttack deals ${multiplier(i.meta[1])}% RedPower as red damage.`;
     case 'Purge': return 'Disable construct from casting any green skills';
     case 'Reflect': return 'Reflect blue skills back to caster';