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

client/assets/styles/instance.less

@@ -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 {

client/assets/styles/vbox.less

@@ -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 {

client/src/components/instance.constructs.jsx

@@ -153,15 +153,17 @@ function Construct(props) {
 
         const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
         return (
-            <button
+            <label onDragStart={skillClick} key={i} draggable="true">
-                key={i}
+                <button
-                disabled={!skill && !equipping}
+                    key={i}
-                class={classes}
+                    disabled={!skill && !equipping}
-                onClick={skillClick}
+                    class={classes}
-                onDblClick={skillDblClick}
+                    onClick={skillClick}
-                onMouseOver={e => hoverInfo(e, skill && skill.skill)} >
+                    onDblClick={skillDblClick}
-                {s}
+                    onMouseOver={e => hoverInfo(e, skill && skill.skill)} >
-            </button>
+                    {s}
+                </button>
+            </label>
         );
     });
 
@@ -195,13 +197,15 @@ function Construct(props) {
 
 
         return (
-            <button
+            <label onDragStart={specClick} key={i} draggable="true">
-                key={i}
+                <button
-                onClick={specClick}
+                    key={i}
-                onDblClick={specDblClick}
+                    onClick={specClick}
-                onMouseOver={e => hoverInfo(e, s)} >
+                    onDblClick={specDblClick}
-                {shapes[s]()}
+                    onMouseOver={e => hoverInfo(e, s)} >
-            </button>
+                    {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')} >

client/src/components/vbox.component.jsx

@@ -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 (
+            return (
+                <label draggable='true'>
                     <button
                         class={classes}
                         onMouseOver={e => vboxHover(e, v)}
                         onMouseDown={onClick}
                         onClick={e => e.stopPropagation()}
-                        onDblClick={onDblClick} >
+                        onDblClick={onDblClick}
-                        {shapes[v]()}
+                    > {vboxObject}
                     </button>
-                );
+                </label>
-            }
-
-            return (
-                <button
-                    class={classes}
-                    onMouseDown={onClick}
-                    onClick={e => e.stopPropagation()}
-                    onDblClick={onDblClick}
-                    onMouseOver={e => vboxHover(e, v)}>
-                    {v}
-                </button>
             );
         }
 
@@ -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]) {
+            
-                return (
+            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]()}
+                        {invObject}
                     </button>
-                );
+                </label>
-            }
-
-            return (
-                <button
-                    class={classes}
-                    onMouseDown={onClick}
-                    onClick={e => e.stopPropagation()}
-                    onMouseOver={e => vboxHover(e, v)}>
-                    {v}
-                </button>
             );
         }
 
@@ -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)}

server/src/skill.rs

@@ -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));