From 53725e15221302103cb984c205355f25e405d763 Mon Sep 17 00:00:00 2001 From: Mashy Date: Sun, 20 Oct 2019 12:57:56 +1000 Subject: [PATCH 1/4] proper combiner preview check, clear skill info on anim start --- client/src/components/vbox.component.jsx | 8 +++++++- client/src/events.jsx | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 9377795c..7e56bafb 100644 --- a/client/src/components/vbox.component.jsx +++ b/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}`; } diff --git a/client/src/events.jsx b/client/src/events.jsx index 63d9c5fb..faf2b0ee 100644 --- a/client/src/events.jsx +++ b/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); From cf7c3d1ac7293f2c21e105cb4b4addc1fcacdf0b Mon Sep 17 00:00:00 2001 From: Mashy Date: Sun, 20 Oct 2019 15:54:45 +1000 Subject: [PATCH 2/4] logs --- CHANGELOG.md | 8 ++++++++ WORKLOG.md | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 287876ae..9f0f9eaf 100644 --- a/CHANGELOG.md +++ b/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! diff --git a/WORKLOG.md b/WORKLOG.md index 10423c7d..e5d75a31 100644 --- a/WORKLOG.md +++ b/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 From fb3fa6eaca17c552d365f36c02834ace54df2de5 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 20 Oct 2019 17:09:40 +1100 Subject: [PATCH 3/4] v1.6.2 --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 2eda823f..308b6faa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.1 \ No newline at end of file +1.6.2 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 49a1d65d..50e3dad7 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.6.1", + "version": "1.6.2", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 1b71b406..4bd0df9e 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.6.1", + "version": "1.6.2", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index dcbb4593..164423a5 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.6.1", + "version": "1.6.2", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index b0292499..90c16448 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.6.1" +version = "1.6.2" authors = ["ntr "] [dependencies] From ded1a4cc069005f34458268b0a042283ae5eb0e9 Mon Sep 17 00:00:00 2001 From: ntr Date: Sun, 20 Oct 2019 17:44:14 +1100 Subject: [PATCH 4/4] Changelog --- CHANGELOG.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f0f9eaf..fab461ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,12 @@ 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-?? +## [1.6.2] - 2019-10-20 ### Fixed +- Combiner bug where it would preview items for different combinations +- Skill descriptions are cleared when animations start - - 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