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

misc

Browse Source
This commit is contained in:
Mashy 2019-10-28 12:25:26 +10:00
parent 5dacda76dc
commit 6f5cf8bb39
2 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/instance.constructs.jsx
View File

@ -77,8 +77,11 @@ function Construct(props) {
iter, iter,
itemEquip, itemEquip,
instance, instance,
mobileVisible,
player, player,
tutorial, tutorial,
// Static Info
itemInfo,
// Function Calls // Function Calls
sendVboxApply, sendVboxApply,
sendUnequip, sendUnequip,
@ -272,7 +275,7 @@ class InstanceConstructs extends preact.Component {
const constructs = range(0, 3).map(i => { const constructs = range(0, 3).map(i => {
const tutorialConstruct = tutorialConstructDisplay(player, instance, tutorial, navInstance, i); const tutorialConstruct = tutorialConstructDisplay(player, instance, tutorial, navInstance, i);
if (tutorialConstruct) return (tutorialConstruct); if (tutorialConstruct) return (tutorialConstruct);
return Construct({ return Construct({
iter: i, iter: i,

126
client/src/components/vbox.component.jsx
View File

@ -160,12 +160,12 @@ class Vbox extends preact.Component {
// //
function vboxHover(e, v) { function vboxHover(e, v) {
if (v) { if (v) {
e.stopPropagation(); e.stopPropagation();
if (combiner.length !== 0) { if (combiner.length !== 0) {
const base = combiner.find(c => !['Red', 'Blue', 'Green'].includes(vbox.bound[c])); const base = combiner.find(c => !['Red', 'Blue', 'Green'].includes(vbox.bound[c]));
if (base) return setInfo(vbox.bound[base]); if (base) return setInfo(vbox.bound[base]);
} }
if (info !== v) setInfo(v); if (info !== v) setInfo(v);
} }
return true; return true;
} }
@ -247,32 +247,32 @@ class Vbox extends preact.Component {
function vboxElement() { function vboxElement() {
return ( return (
<div class='vbox-vbox' <div class='vbox-vbox'
onMouseDown={() => setReclaiming(false)} onMouseDown={() => setReclaiming(false)}
onClick={e => e.stopPropagation()}> onClick={e => e.stopPropagation()}>
<div class="vbox-hdr"> <div class="vbox-hdr">
<h3 <h3
onTouchStart={e => e.target.scrollIntoView(true)} onTouchStart={e => e.target.scrollIntoView(true)}
onMouseOver={e => hoverInfo(e, 'vbox')}> VBOX onMouseOver={e => hoverInfo(e, 'vbox')}> VBOX
</h3> </h3>
<div class="bits" onMouseOver={e => hoverInfo(e, 'bits')} >{vbox.bits}b</div> <div class="bits" onMouseOver={e => hoverInfo(e, 'bits')} >{vbox.bits}b</div>
</div> </div>
<div class="vbox-colours"> <div class="vbox-colours">
{range(0, 6).map(i => availableBtn(vbox.free[0][i], 0, i))} {range(0, 6).map(i => availableBtn(vbox.free[0][i], 0, i))}
</div> </div>
<div class="vbox-items"> <div class="vbox-items">
{range(0, 3).map(i => availableBtn(vbox.free[1][i], 1, i))} {range(0, 3).map(i => availableBtn(vbox.free[1][i], 1, i))}
{range(0, 3).map(i => availableBtn(vbox.free[2][i], 2, i))} {range(0, 3).map(i => availableBtn(vbox.free[2][i], 2, i))}
</div> </div>
<button <button
class='vbox-btn' class='vbox-btn'
onMouseOver={e => hoverInfo(e, 'refill')} onMouseOver={e => hoverInfo(e, 'refill')}
disabled={tutorial && tutorial < 7} disabled={tutorial && tutorial < 7}
onClick={e => e.stopPropagation()} onClick={e => e.stopPropagation()}
onMouseDown={() => sendVboxDiscard()}> onMouseDown={() => sendVboxDiscard()}>
refill - 2b refill - 2b
</button> </button>
</div> </div>
); );
} }
@ -313,10 +313,10 @@ class Vbox extends preact.Component {
if (reclaiming) return sendVboxReclaim(i); if (reclaiming) return sendVboxReclaim(i);
// 4 things selected // 4 things selected
if (combiner.length > 2) { if (combiner.length > 2) {
setInfo(vbox.bound[i]); setInfo(vbox.bound[i]);
return combinerChange([i]); return combinerChange([i]);
} }
// removing // removing
const combinerIndex = combiner.indexOf(i); const combinerIndex = combiner.indexOf(i);
if (combinerIndex > -1) { if (combinerIndex > -1) {
@ -325,10 +325,10 @@ class Vbox extends preact.Component {
combiner.push(i); combiner.push(i);
if (!comboHighlight) { if (!comboHighlight) {
setInfo(vbox.bound[i]); setInfo(vbox.bound[i]);
return combinerChange([i]); return combinerChange([i]);
} }
return combinerChange(combiner); return combinerChange(combiner);
} }
@ -407,29 +407,29 @@ class Vbox extends preact.Component {
} }
return ( return (
<div class={inventoryClass} <div class={inventoryClass}
onMouseDown={inventoryClick} onMouseDown={inventoryClick}
onClick={e => e.stopPropagation()} onClick={e => e.stopPropagation()}
style={vboxSelecting || (itemUnequip.length) ? { cursor: 'pointer' } : null}> style={vboxSelecting || (itemUnequip.length) ? { cursor: 'pointer' } : null}>
<div class="vbox-hdr"> <div class="vbox-hdr">
<h3 <h3
onTouchStart={e => e.target.scrollIntoView(true)} onTouchStart={e => e.target.scrollIntoView(true)}
onMouseOver={e => hoverInfo(e, 'inventory')}> INVENTORY onMouseOver={e => hoverInfo(e, 'inventory')}> INVENTORY
</h3> </h3>
<button <button
disabled={tutorial && tutorial < 8} disabled={tutorial && tutorial < 8}
class='vbox-btn reclaim' class='vbox-btn reclaim'
onMouseOver={e => hoverInfo(e, 'reclaim')} onMouseOver={e => hoverInfo(e, 'reclaim')}
onClick={e => e.stopPropagation()} onClick={e => e.stopPropagation()}
onMouseDown={reclaimClick}> onMouseDown={reclaimClick}>
reclaim reclaim
</button> </button>
</div> </div>
<div class='vbox-items'> <div class='vbox-items'>
{range(0, 9).map(i => inventoryBtn(vbox.bound[i], i))} {range(0, 9).map(i => inventoryBtn(vbox.bound[i], i))}
</div> </div>
{combinerBtn()} {combinerBtn()}
</div> </div>
); );
} }