diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 9342e7c4..3146c044 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -136,7 +136,6 @@ function Info(args) { } function Combos() { - if (info) return false; if (!player) return false; if (!(combiner.every(u => u === null))) { diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 60635309..49f442f5 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -99,6 +99,12 @@ function Vbox(args) { if (instance.phase === 'Lobby') return false; const { vbox } = player; + // function setHighlight(type) { + // if (type === 'skill') return setVboxHighlight(itemInfo.items.filter(v => v.skill).map(v => v.item)); + // if (type === 'spec') return setVboxHighlight(itemInfo.items.filter(v => v.spec).map(v => v.item)); + // return false; + // } + function combinerChange(newCombiner) { setCombiner(newCombiner); if (newCombiner.every(c => c === null)) return setVboxHighlight([]); @@ -109,12 +115,12 @@ function Vbox(args) { .filter(combo => combinerValues.every(u => combo.units.includes(u))); const comboValues = itemInfo.items.filter(v => { - if (!filteredCombos.some(c => c.units.includes(v.v))) return false; - if (!['Red', 'Green', 'Blue'].includes(v.v) && combinerValues.includes(v.v)) return false; + if (!filteredCombos.some(c => c.units.includes(v.item))) return false; + if (!['Red', 'Green', 'Blue'].includes(v.item) && combinerValues.includes(v.item)) return false; return true; }); - return setVboxHighlight(comboValues.map(v => v.v)); + return setVboxHighlight(comboValues.map(v => v.item)); } //