diff --git a/CHANGELOG.md b/CHANGELOG.md index a817f86d..6c160cd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed ### Changed -## [0.1.4 2019-09-17] +## [0.1.4 2019-09-18] ### Changed Removed self targetting, all skills can be used on any target @@ -16,6 +16,11 @@ Removed self targetting, all skills can be used on any target `Purify` No cooldown `Recharge` No cooldown +`Banish` + Now deals 40 / 75 / 125% target red / blue life before applying banish debuff + Constant 2T duration at all levels + Constant 3T cooldown at all levels + `Link` reworked -> Stuns caster for 3/2/1T If target has higher green life than caster: diff --git a/VERSION b/VERSION index 7b5753f5..b000a6a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.6 \ No newline at end of file +1.4.7 \ No newline at end of file diff --git a/WORKLOG.md b/WORKLOG.md index 3b95543c..3fd7fa5d 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -8,17 +8,13 @@ * can't reset password without knowing password =\ * treats - * constructs jiggle when clicked * client animation bpm * background colour changes depending on time of day - * hit animation wobble - * combat text scale + translate * susbcriber gold name in instance * bot game grind * msg pane -* game invites * audio diff --git a/acp/package.json b/acp/package.json index 9b9d7f41..d930178a 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.6", + "version": "1.4.7", "description": "", "main": "index.js", "scripts": { diff --git a/client/assets/styles/menu.less b/client/assets/styles/menu.less index a1320161..9bcddbf2 100644 --- a/client/assets/styles/menu.less +++ b/client/assets/styles/menu.less @@ -180,4 +180,44 @@ section { height: 100%; } } +} + +@media (max-width: 800px) { + section { + grid-template-columns: 1fr; + + .list { + grid-template-columns: 1fr 1fr; + } + } + + .demo { + grid-template-columns: 1fr; + grid-template-areas: + "vinfo" + "vcons" + "game" + "game"; + + + .construct-list .instance-construct:not(:first-child) { + display: none; + } + + .game-demo { + grid-template-columns: 1fr; + } + } + + .menu .team { + grid-template-columns: 1fr; + + .construct { + height: 10em; + } + } + + .account { + grid-template-columns: 1fr; + } } \ No newline at end of file diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index 29e06109..2eb724cd 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -6,7 +6,7 @@ html, body, #mnml { background-color: black; font-family: 'Jura'; color: whitesmoke; - font-size: 12pt; + font-size: 14pt; user-select: none; -moz-user-select: none; @@ -26,7 +26,7 @@ html, body, #mnml { @media (min-width: 1921px) { html, body, #mnml { - font-size: 14pt; + font-size: 16pt; } } diff --git a/client/assets/styles/styles.mobile.css b/client/assets/styles/styles.mobile.css index c0db0c18..6b09a6c7 100644 --- a/client/assets/styles/styles.mobile.css +++ b/client/assets/styles/styles.mobile.css @@ -1,6 +1,6 @@ @media (max-width: 800px) { #mnml { - font-size: 10pt; + font-size: 14pt; padding: 1em 0 0 0; grid-template-columns: 1fr; grid-template-rows: 1fr min-content; @@ -44,10 +44,10 @@ display: none; } - header { +/* header { display: none; } - +*/ main { overflow-x: hidden; padding: 0 0.5em; diff --git a/client/index.html b/client/index.html index 453c4706..4ea0190e 100644 --- a/client/index.html +++ b/client/index.html @@ -18,7 +18,7 @@ diff --git a/client/index.js b/client/index.js index d25854c0..ae5df689 100644 --- a/client/index.js +++ b/client/index.js @@ -1,8 +1,8 @@ require('./assets/styles/styles.less'); +require('./assets/styles/account.less'); require('./assets/styles/menu.less'); require('./assets/styles/nav.less'); require('./assets/styles/footer.less'); -require('./assets/styles/account.less'); require('./assets/styles/controls.less'); require('./assets/styles/instance.less'); require('./assets/styles/vbox.less'); diff --git a/client/package.json b/client/package.json index 13676814..bbc55739 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.6", + "version": "1.4.7", "description": "", "main": "index.js", "scripts": { diff --git a/client/src/components/anims/wiggle.jsx b/client/src/components/anims/wiggle.jsx index c4f06b9b..995af86a 100644 --- a/client/src/components/anims/wiggle.jsx +++ b/client/src/components/anims/wiggle.jsx @@ -3,8 +3,10 @@ const anime = require('animejs').default; function wiggle(id, idle) { const duration = 300; const target = document.getElementById(id); - const x = (window.screen.width / anime.random(-100, 100)) * 0.1; - const y = (window.screen.height / anime.random(-20, 100)) * 0.1; + const x = window.screen.width * 0.01 * (Math.round(Math.random()) ? Math.random() : -Math.random()); + const y = window.screen.height * 0.01 * (Math.round(Math.random()) ? Math.random() : -Math.random()); + + console.log(x, y); return anime({ targets: target, rotate: 0, diff --git a/client/src/components/construct.jsx b/client/src/components/construct.jsx index 151b9846..334ba19e 100644 --- a/client/src/components/construct.jsx +++ b/client/src/components/construct.jsx @@ -34,7 +34,7 @@ class ConstructAvatar extends Component {
@@ -67,7 +67,7 @@ class ConstructAvatar extends Component { return true; } - if (animText && animText.constructId === construct.id) { + if (animText && animText !== this.props.animText && animText.constructId === construct.id) { return wiggle(construct.id, this.idle); } diff --git a/client/src/components/demo.jsx b/client/src/components/demo.jsx index 84e05e93..68fb7fb8 100644 --- a/client/src/components/demo.jsx +++ b/client/src/components/demo.jsx @@ -154,13 +154,17 @@ function Demo(args) {
- - +
+
+ +
- - +
+
+ +
@@ -168,7 +172,7 @@ function Demo(args) { }; return ( -
+
{vboxDemo()} {vboxConstructs()} {gameDemo()} diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 8de69d77..b088f711 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -21,14 +21,14 @@ function InfoComponent(args) { return (

VBOX phase

-

strengthen and specialise your constructs by equipping items to them.

-

double click to purchase items in the VBOX and move them to your INVENTORY.

+

Strengthen and specialise your constructs by equipping items to them.

+

Double click to purchase items in the VBOX and move them to your INVENTORY.

- combine a SKILL or SPEC with 2 COLOURS to create an item.
- combine 3 of the same item to upgrade it.
- click an item and then click a construct to equip that item to it.
+ Combine a SKILL or SPEC with 2 COLOURS to create an item.
+ Combine 3 of the same item to upgrade it.
+ Click an item and then click a construct to equip that item to it.

-

click the READY button for the GAME PHASE.

+

Click the READY button for the GAME PHASE.

); } @@ -133,14 +133,16 @@ function InfoComponent(args) { } return false; }); + console.log(info); + const bonusObj = info.includes('Life') + ?
+ {bonus.bonus}
+ :
+ {bonus.bonus}%
; const overFlowObj = overFlow.length ?
{overFlow}
: null; return (
{goals} {overFlowObj} -
- + {bonus.bonus} -
+ {bonusObj}
); }); diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx index 24a1d833..9afd9cc5 100644 --- a/client/src/components/instance.constructs.jsx +++ b/client/src/components/instance.constructs.jsx @@ -179,10 +179,9 @@ function Construct(props) { const stats = Object.keys(STATS).map(s => { const stat = STATS[s]; - const info = (s === 'SpeedStat' && 'Speed') - || (s.includes('Power') && 'Power') - || (s.includes('Life') && 'Life'); - + const info = (s === 'SpeedStat' && 'speedStat') + || (s.includes('Power') && 'powerStat') + || (s.includes('Life') && 'lifeStat'); return
( -
setMtxActive(item)} > -
{item}
- -
- ); + const useMtx = (item, i) => { + const price = item === 'Rename' ? 5 : 1; + return ( +
setMtxActive(item)} > +
{item}
+ +
+ ); + }; const availableMtx = (item, i) => (
mtxBuy(item)} > @@ -87,7 +90,6 @@ function Play(args) { Subscribe ; - return (
diff --git a/client/src/components/player.box.jsx b/client/src/components/player.box.jsx index 4b626171..322dbdde 100644 --- a/client/src/components/player.box.jsx +++ b/client/src/components/player.box.jsx @@ -9,6 +9,14 @@ function Scoreboard(args) { leave, } = args; + const scoreText = () => { + if (player.score === 'Zero') return '▫▫▫'; + if (player.score === 'One') return '■▫▫'; + if (player.score === 'Two') return '■■▫'; + if (player.score === 'Win') return '■■■'; + return ''; + }; + /* let scoreText = () => { if (player.score === 'Zero') return '▫▫▫▫'; if (player.score === 'One') return '■▫▫▫'; @@ -18,6 +26,7 @@ function Scoreboard(args) { if (player.score === 'Win') return '■■■■'; return ''; }; + */ if (!isPlayer) { return ( diff --git a/client/src/components/shop.jsx b/client/src/components/shop.jsx index 659de78e..5b36e0c4 100644 --- a/client/src/components/shop.jsx +++ b/client/src/components/shop.jsx @@ -27,21 +27,21 @@ function Shop(args) { return (
-

support the game

+

Support the game

- credits are in game currency that can be used to purchase: + Credits are in game currency used to change your team appearance:

    -
  • img sets
    • -
  • construct renames
    • -
  • new constructs
    • +
  • Image sets
    • +
  • Reroll construct image from owned sets
    • +
  • Construct renames
    • +
  • New constructs

- subscriptions grant extra benefits: + Subscriptions grant extra benefits:

  • ¤150 per month
    • -
  • chat wheel (soon ™)
    • -
  • account icons (soon ™)
    • +
  • More community features in the future including account icons and chat wheel

diff --git a/client/src/components/welcome.help.jsx b/client/src/components/welcome.help.jsx index b864e6a0..18fac15a 100644 --- a/client/src/components/welcome.help.jsx +++ b/client/src/components/welcome.help.jsx @@ -62,10 +62,10 @@ function Register(args) { return (