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

CHANGELOG.md

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

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

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