diff --git a/client/src/components/instance.cryps.jsx b/client/src/components/instance.cryps.jsx index 3ccea696..034eb1fa 100644 --- a/client/src/components/instance.cryps.jsx +++ b/client/src/components/instance.cryps.jsx @@ -78,7 +78,7 @@ function Cryp(props) { function onClick(e) { e.stopPropagation(); e.preventDefault(); - if (itemEquip !== null) sendVboxApply(cryp.id, itemEquip); + if (itemEquip) sendVboxApply(cryp.id, itemEquip); setItemEquip(null); return setActiveCryp(cryp); } @@ -112,17 +112,10 @@ function Cryp(props) { const specs = range(0, 6).map(i => { const s = cryp.specs[i]; - function blankSpecClick(e) { - e.stopPropagation(); - if (itemEquip !== null) return sendVboxApply(cryp.id, itemEquip); - setHighlight('spec'); - return setActiveCryp(cryp); - } - if (!s) { const equip = specList.includes(vbox.bound[itemEquip]) ? 'equip-spec' : 'gray'; return ( -
+
{shapes.diamond(`stat-icon ${equip}`)}
); @@ -214,11 +207,11 @@ function InstanceCryps(props) { if (instance.phase === 'Lobby') return false; const cryps = player.cryps.map((c, i) => Cryp({ + cryp: c, activeCryp, itemEquip, setItemUnequip, setItemEquip, - cryp: c, player, sendVboxApply, setInfo, diff --git a/client/src/components/instance.equip.jsx b/client/src/components/instance.equip.jsx index 867e044e..78ba675c 100644 --- a/client/src/components/instance.equip.jsx +++ b/client/src/components/instance.equip.jsx @@ -58,6 +58,7 @@ function Equipment(props) { const isSpec = fullInfo && fullInfo.spec; function boundClick(e, i) { + if (itemUnequip && activeCryp) return false; const value = vbox.bound[i]; setItemEquip(i); return false;