Merge remote-tracking branch 'refs/remotes/origin/dev'

y-lohse · Jul 4, 2016 · 5a804a8 · 5a804a8
2 parents 439386b + 0501803
commit 5a804a8
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 dist/
+test/stories/
 
 # Logs
 logs

diff --git a/engine/Story.js b/engine/Story.js
@@ -638,9 +638,6 @@ export class Story extends InkObject{
 
 			case ControlCommand.CommandType.EndString:
 
-				// Since we're iterating backward through the content,
-				// build a stack so that when we build the string,
-				// it's in the right order
 				var contentStackForString = [];
 
 				var outputCountConsumed = 0;
@@ -662,6 +659,9 @@ export class Story extends InkObject{
 				// Consume the content that was produced for this string
 				this.state.outputStream.splice(this.state.outputStream.length - outputCountConsumed, outputCountConsumed);
 
+				//the C# version uses a Stack for contentStackForString, but we're using a simple array, so we need to reverse it before using it
+				contentStackForString = contentStackForString.reverse();
+
 				// Build string out of the content we collected
 				var sb = '';
 				contentStackForString.forEach(c => {
@@ -1180,7 +1180,7 @@ export class Story extends InkObject{
 		var numElements = numElementsIntVal.value;
 
 //		var seqCountVal = state.PopEvaluationStack () as IntValue;
-		var seqCountVal = tjis.state.PopEvaluationStack();
+		var seqCountVal = this.state.PopEvaluationStack();
 		var seqCount = seqCountVal.value;
 		var loopIndex = seqCount / numElements;
 		var iterationIndex = seqCount % numElements;

diff --git a/engine/VariablesState.js b/engine/VariablesState.js
@@ -19,7 +19,7 @@ export class VariablesState{
 		this.variableChangedEventCallbacks = [];
 
 		//if es6 proxies are available, use them.
-		if (Proxy){
+		try{
 			//the proxy is used to allow direct manipulation of global variables. It first tries to access the objetcs own property, and if none is found it delegates the call to the $ method, defined below
 			var p = new Proxy(this, {
 				get: function(target, name){
@@ -34,8 +34,9 @@ export class VariablesState{
 
 			return p;
 		}
-		else{
-			console.log("ES6 Proxy not available - direct manipulation of global variables can't work, use $() instead.");
+		catch(e){
+			//thr proxy object is not available in this context. we should warn the dev but writting to the console feels a bit intrusive.
+//			console.log("ES6 Proxy not available - direct manipulation of global variables can't work, use $() instead.");
 		}
 	}
 	get batchObservingVariableChanges(){

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inkjs",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A javascript port of inkle's ink scripting language (http://www.inklestudios.com/ink/)",
   "main": "dist/ink.cjs.js",
   "scripts": {

diff --git a/test/simple.js b/test/simple.js
@@ -7,14 +7,10 @@ var rl = readline.createInterface({
   output: process.stdout
 });
 
-var inkFile = fs.readFileSync(__dirname + '/stories/intercept.ink.json', 'UTF-8').replace(/^\uFEFF/, '');
+var inkFile = fs.readFileSync(__dirname + '/stories/test.ink.json', 'UTF-8').replace(/^\uFEFF/, '');
 var s = new Story(inkFile);
 var gameSave;
 
-console.log(s.variablesState['mood']);
-s.variablesState['mood'] = 1;
-console.log(s.variablesState['mood']);
-
 continueToNextChoice();
 
 function continueToNextChoice(){

diff --git a/test/stories/choice.ink.json b/test/stories/choice.ink.json
diff --git a/test/stories/choices.ink.json b/test/stories/choices.ink.json
diff --git a/test/stories/external.ink.json b/test/stories/external.ink.json
diff --git a/test/stories/fallback.ink.json b/test/stories/fallback.ink.json
diff --git a/test/stories/function.ink.json b/test/stories/function.ink.json
diff --git a/test/stories/glue.ink.json b/test/stories/glue.ink.json
diff --git a/test/stories/hello.ink.json b/test/stories/hello.ink.json
diff --git a/test/stories/hellofogg.ink.json b/test/stories/hellofogg.ink.json
diff --git a/test/stories/hellomultline.ink.json b/test/stories/hellomultline.ink.json
diff --git a/test/stories/intercept.ink.json b/test/stories/intercept.ink.json
diff --git a/test/stories/knot.ink.json b/test/stories/knot.ink.json
diff --git a/test/stories/shuffle.ink.json b/test/stories/shuffle.ink.json
diff --git a/test/stories/threads.ink b/test/stories/threads.ink
diff --git a/test/stories/threads.ink.json b/test/stories/threads.ink.json
diff --git a/test/stories/var.ink.json b/test/stories/var.ink.json
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     dist/
+    test/stories/
     # Logs
     logs
@@ Expand Down @@