ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spec goal overflow

Browse Source
This commit is contained in:
Mashy 2019-08-15 15:37:32 +10:00
parent fbf0eead04
commit 9cc4995959
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/assets/styles/instance.less
View File

@ -57,7 +57,7 @@
.instance .info svg { .instance .info svg {
display: inline; display: inline;
height: 1.25em; height: 1em;
} }
.instance .constructs { .instance .constructs {
@ -384,7 +384,7 @@
} }
.bonus { .bonus {
justify-content: flex-end; justify-content: center;
} }
} }

24
client/src/components/info.component.jsx
View File

@ -56,6 +56,8 @@ function InfoComponent(args) {
green: [], green: [],
blue: [], blue: [],
}; };
const overFlow = [];
colours.forEach(c => { colours.forEach(c => {
const colourReq = bonus.req[c]; const colourReq = bonus.req[c];
if (colourReqs === 0) return false; if (colourReqs === 0) return false;
@ -67,15 +69,24 @@ function InfoComponent(args) {
const dots = range(start, colourReq).map(j => { const dots = range(start, colourReq).map(j => {
const unmet = teamColours[c] < j + 1; const unmet = teamColours[c] < j + 1;
const reqClass = unmet const reqClass = unmet
? 'unmet' ? 'unmet'
: ''; : '';
colourGoals[c].push( if (j - start > 4) {
<figure key={j} alt={c.colour} class={reqClass} > overFlow.push(
{shapes.vboxColour(c)} <figure key={j} alt={c.colour} class={reqClass} >
</figure> {shapes.vboxColour(c)}
); </figure>
);
} else {
colourGoals[c].push(
<figure key={j} alt={c.colour} class={reqClass} >
{shapes.vboxColour(c)}
</figure>
);
}
return true; return true;
}); });
@ -97,10 +108,11 @@ function InfoComponent(args) {
} }
return false; return false;
}); });
const overFlowObj = overFlow.length ? <div> {overFlow} </div> : null;
return ( return (
<div key={i} class="spec-goal"> <div key={i} class="spec-goal">
{goals} {goals}
{overFlowObj}
<div class={`${reqClass} bonus`} > <div class={`${reqClass} bonus`} >
+ {bonus.bonus} + {bonus.bonus}
</div> </div>

28
server/src/item.rs
View File

@ -489,7 +489,7 @@ impl Item {
self.into_skill().unwrap().effect()[0].get_duration()), self.into_skill().unwrap().effect()[0].get_duration()),
Item::Buff => format!("Increase target construct RedPower and SpeedStat by {:?}%", Item::Buff => format!("Increase target construct RedPower and SpeedStat by {:?}%",
self.into_skill().unwrap().effect()[0].get_multiplier() - 100), 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()), 100 - self.into_skill().unwrap().effect()[0].get_multiplier()),
// specs // specs
// Base // Base
@ -502,28 +502,22 @@ impl Item {
// Lifes Upgrades // Lifes Upgrades
Item::LifeGG=> format!("Increases construct GreenLife green life. Item::LifeGG=> format!("Increases construct GreenLife green life.
When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."),
Item::LifeRR=> format!("Increases construct RedLife. Item::LifeRR=> format!("Increases construct RedLife red life.
RedLife mitigates red damage that would otherwise reduce your GreenLife."), Mitigates red damage that would otherwise reduce your GreenLife green life."),
Item::LifeBB=> format!("Increases construct BlueLife. Item::LifeBB=> format!("Increases construct BlueLife blue life.
BlueLife mitigates blue damage that would otherwise reduce your GreenLife."), Mitigates blue damage that would otherwise reduce your GreenLife green life."),
Item::LifeRG=> format!("Increases construct GreenLife and RedLife"), Item::LifeRG=> format!("Increases construct GreenLife and RedLife"),
Item::LifeGB=> format!("Increases construct GreenLife and BlueLife"), Item::LifeGB=> format!("Increases construct GreenLife and BlueLife"),
Item::LifeRB=> format!("Increases construct RedLife and BlueLife"), Item::LifeRB=> format!("Increases construct RedLife and BlueLife"),
Item::LifeGGPlus => format!("Increases construct GreenLife. 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."),
Item::LifeRRPlus => format!("Increases construct RedLife. Item::LifeBBPlus => format!("Increases construct BlueLife."),
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::LifeRGPlus => format!("Increases construct GreenLife and RedLife"), Item::LifeRGPlus => format!("Increases construct GreenLife and RedLife"),
Item::LifeGBPlus => format!("Increases construct GreenLife and BlueLife"), Item::LifeGBPlus => format!("Increases construct GreenLife and BlueLife"),
Item::LifeRBPlus => format!("Increases construct RedLife and BlueLife"), Item::LifeRBPlus => format!("Increases construct RedLife and BlueLife"),
Item::LifeGGPlusPlus => format!("Increases construct GreenLife green life. Item::LifeGGPlusPlus => format!("Increases construct GreenLife."),
When your construct reaches 0 GreenLife it is knocked out and cannot cast skills."), Item::LifeRRPlusPlus => format!("Increases construct RedLife."),
Item::LifeRRPlusPlus => format!("Increases construct RedLife red life. Item::LifeBBPlusPlus => format!("Increases construct BlueLife."),
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::LifeRGPlusPlus => format!("Increases construct GreenLife and RedLife"), Item::LifeRGPlusPlus => format!("Increases construct GreenLife and RedLife"),
Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife"), Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife"),
Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife"), Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife"),