Merge branch 'release/1.6.2'

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.6.2] - 2019-10-20
+### Fixed
+- Combiner bug where it would preview items for different combinations
+- Skill descriptions are cleared when animations start
+
+## [1.6.1] - Skipped
+
 ## [1.6.0] - 2019-10-18
 ### Added
 - Subscriber chat!

VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

WORKLOG.md

@@ -4,6 +4,8 @@
 *PRODUCTION*
 
 * rename vbox to shop
+* give the shop and inventory distinct delineation 
+* proper victory / lose page instead of just face off (you are the winner or something)
 
 * mobile styles
 * mobile info page
@@ -21,11 +23,11 @@
 ## SOON
 
 * equip from shop (buy and equip without putting in your inventory) for bases
+* move item from one construct to another
 
 * bot game grind
 * ACP
   * essential
-* msg pane / chatwheel
 * audio
   * treats
     * susbcriber gold name in instance

acp/package.json

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

client/package.json

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

client/src/components/vbox.component.jsx

@@ -344,7 +344,13 @@ function Vbox(args) {
         } else {
             // Since theres 3 items in combiner and you can't have invalid combos we can preview it
             const combinerItems = combiner.map(j => vbox.bound[j]);
-            const comboItemObj = itemInfo.combos.find(combo => combinerItems.every(c => combo.components.includes(c)));
+            const combinerCount = countBy(combinerItems, co => co);
+            const comboItemObj = itemInfo.combos.find(combo => combinerItems.every(c => {
+                if (!combo.components.includes(c)) return false;
+                const comboCount = countBy(combo.components, co => co);
+                if (combinerCount[c] > comboCount[c]) return false;
+                return true;
+            }));
             comboItem = comboItemObj ? comboItemObj.item : 'refine';
             text = `Combine - ${comboItem}`;
         }

client/src/events.jsx

@@ -61,6 +61,7 @@ function registerEvents(store) {
         if (game && currentGame) {
             if (game.resolved.length !== currentGame.resolved.length) {
                 store.dispatch(actions.setAnimating(true));
+                store.dispatch(actions.setGameSkillInfo(null));
 
                 // stop fetching the game state til animations are done
                 const newRes = game.resolved.slice(currentGame.resolved.length);

ops/package.json

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

server/Cargo.toml

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