Merge pull request #183 from willroberts/release-1.97.5

Disables the Editor in staging and bumps to version 1.97.5

Author: willroberts

config/staging.json

@@ -7,7 +7,7 @@
 		"password": ""
 	},
 	"inviteCodesActive": false,
-	"datGuiEditorEnabled": true,
+	"datGuiEditorEnabled": false,
 	"aiToolsEnabled": true,
 	"allCardsAvailable": true,
 	"watchSectionMinCurrentVersionGameCount": 1,

desktop/package.json

@@ -2,7 +2,7 @@
   "name": "duelyst-desktop",
   "productName": "Duelyst",
   "license": "CC0-1.0",
-  "version": "1.97.4",
+  "version": "1.97.5",
   "main": "desktop.js",
   "dependencies": {
     "electron-debug": "^2.0.0",

gulp/bundler.js

@@ -24,8 +24,6 @@ import {
   opts, config, env, version, production, staging, development,
 } from './shared';
 
-const datGUIEditorEnabled = development || staging || config.get('datGuiEditorEnabled');
-
 const minify = composer(uglify, console);
 
 // Browserify options
@@ -42,7 +40,7 @@ const bundlerOpts = {
 };
 
 const entries = ['./app/index'];
-if (datGUIEditorEnabled) {
+if (config.get('datGuiEditorEnabled')) {
   entries.push('./app/tools/editor.coffee');
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "open-duelyst",
   "license": "CC0-1.0",
-  "version": "1.97.4",
+  "version": "1.97.5",
   "engines": {
     "yarn": ">= 1.0.0"
   },

test/unit/sdk/cards/monthlies/month11.js

@@ -49,6 +49,8 @@ describe('monthlies', () => {
 
       expect(maw1.hasActiveModifierClass(SDK.ModifierProvoke)).to.equal(true);
     });
+
+    /* Test disabled: Slow.
     it('expect elkowl to gain two random abilities', () => {
       for (let i = 0; i < 100; i++) {
         const player1Deck = [
@@ -89,6 +91,8 @@ describe('monthlies', () => {
         SDK.GameSession.reset();
       }
     });
+    */
+
     it('expect grove lion to give your general forcefield', () => {
       const gameSession = SDK.GameSession.getInstance();
       const board = gameSession.getBoard();

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.97.4"
+  "version": "1.97.5"
 }