diff --git a/client/cryps.css b/client/cryps.css index 0fa943c6..a2105017 100644 --- a/client/cryps.css +++ b/client/cryps.css @@ -278,7 +278,6 @@ header { INSTANCE */ - .instance { display: flex; flex-flow: row wrap; @@ -390,6 +389,12 @@ header { min-width: 300px; } +.thresholds { + display: flex; + flex-direction: row; + justify-content: left; +} + /* CRYP BOX */ .cryp-box { flex: 1 1 100%; @@ -553,4 +558,4 @@ header { .selected-skills { display: none; } -} +} \ No newline at end of file diff --git a/client/src/components/constants.jsx b/client/src/components/constants.jsx index a5b80c85..a5e2230b 100644 --- a/client/src/components/constants.jsx +++ b/client/src/components/constants.jsx @@ -190,62 +190,79 @@ module.exports = { GreenDamageI: { description: 'Increases green damage', + colours: ['green'], + thresholds: [5, 10, 20], }, RedDamageI: { description: 'Increased red damage', + colours: ['red'], + thresholds: [5, 10, 20], }, BlueDamageI: { description: 'Increased blue damage', + colours: ['blue'], + thresholds: [5, 10, 20], }, GRDI: { description: 'Increased green and red damage', + colours: ['green', 'red'], + thresholds: [2, 5, 10], }, GBDI: { description: 'Increased green and blue damage', + colours: ['green', 'blue'], + thresholds: [2, 5, 10], }, RBDI: { description: 'Increased red and blue damage', + colours: ['red', 'blue'], + thresholds: [2, 5, 10], }, - Speed: { - description: 'Increases speed of cryp', - upgrades: 'combine with 2 red / blue / green', - }, - - Hp: { description: 'Increases life', upgrades: 'combine with 2 red / blue / green', - }, LifeI: { description: 'Increases life', + colours: ['green'], + thresholds: [5, 10, 20], }, RedShieldI: { description: 'Increased red shield', + colours: ['red'], + thresholds: [5, 10, 20], }, BlueShieldI: { description: 'Increased blue shield', + colours: ['blue'], + thresholds: [5, 10, 20], }, LRSI: { description: 'Increased life and red shield', + colours: ['green', 'red'], + thresholds: [2, 5, 10], }, LBSI: { description: 'Increased life and blue shield', + colours: ['green', 'blue'], + thresholds: [2, 5, 10], }, RBSI: { description: 'Increased red and blue shield', + colours: ['red', 'blue'], + thresholds: [2, 5, 10], }, Speed: { @@ -255,26 +272,38 @@ module.exports = { RedSpeedI: { description: 'Increases red speed', + colours: ['red'], + thresholds: [5, 10, 20], }, BlueSpeedI: { description: 'Increases blue speed', + colours: ['blue'], + thresholds: [5, 10, 20], }, GreenSpeedI: { description: 'Increases green speed', + colours: ['green'], + thresholds: [5, 10, 20], }, GRSpeedI: { description: 'Increases green and red speed', + colours: ['green', 'red'], + thresholds: [2, 5, 10], }, GBSpeedI: { description: 'Increases green and blue speed', + colours: ['green', 'blue'], + thresholds: [2, 5, 10], }, RBSpeedI: { description: 'Increases red and blue speed', + colours: ['red', 'blue'], + thresholds: [2, 5, 10], }, }, diff --git a/client/src/components/game.component.jsx b/client/src/components/game.component.jsx index 991594d9..465570cf 100644 --- a/client/src/components/game.component.jsx +++ b/client/src/components/game.component.jsx @@ -5,8 +5,6 @@ const molecule = require('./molecule'); const { STATS } = require('../utils'); -console.log(STATS); - // const SKILL_HOT_KEYS = ['Q', 'W', 'E', 'R']; function GamePanel(props) { @@ -142,7 +140,7 @@ function GamePanel(props) { {skills} -