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/src/components/info.component.jsx b/client/src/components/info.component.jsx index 9b0d1c6d..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,19 +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 === info); + 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 =