diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less index c91c6571..c7f2a36d 100644 --- a/client/assets/styles/instance.less +++ b/client/assets/styles/instance.less @@ -57,7 +57,7 @@ .instance .info svg { display: inline; - height: 1.25em; + height: 1em; } .instance .constructs { @@ -384,7 +384,7 @@ } .bonus { - justify-content: flex-end; + justify-content: center; } } diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index ebc210a4..547581aa 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -56,6 +56,8 @@ function InfoComponent(args) { green: [], blue: [], }; + const overFlow = []; + colours.forEach(c => { const colourReq = bonus.req[c]; if (colourReqs === 0) return false; @@ -67,15 +69,24 @@ function InfoComponent(args) { const dots = range(start, colourReq).map(j => { const unmet = teamColours[c] < j + 1; + const reqClass = unmet ? 'unmet' : ''; - colourGoals[c].push( -
- {shapes.vboxColour(c)} -
- ); + if (j - start > 4) { + overFlow.push( +
+ {shapes.vboxColour(c)} +
+ ); + } else { + colourGoals[c].push( +
+ {shapes.vboxColour(c)} +
+ ); + } return true; }); @@ -97,10 +108,11 @@ function InfoComponent(args) { } return false; }); - + const overFlowObj = overFlow.length ?
{overFlow}
: null; return (
{goals} + {overFlowObj}
+ {bonus.bonus}
diff --git a/server/src/item.rs b/server/src/item.rs index 4eb57ea1..d7ed1039 100644 --- a/server/src/item.rs +++ b/server/src/item.rs @@ -489,7 +489,7 @@ impl Item { self.into_skill().unwrap().effect()[0].get_duration()), Item::Buff => format!("Increase target construct RedPower and SpeedStat by {:?}%", self.into_skill().unwrap().effect()[0].get_multiplier() - 100), - Item::Debuff => format!("Slow target construct SpeedStat by {:?}%", + Item::Debuff => format!("Slows the target reducing SpeedStat by {:?}%", 100 - self.into_skill().unwrap().effect()[0].get_multiplier()), // specs // Base @@ -502,28 +502,22 @@ impl Item { // Lifes Upgrades Item::LifeGG=> format!("Increases construct GreenLife green life. When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), - Item::LifeRR=> format!("Increases construct RedLife. - RedLife mitigates red damage that would otherwise reduce your GreenLife."), - Item::LifeBB=> format!("Increases construct BlueLife. - BlueLife mitigates blue damage that would otherwise reduce your GreenLife."), + Item::LifeRR=> format!("Increases construct RedLife red life. + Mitigates red damage that would otherwise reduce your GreenLife green life."), + Item::LifeBB=> format!("Increases construct BlueLife blue life. + Mitigates blue damage that would otherwise reduce your GreenLife green life."), Item::LifeRG=> format!("Increases construct GreenLife and RedLife"), Item::LifeGB=> format!("Increases construct GreenLife and BlueLife"), Item::LifeRB=> format!("Increases construct RedLife and BlueLife"), - Item::LifeGGPlus => format!("Increases construct GreenLife. - When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), - Item::LifeRRPlus => format!("Increases construct RedLife. - RedDamage dealt to your construct reduces RedLife before GreenLife."), - Item::LifeBBPlus => format!("Increases construct BlueLife. - BlueDamage dealt to your construct reduces BlueLife before GreenLife."), + Item::LifeGGPlus => format!("Increases construct GreenLife."), + Item::LifeRRPlus => format!("Increases construct RedLife."), + Item::LifeBBPlus => format!("Increases construct BlueLife."), Item::LifeRGPlus => format!("Increases construct GreenLife and RedLife"), Item::LifeGBPlus => format!("Increases construct GreenLife and BlueLife"), Item::LifeRBPlus => format!("Increases construct RedLife and BlueLife"), - Item::LifeGGPlusPlus => format!("Increases construct GreenLife green life. - When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), - Item::LifeRRPlusPlus => format!("Increases construct RedLife red life. - RedLife mitigates red damage that would otherwise reduce your GreenLife."), - Item::LifeBBPlusPlus => format!("Increases construct BlueLife blue life. - BlueLife mitigates blue damage that would otherwise reduce your GreenLife."), + Item::LifeGGPlusPlus => format!("Increases construct GreenLife."), + Item::LifeRRPlusPlus => format!("Increases construct RedLife."), + Item::LifeBBPlusPlus => format!("Increases construct BlueLife."), Item::LifeRGPlusPlus => format!("Increases construct GreenLife and RedLife"), Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife"), Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife"),