From f3beb6c7ef8b50c42e99bc8bb4bfcb8132031d4a Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 27 May 2019 16:51:45 +1000 Subject: [PATCH] combos info fix --- client/assets/styles/game.css | 5 +++++ client/src/components/info.component.jsx | 3 +-- client/src/utils.jsx | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/assets/styles/game.css b/client/assets/styles/game.css index ce3a4519..da27e9c9 100644 --- a/client/assets/styles/game.css +++ b/client/assets/styles/game.css @@ -149,6 +149,7 @@ white-space: nowrap; width: 100%; text-align: center; + font-size: 125%; } .game-btn { @@ -403,4 +404,8 @@ CONSTRUCT DAMAGE .game .stats svg { height: 1em; } + + .game .effects { + font-size: 100%; + } } diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 8af1fbef..70fb688a 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -95,8 +95,6 @@ function Info(args) { function Combos() { if (!player) return false; - if (combiner.every(c => !c)) return false; - if (!(combiner.every(u => u === null))) { const filteredCombos = itemInfo.combos .filter(combo => combiner.every(u => u === null @@ -115,6 +113,7 @@ function Info(args) { ); } + const vboxCombos = itemInfo.combos.filter(c => c.components.includes(info)); if (vboxCombos.length > 6) return false; return ( diff --git a/client/src/utils.jsx b/client/src/utils.jsx index 2ab78af3..dc8ebc98 100644 --- a/client/src/utils.jsx +++ b/client/src/utils.jsx @@ -60,7 +60,7 @@ const animations = {}; function animateConstruct(id) { if (animations[id]) return false; animations[id] = true; - const duration = anime.random(2000, 8000); + const duration = anime.random(2000, 18000); const target = document.getElementById(id); return anime({ targets: target,