diff --git a/VERSION b/VERSION index 1cc5f657..867e5243 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0 \ No newline at end of file +1.2.0 \ No newline at end of file diff --git a/WORKLOG.md b/WORKLOG.md index a246a525..999f1afa 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -4,7 +4,6 @@ * ACP * essential * serde serialize privatise - * DO postgres * mobile styles * can't reset password without knowing password =\ @@ -13,10 +12,8 @@ * background colour changes depending on time of day * bug fixes - * pvp 1st player ready up doesn't get put in game * pvp 1st round doesn't resolve until warden timer completes - * bot game grind * stress test @@ -65,12 +62,6 @@ mobile info page reconnect based on time delta consolidate game and instance -ah man -the ready screen should totally be -your constructs facing off against the other guy -the chatwheel -and a ready button - *SERVER* * vbox drops chances * 50% spec, 25% colour etc @@ -78,7 +69,6 @@ and a ready button * mnml tv ## LATER -* chat * elo + leaderboards * constants * change to ownership pattern diff --git a/acp/package.json b/acp/package.json index cc7a1379..a13e342e 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.1.0", + "version": "1.2.0", "description": "", "main": "index.js", "scripts": { diff --git a/bin/deploy.sh b/bin/deploy.sh index 15778cd7..f84b7d97 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -24,6 +24,7 @@ ssh -q "$TARGET" ls -lah "$SERVER_BIN_DIR" echo "syncing client $VERSION" rsync -a --delete --delete-excluded "$MNML_PATH/client/dist/" "$TARGET:$CLIENT_DIST_DIR/$VERSION/" ssh -q "$TARGET" ln -nfs "$CLIENT_DIST_DIR/$VERSION" "$CLIENT_PUBLIC_DIR" +ssh -q "$TARGET" ls -lah "$CLIENT_DIST_DIR" echo "restarting mnml service" ssh -q -t "$TARGET" sudo service mnml restart && sleep 1 && systemctl --no-pager status mnml diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index d9c5a195..44da08bf 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -60,6 +60,16 @@ height: 1em; } +.instance .info figure { + display: inline; + height: 0.5em; +} + +.instance .info figcaption { + font-size: 1em; +} + + .instance .constructs { grid-area: constructs; } diff --git a/client/package.json b/client/package.json index a0ecb408..14bc2149 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.1.0", + "version": "1.2.0", "description": "", "main": "index.js", "scripts": { diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 547581aa..2696cadf 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -28,9 +28,16 @@ function InfoComponent(args) { const regEx = /(RedPower|BluePower|GreenPower|RedLife|BlueLife|GreenLife|SpeedStat)/; const infoDescription = reactStringReplace(fullInfo.description, regEx, match => shapes[match]()); + const itemSource = itemInfo.combos.filter(c => c.item === info); + const itemSourceInfo = itemSource.length + ? `${itemSource[0].components[0]} ${itemSource[0].components[1]} ${itemSource[0].components[2]}` + : false; + const itemRegEx = /(Red|Blue|Green)/; + const itemSourceDescription = reactStringReplace(itemSourceInfo, itemRegEx, match => shapes[match]()); return (

{fullInfo.item}

+

{itemSourceDescription}

{infoDescription}
); 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 (