Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

This commit is contained in:
ntr
2019-09-19 16:13:27 +10:00
5 changed files with 128 additions and 79 deletions
+5 -3
View File
@@ -133,14 +133,16 @@ function InfoComponent(args) {
}
return false;
});
console.log(info);
const bonusObj = info.includes('Life')
? <div class={`${reqClass} bonus`} > + {bonus.bonus}</div>
: <div class={`${reqClass} bonus`} > + {bonus.bonus}%</div>;
const overFlowObj = overFlow.length ? <div> {overFlow} </div> : null;
return (
<div key={i} class="spec-goal">
{goals}
{overFlowObj}
<div class={`${reqClass} bonus`} >
+ {bonus.bonus}
</div>
{bonusObj}
</div>
);
});
@@ -179,10 +179,9 @@ function Construct(props) {
const stats = Object.keys(STATS).map(s => {
const stat = STATS[s];
const info = (s === 'SpeedStat' && 'Speed')
|| (s.includes('Power') && 'Power')
|| (s.includes('Life') && 'Life');
const info = (s === 'SpeedStat' && 'speedStat')
|| (s.includes('Power') && 'powerStat')
|| (s.includes('Life') && 'lifeStat');
return <div key={stat.stat}
alt={stat.stat}
class={stat.stat}