diff --git a/client/src/components/shapes.jsx b/client/src/components/shapes.jsx index b0816383..ec8f2106 100644 --- a/client/src/components/shapes.jsx +++ b/client/src/components/shapes.jsx @@ -100,9 +100,79 @@ module.exports = { {square(['red', 'blue'])}
Life
, + LifeGGPlus: () => +
+ {square(['green'])} +
Life+
+
, + LifeRRPlus: () => +
+ {square(['red'])} +
Life+
+
, - // Power Upgrades + LifeBBPlus:() => +
+ {square(['blue'])} +
Life+
+
, + + LifeRGPlus: () => +
+ {square(['red', 'green'])} +
Life+
+
, + + LifeGBPlus: () => +
+ {square(['green', 'blue'])} +
Life+
+
, + + LifeRBPlus:() => +
+ {square(['red', 'blue'])} +
Life+
+
, + + LifeGGPlusPlus: () => +
+ {square(['green'])} +
Life++
+
, + + LifeRRPlusPlus: () => +
+ {square(['red'])} +
Life++
+
, + + LifeBBPlusPlus:() => +
+ {square(['blue'])} +
Life++
+
, + + LifeRGPlusPlus: () => +
+ {square(['red', 'green'])} +
Life++
+
, + + LifeGBPlusPlus: () => +
+ {square(['green', 'blue'])} +
Life++
+
, + + LifeRBPlusPlus:() => +
+ {square(['red', 'blue'])} +
Life++
+
, + + // Powers Upgrades PowerGG: () =>
{circle(['green'])} @@ -138,8 +208,79 @@ module.exports = { {circle(['red', 'blue'])}
Power
, + PowerGGPlus: () => +
+ {circle(['green'])} +
Power+
+
, - // Speed Upgrades + PowerRRPlus: () => +
+ {circle(['red'])} +
Power+
+
, + + PowerBBPlus:() => +
+ {circle(['blue'])} +
Power+
+
, + + PowerRGPlus: () => +
+ {circle(['red', 'green'])} +
Power+
+
, + + PowerGBPlus: () => +
+ {circle(['green', 'blue'])} +
Power+
+
, + + PowerRBPlus:() => +
+ {circle(['red', 'blue'])} +
Power+
+
, + + PowerGGPlusPlus: () => +
+ {circle(['green'])} +
Power++
+
, + + PowerRRPlusPlus: () => +
+ {circle(['red'])} +
Power++
+
, + + PowerBBPlusPlus:() => +
+ {circle(['blue'])} +
Power++
+
, + + PowerRGPlusPlus: () => +
+ {circle(['red', 'green'])} +
Power++
+
, + + PowerGBPlusPlus: () => +
+ {circle(['green', 'blue'])} +
Power++
+
, + + PowerRBPlusPlus:() => +
+ {circle(['red', 'blue'])} +
Power++
+
, + + // Speeds Upgrades SpeedGG: () =>
{triangle(['green'])} @@ -175,4 +316,75 @@ module.exports = { {triangle(['red', 'blue'])}
Speed
, + SpeedGGPlus: () => +
+ {triangle(['green'])} +
Speed+
+
, + + SpeedRRPlus: () => +
+ {triangle(['red'])} +
Speed+
+
, + + SpeedBBPlus:() => +
+ {triangle(['blue'])} +
Speed+
+
, + + SpeedRGPlus: () => +
+ {triangle(['red', 'green'])} +
Speed+
+
, + + SpeedGBPlus: () => +
+ {triangle(['green', 'blue'])} +
Speed+
+
, + + SpeedRBPlus:() => +
+ {triangle(['red', 'blue'])} +
Speed+
+
, + + SpeedGGPlusPlus: () => +
+ {triangle(['green'])} +
Speed++
+
, + + SpeedRRPlusPlus: () => +
+ {triangle(['red'])} +
Speed++
+
, + + SpeedBBPlusPlus:() => +
+ {triangle(['blue'])} +
Speed++
+
, + + SpeedRGPlusPlus: () => +
+ {triangle(['red', 'green'])} +
Speed++
+
, + + SpeedGBPlusPlus: () => +
+ {triangle(['green', 'blue'])} +
Speed++
+
, + + SpeedRBPlusPlus:() => +
+ {triangle(['red', 'blue'])} +
Speed++
+
, }; diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 232ba9c2..9df9112f 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -305,7 +305,6 @@ function Vbox(args) { const highlighted = combiner.indexOf(i) > -1; const classes = `${highlighted ? 'highlight' : ''}`; - if (shapes[v]) { return (