ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.1'

Browse Source
This commit is contained in:
ntr 2019-11-21 12:58:59 +11:00
commit 5fa63ca597
9 changed files with 72 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## [1.9.1] - 2019-11-21
### Fixed
- Fixed Item+ Purchasing Bug
## [1.9.0] - 2019-11-21
### Changed
- VBOX

2
VERSION
View File

@ -1 +1 @@
1.9.0
1.9.1

2
acp/package.json
View File

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

84
client/changelog.html
View File

@ -1,4 +1,6 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><style>@font-face {
<!DOCTYPE html>
<html><head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><style>@font-face {
font-family: octicons-anchor;
src: url(https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.woff) format('woff');
}
@ -731,36 +733,68 @@ pre {
}
}
</style><title>CHANGELOG</title></head><body><article class="markdown-body"><h2>
<a id="user-content-185---2019-11-16" class="anchor" href="#185---2019-11-16" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.5] - 2019-11-16</h2>
<a id="user-content-191---2019-11-21" class="anchor" href="#191---2019-11-21" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.9.1] - 2019-11-21</h2>
<h3>
<a id="user-content-fixed" class="anchor" href="#fixed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Fixed Item+ Purchasing Bug</li>
</ul>
<h2>
<a id="user-content-190---2019-11-21" class="anchor" href="#190---2019-11-21" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.9.0] - 2019-11-21</h2>
<h3>
<a id="user-content-changed" class="anchor" href="#changed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>VBOX
<ul>
<li>You can now buy and combine from the VBOX and your inventory at the same time.</li>
</ul>
</li>
<li>Performance
<ul>
<li>Websocket messages are now compressed in transit.</li>
</ul>
</li>
</ul>
<h3>
<a id="user-content-added" class="anchor" href="#added" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
<li>Concede Round
<ul>
<li>You can now concede game rounds, coward.</li>
</ul>
</li>
</ul>
<h2>
<a id="user-content-185---2019-11-16" class="anchor" href="#185---2019-11-16" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.5] - 2019-11-16</h2>
<h3>
<a id="user-content-fixed-1" class="anchor" href="#fixed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Multiple ko event bug</li>
</ul>
<h2>
<a id="user-content-184---2019-11-14" class="anchor" href="#184---2019-11-14" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.4] - 2019-11-14</h2>
<h3>
<a id="user-content-fixed-1" class="anchor" href="#fixed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-2" class="anchor" href="#fixed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Bug with tutorial introduced in last patch</li>
</ul>
<h2>
<a id="user-content-183---2019-11-13" class="anchor" href="#183---2019-11-13" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.3] - 2019-11-13</h2>
<h3>
<a id="user-content-added" class="anchor" href="#added" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<a id="user-content-added-1" class="anchor" href="#added-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
<li>Preview combos by hovering over recipes</li>
<li>Condensed recipe display</li>
</ul>
<h3>
<a id="user-content-fixed-2" class="anchor" href="#fixed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-3" class="anchor" href="#fixed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Construct display on info / demo page</li>
<li>Case where a skill could send multiple ko events to target</li>
<li>Resizing of vbox when you buy / create certain items</li>
</ul>
<h3>
<a id="user-content-changed" class="anchor" href="#changed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-1" class="anchor" href="#changed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>Automatically shows a preview of combo item when you have 3 items selected for combining</li>
<li>Only highlight the first available item slot when equipping</li>
@ -780,19 +814,19 @@ pre {
<h2>
<a id="user-content-182---2019-11-10" class="anchor" href="#182---2019-11-10" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.2] - 2019-11-10</h2>
<h3>
<a id="user-content-fixed-3" class="anchor" href="#fixed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-4" class="anchor" href="#fixed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Duplicate button issue in reshape tab</li>
</ul>
<h2>
<a id="user-content-181---2019-11-09" class="anchor" href="#181---2019-11-09" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.1] - 2019-11-09</h2>
<h3>
<a id="user-content-fixed-4" class="anchor" href="#fixed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-5" class="anchor" href="#fixed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>An issue where skills would not be put on cooldown after being used.</li>
</ul>
<h3>
<a id="user-content-changed-1" class="anchor" href="#changed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-2" class="anchor" href="#changed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>
<p>Game phase</p>
@ -843,7 +877,7 @@ pre {
<h2>
<a id="user-content-180---2019-11-06" class="anchor" href="#180---2019-11-06" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.0] - 2019-11-06</h2>
<h3>
<a id="user-content-added-1" class="anchor" href="#added-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<a id="user-content-added-2" class="anchor" href="#added-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
<li>
<p>Drag and drop for vbox interactions can be used instead of single click / double click</p>
@ -859,7 +893,7 @@ pre {
</li>
</ul>
<h3>
<a id="user-content-changed-2" class="anchor" href="#changed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-3" class="anchor" href="#changed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>
<p>Construct life changed</p>
@ -927,7 +961,7 @@ pre {
<h2>
<a id="user-content-170---2019-10-31" class="anchor" href="#170---2019-10-31" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.7.0] - 2019-10-31</h2>
<h3>
<a id="user-content-added-2" class="anchor" href="#added-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<a id="user-content-added-3" class="anchor" href="#added-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
<li>
<p>Step by step tutorial</p>
@ -945,7 +979,7 @@ pre {
</li>
</ul>
<h3>
<a id="user-content-changed-3" class="anchor" href="#changed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-4" class="anchor" href="#changed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>
<p>Vbox phase</p>
@ -1072,7 +1106,7 @@ pre {
<h2>
<a id="user-content-166---2019-10-27" class="anchor" href="#166---2019-10-27" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.6] - 2019-10-27</h2>
<h3>
<a id="user-content-added-3" class="anchor" href="#added-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<a id="user-content-added-4" class="anchor" href="#added-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
<li>Offering of draws
<ul>
@ -1084,14 +1118,14 @@ pre {
<h2>
<a id="user-content-165---2019-10-25" class="anchor" href="#165---2019-10-25" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.5] - 2019-10-25</h2>
<h3>
<a id="user-content-fixed-5" class="anchor" href="#fixed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-6" class="anchor" href="#fixed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Stripe being blocked no longer causes unrecoverable error</li>
<li>Automatic ready up is now throttled after abandons</li>
<li>Player width styling</li>
</ul>
<h3>
<a id="user-content-changed-4" class="anchor" href="#changed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-5" class="anchor" href="#changed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>Improved wiggle animation</li>
<li>Intercept is now considered defensive by bots</li>
@ -1100,14 +1134,14 @@ pre {
<h2>
<a id="user-content-164---2019-10-24" class="anchor" href="#164---2019-10-24" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.4] - 2019-10-24</h2>
<h3>
<a id="user-content-changed-5" class="anchor" href="#changed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-6" class="anchor" href="#changed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>Animations processing on client side reduced.</li>
</ul>
<h2>
<a id="user-content-163---2019-10-23" class="anchor" href="#163---2019-10-23" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.3] - 2019-10-23</h2>
<h3>
<a id="user-content-added-4" class="anchor" href="#added-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<a id="user-content-added-5" class="anchor" href="#added-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
<li>MNNI: the MNML guide
<ul>
@ -1116,7 +1150,7 @@ pre {
</li>
</ul>
<h3>
<a id="user-content-fixed-6" class="anchor" href="#fixed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-7" class="anchor" href="#fixed-7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Fixed issue where dots / hots would not trigger when reapplied at a higher speed</li>
<li>Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab.</li>
@ -1127,7 +1161,7 @@ pre {
<h2>
<a id="user-content-162---2019-10-20" class="anchor" href="#162---2019-10-20" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.2] - 2019-10-20</h2>
<h3>
<a id="user-content-fixed-7" class="anchor" href="#fixed-7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-8" class="anchor" href="#fixed-8" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Combiner bug where it would preview items for different combinations</li>
<li>Skill descriptions are cleared when animations start</li>
@ -1137,12 +1171,12 @@ pre {
<h2>
<a id="user-content-160---2019-10-18" class="anchor" href="#160---2019-10-18" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.0] - 2019-10-18</h2>
<h3>
<a id="user-content-added-5" class="anchor" href="#added-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<a id="user-content-added-6" class="anchor" href="#added-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
<li>Subscriber chat!</li>
</ul>
<h3>
<a id="user-content-changed-6" class="anchor" href="#changed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-7" class="anchor" href="#changed-7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>
<p>Made available skill / effect information during the combat phase.</p>
@ -1166,7 +1200,7 @@ pre {
</li>
</ul>
<h3>
<a id="user-content-fixed-8" class="anchor" href="#fixed-8" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-9" class="anchor" href="#fixed-9" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Matchmaking bug where server matches you with yourself</li>
</ul>
@ -1174,7 +1208,7 @@ pre {
<a id="user-content-156---2019-10-17" class="anchor" href="#156---2019-10-17" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.5.6] - 2019-10-17</h2>
<p>We've updated the UI during the vbox / buy phase to give a better indication of valid actions.</p>
<h3>
<a id="user-content-changed-7" class="anchor" href="#changed-7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-8" class="anchor" href="#changed-8" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>
<p>Borders for skill combo's represent the base colours.</p>
@ -1200,7 +1234,7 @@ pre {
<h2>
<a id="user-content-155---2019-10-15" class="anchor" href="#155---2019-10-15" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.5.5] - 2019-10-15</h2>
<h3>
<a id="user-content-changed-8" class="anchor" href="#changed-8" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<a id="user-content-changed-9" class="anchor" href="#changed-9" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Changed</h3>
<ul>
<li>
<p>Purge</p>

2
client/package.json
View File

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

2
client/src/components/vbox.component.jsx
View File

@ -102,7 +102,7 @@ function validVboxSelect(vbox, itemInfo, shopSelect, stashSelect) {
const valid = selectedItems.every(c => {
if (!combo.components.includes(c)) return false;
if (itemCount[c] > comboCount[c]) return false;
buyCount[c] -= itemCount[c];
buyCount[c] -= 1;
return true;
});
if (valid) {

4
client/src/tutorial.utils.jsx
View File

@ -204,7 +204,9 @@ function tutorialStage(tutorial, ws, clearTutorial, instance) {
return (
<div class='info-item'>
<h2>Tutorial</h2>
<p>You've completed the tutorial! Try to create more skill and spec combinations. </p>
<p>That completes the VBOX Tutorial.</p>
<p>Press <b>READY</b> to progress to the <b>GAME PHASE</b> <br />
or continue creating new items to strengthen your constructs further</p>
<p>You can unequip skills and specs back into the inventory by double clicking. <br />
Reclaim can be used to refund the cost of items in your inventory. </p>
</div>

2
ops/package.json
View File

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

2
server/Cargo.toml
View File

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