diff --git a/WORKLOG.md b/WORKLOG.md index f8bf9347..03ff4cbc 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -20,8 +20,6 @@ * msg pane * game invites -* add speed to descriptions - ## SOON *SERVER* * modules diff --git a/client/assets/styles/controls.less b/client/assets/styles/controls.less index 4484d720..2410322e 100644 --- a/client/assets/styles/controls.less +++ b/client/assets/styles/controls.less @@ -1,3 +1,5 @@ +@import 'colours.less'; + aside { grid-area: ctrl; display: grid; @@ -93,3 +95,16 @@ aside { .team-page-ctrl h2 { padding: 0 0.75em 0 0.75em; } + +.abandon { + &:hover { + color: @red; + border-color: @red; + }; + + &:active, &.confirming { + background: @red; + color: black; + border: 1px solid black; + } +} \ No newline at end of file diff --git a/client/src/components/anims/slay.jsx b/client/src/components/anims/slay.jsx index c1624a62..ef862a2f 100644 --- a/client/src/components/anims/slay.jsx +++ b/client/src/components/anims/slay.jsx @@ -91,7 +91,7 @@ class Slay extends Component { }); anime.set('#slay', { - translateY: (window.screen.height) * 0.35 * this.props.direction.y, + translateY: -1 * (window.screen.height) * 0.35, translateX: 0, }); anime.set('#explosion feDisplacementMap', { diff --git a/client/src/components/collection.jsx b/client/src/components/collection.jsx index c6441803..8a598b8a 100644 --- a/client/src/components/collection.jsx +++ b/client/src/components/collection.jsx @@ -56,7 +56,7 @@ function Collection(args) { teamSelect[insert] = id; return setTeam(teamSelect); } - console.log(constructs.length); + const dispConstructs = constructs.length >= ((teamPage + 1) * 6) ? constructs.slice(teamPage * 6, (teamPage + 1) * 6) : constructs.slice(teamPage * 6, constructs.length); diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 5f7c262f..8de69d77 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -3,7 +3,7 @@ const range = require('lodash/range'); const reactStringReplace = require('react-string-replace'); const { INFO } = require('./../constants'); -const { convertItem } = require('../utils'); +const { convertItem, removeTier, itemSpeed } = require('../utils'); const shapes = require('./shapes'); function InfoComponent(args) { @@ -40,12 +40,23 @@ function InfoComponent(args) { if (isSkill) { 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 === removeTier(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]()); + const calcSpeed = itemSource.length + ? (24 + (itemSpeed(itemSource[0].components[0]) + itemSpeed(itemSource[0].components[1])) * itemSpeed(itemSource[0].components[2])) * 4 + : (24 + itemSpeed(info)) * 4; + const speed =