diff --git a/client/cryps.css b/client/cryps.css index 3d2b7fde..5828ea18 100644 --- a/client/cryps.css +++ b/client/cryps.css @@ -116,6 +116,15 @@ svg { stroke: #FFD123; } +.purple { + color: #A25AC1; + stroke: #A25AC1; +} + +.cyan { + color: #6AD1BF; + stroke: #6AD1BF; +} /* LOGIN diff --git a/client/src/components/constants.jsx b/client/src/components/constants.jsx index 0d300ba1..a5b80c85 100644 --- a/client/src/components/constants.jsx +++ b/client/src/components/constants.jsx @@ -184,21 +184,98 @@ module.exports = { SPECS: { Damage: { - description: 'Increase red / green / blue power stats cryp', + description: 'Increase red / green / blue damage stats cryp', upgrades: 'combine with 2 red / blue / green', - }, - Hp: { - description: 'Increases health of cryp', - upgrades: 'combine with 2 red / blue / green', + GreenDamageI: { + description: 'Increases green damage', + }, + RedDamageI: { + description: 'Increased red damage', + }, + + BlueDamageI: { + description: 'Increased blue damage', + }, + + GRDI: { + description: 'Increased green and red damage', + }, + + GBDI: { + description: 'Increased green and blue damage', + }, + + RBDI: { + description: 'Increased red and blue damage', }, Speed: { description: 'Increases speed of cryp', upgrades: 'combine with 2 red / blue / green', }, + + + Hp: { + description: 'Increases life', + upgrades: 'combine with 2 red / blue / green', + + }, + + LifeI: { + description: 'Increases life', + }, + + RedShieldI: { + description: 'Increased red shield', + }, + + BlueShieldI: { + description: 'Increased blue shield', + }, + + LRSI: { + description: 'Increased life and red shield', + }, + + LBSI: { + description: 'Increased life and blue shield', + }, + + RBSI: { + description: 'Increased red and blue shield', + }, + + Speed: { + description: 'Increases speed of cryp', + upgrades: 'combine with 2 red / blue / green', + }, + + RedSpeedI: { + description: 'Increases red speed', + }, + + BlueSpeedI: { + description: 'Increases blue speed', + }, + + GreenSpeedI: { + description: 'Increases green speed', + }, + + GRSpeedI: { + description: 'Increases green and red speed', + }, + + GBSpeedI: { + description: 'Increases green and blue speed', + }, + + RBSpeedI: { + description: 'Increases red and blue speed', + }, }, COLOURS: { diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 390f0dbd..ad65f55f 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -10,9 +10,17 @@ function Info(args) { const [type, value] = info; if (type === 'item') { + let itemDetails; + if (SKILLS[value]) { + itemDetails = SKILLS[value]; + } else if (SPECS[value]) { + itemDetails = SPECS[value]; + } else if (COLOURS[value]) { + itemDetails = COLOURS[value]; + } console.log(itemDetails); return (
- {info.value} - what does it do? + {value} - {itemDetails.description}
); } @@ -54,27 +62,14 @@ function Info(args) { { stat: 'green_damage', disp: 'Green Damage', colour: '#1FF01F' }, { stat: 'speed', disp: 'Speed', colour: '#FFD123' }, ].map((s, i) => ( -
{s.disp}: {value[s.stat].base} - {value[s.stat].max}
+
{s.disp}: {value[s.stat].base} {String.fromCharCode(8594)} {value[s.stat].max}
)); - const cryp = value; - const skills = cryp.skills.map((s, i) => ); - - const specs = cryp.specs.map((s, i) => ); - return (
-
{cryp.name}
+
{value.name}
{stats}
-
- {skills} -
-
- {specs} -
); } diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx index 927b3f64..be167e03 100644 --- a/client/src/components/instance.component.jsx +++ b/client/src/components/instance.component.jsx @@ -29,12 +29,12 @@ function Cryp(cryp, sendVboxApply, setInfo) { const item = parseInt(e.dataTransfer.getData('text'), 10); return sendVboxApply(cryp.id, item); } - const specs = cryp.specs.map((s, i) => ( + const specs = (cryp.specs.length > 0) ? cryp.specs.map((s, i) => (
setInfo('spec', { spec: s, cryp })}> {SPECS[s].svg(`stat-icon ${SPECS[s].colour}`)} -
{i}
+
{SPECS[s].caption}
- )); + )) : null; return (