From b0a86844828fdc602c3de2de4567091c4f054f5f Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 21 Nov 2019 12:39:36 +1100 Subject: [PATCH 1/4] change tutorial text to show it's not over --- client/src/tutorial.utils.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/tutorial.utils.jsx b/client/src/tutorial.utils.jsx index 78013698..a06cede2 100644 --- a/client/src/tutorial.utils.jsx +++ b/client/src/tutorial.utils.jsx @@ -204,7 +204,9 @@ function tutorialStage(tutorial, ws, clearTutorial, instance) { return (

Tutorial

-

You've completed the tutorial! Try to create more skill and spec combinations.

+

That completes the VBOX Tutorial.

+

Press READY to progress to the GAME PHASE
+ or continue creating new items to strengthen your constructs further

You can unequip skills and specs back into the inventory by double clicking.
Reclaim can be used to refund the cost of items in your inventory.

From 35c74ee3257666e928e70e089dea94ff4715408c Mon Sep 17 00:00:00 2001 From: Mashy Date: Thu, 21 Nov 2019 11:41:08 +1000 Subject: [PATCH 2/4] buycount bugfix --- client/src/components/vbox.component.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 9263662d..a0329268 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -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) { From cebf1720245a975187a01bdb060f5554cb01bba2 Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 21 Nov 2019 12:45:58 +1100 Subject: [PATCH 3/4] changelog generated --- CHANGELOG.md | 4 +++ client/changelog.html | 84 ++++++++++++++++++++++++++++++------------- 2 files changed, 63 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd7f01ba..fd1d26bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [1.9.1] - 2019-11-21 +### Fixed +- Fixed Item+ Purchasing Bug + ## [1.9.0] - 2019-11-21 ### Changed - VBOX diff --git a/client/changelog.html b/client/changelog.html index 80ff3f64..6c4f1a03 100644 --- a/client/changelog.html +++ b/client/changelog.html @@ -1,4 +1,6 @@ -CHANGELOG

-[1.8.5] - 2019-11-16

+[1.9.1] - 2019-11-21

Fixed

    +
  • Fixed Item+ Purchasing Bug
  • +
+

+[1.9.0] - 2019-11-21

+

+Changed

+
    +
  • VBOX +
      +
    • You can now buy and combine from the VBOX and your inventory at the same time.
    • +
    +
  • +
  • Performance +
      +
    • Websocket messages are now compressed in transit.
    • +
    +
  • +
+

+Added

+
    +
  • Concede Round +
      +
    • You can now concede game rounds, coward.
    • +
    +
  • +
+

+[1.8.5] - 2019-11-16

+

+Fixed

+
  • Multiple ko event bug

[1.8.4] - 2019-11-14

-Fixed

+Fixed
  • Bug with tutorial introduced in last patch

[1.8.3] - 2019-11-13

-Added

+Added
  • Preview combos by hovering over recipes
  • Condensed recipe display

-Fixed

+Fixed
  • Construct display on info / demo page
  • Case where a skill could send multiple ko events to target
  • Resizing of vbox when you buy / create certain items

-Changed

+Changed
  • Automatically shows a preview of combo item when you have 3 items selected for combining
  • Only highlight the first available item slot when equipping
  • @@ -780,19 +814,19 @@ pre {

    [1.8.2] - 2019-11-10

    -Fixed

    +Fixed
    • Duplicate button issue in reshape tab

    [1.8.1] - 2019-11-09

    -Fixed

    +Fixed
    • An issue where skills would not be put on cooldown after being used.

    -Changed

    +Changed
    • Game phase

      @@ -843,7 +877,7 @@ pre {

      [1.8.0] - 2019-11-06

      -Added

      +Added
      • Drag and drop for vbox interactions can be used instead of single click / double click

        @@ -859,7 +893,7 @@ pre {

      -Changed

      +Changed
      • Construct life changed

        @@ -927,7 +961,7 @@ pre {

        [1.7.0] - 2019-10-31

        -Added

        +Added
        • Step by step tutorial

          @@ -945,7 +979,7 @@ pre {

        -Changed

        +Changed
        • Vbox phase

          @@ -1072,7 +1106,7 @@ pre {

          [1.6.6] - 2019-10-27

          -Added

          +Added
          • Offering of draws
              @@ -1084,14 +1118,14 @@ pre {

              [1.6.5] - 2019-10-25

              -Fixed

              +Fixed
              • Stripe being blocked no longer causes unrecoverable error
              • Automatic ready up is now throttled after abandons
              • Player width styling

              -Changed

              +Changed
              • Improved wiggle animation
              • Intercept is now considered defensive by bots
              • @@ -1100,14 +1134,14 @@ pre {

                [1.6.4] - 2019-10-24

                -Changed

                +Changed
                • Animations processing on client side reduced.

                [1.6.3] - 2019-10-23

                -Added

                +Added
                • MNNI: the MNML guide
                    @@ -1116,7 +1150,7 @@ pre {

                  -Fixed

                  +Fixed
                  • Fixed issue where dots / hots would not trigger when reapplied at a higher speed
                  • Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab.
                  • @@ -1127,7 +1161,7 @@ pre {

                    [1.6.2] - 2019-10-20

                    -Fixed

                    +Fixed
                    • Combiner bug where it would preview items for different combinations
                    • Skill descriptions are cleared when animations start
                    • @@ -1137,12 +1171,12 @@ pre {

                      [1.6.0] - 2019-10-18

                      -Added

                      +Added
                      • Subscriber chat!

                      -Changed

                      +Changed
                      • Made available skill / effect information during the combat phase.

                        @@ -1166,7 +1200,7 @@ pre {

                      -Fixed

                      +Fixed
                      • Matchmaking bug where server matches you with yourself
                      @@ -1174,7 +1208,7 @@ pre { [1.5.6] - 2019-10-17

                      We've updated the UI during the vbox / buy phase to give a better indication of valid actions.

                      -Changed

                      +Changed
                      • Borders for skill combo's represent the base colours.

                        @@ -1200,7 +1234,7 @@ pre {

                        [1.5.5] - 2019-10-15

                        -Changed

                        +Changed
                        • Purge

                          From 4733704d4874a58c7e01b398b816a6a35b7a5200 Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 21 Nov 2019 12:47:18 +1100 Subject: [PATCH 4/4] v1.9.1 --- 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 abb16582..ee672d89 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.0 \ No newline at end of file +1.9.1 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index cd71a4c0..ca3b6f27 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.9.0", + "version": "1.9.1", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 81c6671c..b5585de2 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.9.0", + "version": "1.9.1", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 09284594..a3094609 100644 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.9.0", + "version": "1.9.1", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index bed06eaa..b666e932 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.9.0" +version = "1.9.1" authors = ["ntr "] [dependencies]