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

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

Browse Source
This commit is contained in:
ntr 2019-11-04 17:59:46 +11:00
commit b743837870
5 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,6 +203,9 @@
button {
height: 3em;
}
label {
display: flex;
}
}
.specs {
@ -228,6 +231,10 @@
font-size: 75%;
line-height: initial;
}
label {
display: flex;
}
}
.stats {

2
client/assets/styles/vbox.less
View File

@ -83,7 +83,7 @@
&.highlight {
color: black;
background: @white;
border: 1px solid @white;
// border: 1px solid @white; (this bangs around the vbox)
// overwrite the classes on white svg elements
svg {

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

@ -153,6 +153,7 @@ function Construct(props) {
const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
return (
<label onDragStart={skillClick} key={i} draggable="true">
<button
key={i}
disabled={!skill && !equipping}
@ -162,6 +163,7 @@ function Construct(props) {
onMouseOver={e => hoverInfo(e, skill && skill.skill)} >
{s}
</button>
</label>
);
});
@ -195,6 +197,7 @@ function Construct(props) {
return (
<label onDragStart={specClick} key={i} draggable="true">
<button
key={i}
onClick={specClick}
@ -202,6 +205,7 @@ function Construct(props) {
onMouseOver={e => hoverInfo(e, s)} >
{shapes[s]()}
</button>
</label>
);
});
@ -223,7 +227,7 @@ function Construct(props) {
const classes = `instance-construct ${mobileVisible ? 'visible' : ''}`;
const avatarMouseOver = e => hoverInfo(e, `constructAvatar ${construct.name}`);
return (
<div key={construct.id} class={classes} onClick={onClick}>
<div key={construct.id} class={classes} onClick={onClick} onDragOver={ev => ev.preventDefault()} onDrop={onClick}>
<ConstructAvatar construct={construct} mouseOver={avatarMouseOver}/>
<h2 class="name" onMouseOver={e => hoverInfo(e, `constructName ${construct.name}`)}>{construct.name}</h2>
<div class="skills" onMouseOver={e => hoverInfo(e, 'constructSkills')} >

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

@ -194,8 +194,6 @@ class Vbox extends preact.Component {
e.stopPropagation();
setItemEquip(null);
setCombiner([]);
if (selected) return clearVboxSelected();
setInfo(vbox.free[group][index]);
return setVboxSelected([group, index]);
}
@ -217,28 +215,18 @@ class Vbox extends preact.Component {
const classes = `${v.toLowerCase()} ${selected ? 'highlight' : ''} ${comboHighlight}`;
if (shapes[v]) {
const vboxObject = shapes[v] ? shapes[v]() : v;
return (
<label draggable='true'>
<button
class={classes}
onMouseOver={e => vboxHover(e, v)}
onMouseDown={onClick}
onClick={e => e.stopPropagation()}
onDblClick={onDblClick} >
{shapes[v]()}
</button>
);
}
return (
<button
class={classes}
onMouseDown={onClick}
onClick={e => e.stopPropagation()}
onDblClick={onDblClick}
onMouseOver={e => vboxHover(e, v)}>
{v}
> {vboxObject}
</button>
</label>
);
}
@ -318,7 +306,8 @@ class Vbox extends preact.Component {
// removing
const combinerIndex = combiner.indexOf(i);
if (combinerIndex > -1) {
return combinerChange(without(combiner, i));
return true;
// return combinerChange(without(combiner, i));
}
combiner.push(i);
@ -334,26 +323,19 @@ class Vbox extends preact.Component {
const highlighted = combiner.indexOf(i) > -1;
const border = buttons[removeTier(v)] ? buttons[removeTier(v)]() : '';
const classes = `${highlighted ? 'highlight' : border} ${comboHighlight}`;
if (shapes[v]) {
const invObject = shapes[v] ? shapes[v]() : v;
return (
<label draggable="true">
<button
class={classes}
onMouseOver={e => vboxHover(e, v)}
onClick={e => e.stopPropagation()}
onMouseDown={onClick}>
{shapes[v]()}
</button>
);
}
return (
<button
class={classes}
onMouseDown={onClick}
onClick={e => e.stopPropagation()}
onMouseOver={e => vboxHover(e, v)}>
{v}
{invObject}
</button>
</label>
);
}
@ -408,7 +390,10 @@ class Vbox extends preact.Component {
<div class={inventoryClass}
onMouseDown={inventoryClick}
onClick={e => e.stopPropagation()}
style={vboxSelecting || (itemUnequip.length) ? { cursor: 'pointer' } : null}>
style={vboxSelecting || (itemUnequip.length) ? { cursor: 'pointer' } : null}
onDragOver={ev => ev.preventDefault()}
onDrop={inventoryClick}
>
<div class="vbox-hdr">
<h3
onTouchStart={e => e.target.scrollIntoView(true)}

8
server/src/skill.rs
View File

@ -1394,7 +1394,7 @@ fn sustain(source: &mut Construct, target: &mut Construct, mut results: Resoluti
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
@ -1416,7 +1416,7 @@ fn intercept(source: &mut Construct, target: &mut Construct, mut results: Resolu
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));
@ -1721,7 +1721,7 @@ fn reflect(source: &mut Construct, target: &mut Construct, mut results: Resoluti
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));
@ -1739,7 +1739,7 @@ fn recharge(source: &mut Construct, target: &mut Construct, mut results: Resolut
}
_ => {
warn!("no recharge event found {:?}", e);
return results;
EventStages::NoStages
}
};
results.push(Resolution::new(source, target).event(e).stages(stages));