Merge branch 'dev'

dominikwilkowski · Oct 17, 2016 · 09c364f · 09c364f
2 parents 799e52c + b6d9ba0
commit 09c364f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -61,6 +61,7 @@ TODO
 
 
 ## Release History
+* 0.1.2  -  Fixed error message
 * 0.1.1  -  Added level indicator, fixed lives display
 * 0.1.0  -  alpha release
 

diff --git a/dev/999-init.js b/dev/999-init.js
@@ -45,11 +45,15 @@ BEAST.checkSize = () => {
 	if( CliSize().columns < ( BEAST.MINWIDTH + 4 ) || CliSize().rows < ( BEAST.MINHEIGHT + 1 ) ) {
 
 		if( CliSize().columns < ( BEAST.MINWIDTH + 4 ) ) {
-			error = `  Your console is not wide enough for this game\n  (It is ${CliSize().columns} wide but needs to be ${( BEAST.MINWIDTH + 4 )})\n`;
+			error = `\n  Your console window is not wide enough for this game\n` +
+				`  Please resize your window to at least ${( BEAST.MINWIDTH + 4 )} x ${( BEAST.MINHEIGHT + 1 )}\n` +
+				`  (It is ${CliSize().columns} x ${CliSize().rows})\n`;
 		}
 
 		if( CliSize().rows < ( BEAST.MINHEIGHT + 1 ) ) {
-			error = `  Your console is not tall enough for this game\n  (It is ${CliSize().rows} tall but needs to be ${( BEAST.MINHEIGHT + 1 )})\n`;
+			error = `\n  Your console window is not tall enough for this game\n` +
+				`  Please resize your window to at least ${( BEAST.MINWIDTH + 4 )} x ${( BEAST.MINHEIGHT + 1 )}\n` +
+				`  (It is ${CliSize().columns} x ${CliSize().rows})\n`;
 		}
 	}
 

diff --git a/dev/dev.js b/dev/dev.js
@@ -931,11 +931,15 @@ BEAST.checkSize = () => {
 	if( CliSize().columns < ( BEAST.MINWIDTH + 4 ) || CliSize().rows < ( BEAST.MINHEIGHT + 1 ) ) {
 
 		if( CliSize().columns < ( BEAST.MINWIDTH + 4 ) ) {
-			error = `  Your console is not wide enough for this game\n  (It is ${CliSize().columns} wide but needs to be ${( BEAST.MINWIDTH + 4 )})\n`;
+			error = `\n  Your console window is not wide enough for this game\n` +
+				`  Please resize your window to at least ${( BEAST.MINWIDTH + 4 )} x ${( BEAST.MINHEIGHT + 1 )}\n` +
+				`  (It is ${CliSize().columns} x ${CliSize().rows})\n`;
 		}
 
 		if( CliSize().rows < ( BEAST.MINHEIGHT + 1 ) ) {
-			error = `  Your console is not tall enough for this game\n  (It is ${CliSize().rows} tall but needs to be ${( BEAST.MINHEIGHT + 1 )})\n`;
+			error = `\n  Your console window is not tall enough for this game\n` +
+				`  Please resize your window to at least ${( BEAST.MINWIDTH + 4 )} x ${( BEAST.MINHEIGHT + 1 )}\n` +
+				`  (It is ${CliSize().columns} x ${CliSize().rows})\n`;
 		}
 	}
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "beast.js",
 	"description": "ANSI Beast for node",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"homepage": "https://github.com/dominikwilkowski/beast.js",
 	"author": {
 		"name": "Dominik Wilkowski",

diff --git a/prod/index.js b/prod/index.js
@@ -931,11 +931,15 @@ BEAST.checkSize = () => {
 	if( CliSize().columns < ( BEAST.MINWIDTH + 4 ) || CliSize().rows < ( BEAST.MINHEIGHT + 1 ) ) {
 
 		if( CliSize().columns < ( BEAST.MINWIDTH + 4 ) ) {
-			error = `  Your console is not wide enough for this game\n  (It is ${CliSize().columns} wide but needs to be ${( BEAST.MINWIDTH + 4 )})\n`;
+			error = `\n  Your console window is not wide enough for this game\n` +
+				`  Please resize your window to at least ${( BEAST.MINWIDTH + 4 )} x ${( BEAST.MINHEIGHT + 1 )}\n` +
+				`  (It is ${CliSize().columns} x ${CliSize().rows})\n`;
 		}
 
 		if( CliSize().rows < ( BEAST.MINHEIGHT + 1 ) ) {
-			error = `  Your console is not tall enough for this game\n  (It is ${CliSize().rows} tall but needs to be ${( BEAST.MINHEIGHT + 1 )})\n`;
+			error = `\n  Your console window is not tall enough for this game\n` +
+				`  Please resize your window to at least ${( BEAST.MINWIDTH + 4 )} x ${( BEAST.MINHEIGHT + 1 )}\n` +
+				`  (It is ${CliSize().columns} x ${CliSize().rows})\n`;
 		}
 	}