Merge tag '1.5.5' into develop

1.5.5

CHANGELOG.md

@@ -2,18 +2,24 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.5.6] - YYYY-MM-DD
+## [1.5.5] - 2019-10-15
 ### Changed
-`Purge` Fixed bug where client animations would freeze when clearing a buff
-`Purge` Cooldown increased to 1T
+* Purge
+    * Fixed bug where client animations would freeze when clearing a buff
+    * Cooldown increased to 1T
 
+* VBOX
+    * You can no longer select invalid combinations.
 
-## [0.1.5] - 2019-10-10
+* Controls
+    * Abandon button now asks for confirmation.
+
+## [1.1.5] - 2019-10-10
 ### Changed
 `Recharge` Skill multiplier reduced 85/130/200 -> 70/110/170
 `Absorption` Skill duration reduced 5/7/9 -> 3/5/7
 
-## [0.1.4 2019-09-18]
+## [1.1.4 2019-09-18]
 
 ### Changed
 Removed self targetting, all skills can be used on any target

VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

WORKLOG.md

@@ -7,7 +7,6 @@
 * rename vbox to shop
 * combat phase info system
 * drag and drop buy / equip / unequip items
-* no combiner overflow (reset above 3)
 
 * mobile styles
 * mobile info page

acp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "",
   "main": "index.js",
   "scripts": {

client/assets/styles/game.less

@@ -205,7 +205,6 @@
 .resolving-skill {
     grid-area: target;
     align-self: center;
-    text-align: center;
     height: auto;
     svg {
         display: inline;

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "",
   "main": "index.js",
   "scripts": {

client/src/app.jsx

@@ -30,23 +30,21 @@ const store = createStore(
     window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(),
 );
 
-document.fonts.load('16pt "Jura"').then(() => {
-    const events = registerEvents(store);
-    // store.subscribe(() => console.log(store.getState()));
-    setupKeys(store);
+const events = registerEvents(store);
+// store.subscribe(() => console.log(store.getState()));
+setupKeys(store);
 
-    const ws = createSocket(events);
-    ws.connect();
-    events.setWs(ws);
+const ws = createSocket(events);
+ws.connect();
+events.setWs(ws);
 
-    const App = () => (
+const App = () => (
     <Provider store={store}>
         <StripeProvider apiKey={stripeKey()}>
             <Mnml />
         </StripeProvider>
     </Provider>
-    );
+);
 
-    // eslint-disable-next-line
-    preact.render(<App />, document.body);
-});
+// eslint-disable-next-line
+preact.render(<App />, document.body);

client/src/components/game.ctrl.btns.top.jsx

@@ -49,9 +49,10 @@ function GameCtrlTopBtns(args) {
     };
 
     const abandonClasses = `abandon ${abandonState ? 'confirming' : ''}`;
+    const abandonText = abandonState ? 'Confirm' : 'Abandon';
     const abandonAction = abandonState ? sendAbandon : abandonStateTrue;
 
-    const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>Abandon</button>;
+    const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>{abandonText}</button>;
     const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>;
 
     return (

client/src/components/instance.ctrl.top.btns.jsx

@@ -49,9 +49,10 @@ function InstanceTopBtns(args) {
     };
 
     const abandonClasses = `abandon ${abandonState ? 'confirming' : ''}`;
+    const abandonText = abandonState ? 'Confirm' : 'Abandon';
     const abandonAction = abandonState ? sendAbandon : abandonStateTrue;
 
-    const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>Abandon</button>;
+    const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>{abandonText}</button>;
     const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>;
 
     return (

client/src/components/vbox.component.jsx

@@ -1,5 +1,6 @@
 const preact = require('preact');
 const range = require('lodash/range');
+const countBy = require('lodash/countBy');
 const without = require('lodash/without');
 const { connect } = require('preact-redux');
 
@@ -249,12 +250,35 @@ function Vbox(args) {
             if (vboxSelecting) clearVboxSelected();
             if (reclaiming) return sendVboxReclaim(i);
 
+            // 4 things selected
+            if (combiner.length > 2) return combinerChange([i]);
+
+            // removing
             const combinerIndex = combiner.indexOf(i);
             if (combinerIndex > -1) {
                 return combinerChange(without(combiner, i));
             }
 
             combiner.push(i);
+
+            // invalid combo
+            const combinerItems = combiner.map(j => vbox.bound[j]);
+            const combinerCounts = countBy(combinerItems, c => c);
+
+            // unless some combo
+            // contains every combinerItems
+            // and combinerItems.count of item >= components.count(item)
+
+            if (!itemInfo.combos
+                .some(combo => {
+                    const comboCount = countBy(combo.components, c => c);
+                    return combinerItems.every(c =>
+                        combo.components.includes(c) && comboCount[c] >= combinerCounts[c]
+                    );
+                })) {
+                return combinerChange([i]);
+            }
+
             return combinerChange(combiner);
         }
 

ops/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "",
   "main": "index.js",
   "scripts": {

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.5.4"
+version = "1.5.5"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]