Now the real v1.2.1 (missing merge)

Author: bladecoder

adventure-test-ink/INK-SRC/test-story.ink

@@ -1,45 +1,19 @@
-EXTERNAL cutMode(value)
-EXTERNAL goto(actor, target)
-EXTERNAL animation(actor, anim, wait)
-EXTERNAL setModelProp(prop, value)
-EXTERNAL getModelProp(prop)
-
 -> init
 
-=== function cutMode(value) ===
-(CUTMODE {value:true|false})
-
-=== function goto(actor, target) ===
-(GOTO {actor} to {target})
-
-=== function animation(actor, anim, wait) ===
-(ANIMATION {actor}.{anim} {wait})
-
-=== function setModelProp(prop, value) ===
-(SETMODELPROP {prop}={value})
-
-=== function getModelProp(prop) ===
-(GETMODELPROP {prop})
-
-
 === init ===
 
-~goto("red", "target")
-~animation("green", "stand.left", false)
-
-~setModelProp("currentScene.actors[red].state", "RED COLOR")
-
-Hi! This is a graphic adventure written with Ink! #actor:green
+> action: Goto #actor:red #target: target
+> action: Animation #animation: green.stand.left #wait:false
 
-Can you drive your game and story throught the Ink language? #actor:green
+green: Hi! This is a graphic adventure written with Ink!
 
-* Yes, I can do everything with Ink.
-* I don't think so.
-* I know nothing about Ink
+green: Can you drive your game and story throught the Ink language?
 
-- Well, you did it! #actor:green
+* Yes, I can do everything with Ink. #actor:red
+* I don't think so. #actor:red
+* I know nothing about Ink #actor:red
 
-The red character state is: {getModelProp("currentScene.actors[red].state")}
+- green: Well, you did it!
 
 -> END
 

adventure-test-ink/INK-SRC/test2.ink

@@ -2,22 +2,22 @@
 
 === d1 ===
 
-Hi!
-How are you?
+Hi! #actor:player
+How are you? #actor:player
 
 Fine, thanks! #actor: green
 
 Are you hungry? #actor:green
 
-* No[], I don't
+* player: No[], I don't.
 	Ok, let me know when you want some food. #actor:green
-* Yes
+* Yes #actor:player
 	Would you like a hamburger? #actor:green
-	** Yes
+	** Yes #actor:player
 		Maybe you are too fat, here you have a banana. #actor:green
-	** No
+	** No #actor:player
 		Well, here you have a banana. #actor:green
 
-- Bye  
+- Bye   #actor:player
 
 -> END

adventure-test-ink/android/assets/BladeEngine.properties

@@ -1,9 +1,9 @@
-#Fri Dec 16 14:02:05 CET 2016
+#Mon Feb 20 14:10:13 CET 2017
 roboVMVersion=2.3.0
 debug=false
 gdxVersion=1.9.5
-auto_hide_texts=false
-bladeEngineVersion=1.1.0
+auto_hide_texts=true
+bladeEngineVersion=1.2.0
 version=unspecified
 title=Blade Engine Ink Test
 ui_mode=two_buttons

adventure-test-ink/android/assets/model/00.chapter.json

@@ -1,5 +1,5 @@
 {
-bladeEngineVersion: "1.1.0-SNAPSHOT",
+bladeEngineVersion: "1.1.2-SNAPSHOT",
 scenes: {
 	"00": {
 		id: "00",
@@ -64,6 +64,7 @@ scenes: {
 					initAnimation: "stand.right"
 				},
 				scale: 0.3066198,
+				rot: 0,
 				tint: {
 					r: 1,
 					a: 1
@@ -124,6 +125,7 @@ scenes: {
 					initAnimation: "stand.right"
 				},
 				scale: 0.6267129,
+				rot: 0,
 				tint: {
 					g: 1,
 					a: 1
@@ -267,6 +269,7 @@ scenes: {
 					initAnimation: "stand.left"
 				},
 				scale: 0.6300766,
+				rot: 0,
 				tint: {
 					g: 1,
 					a: 1
@@ -335,6 +338,7 @@ scenes: {
 					initAnimation: "stand.right"
 				},
 				scale: 0.6228006,
+				rot: 0,
 				tint: null,
 				depthType: "VECTOR",
 				bboxFromRenderer: true,

adventure-test-ink/android/assets/model/test-story.ink.json

@@ -1 +1 @@
-{"inkVersion":15,"root":[{"->":"init"},"done",{"cutMode":[{"temp=":"value"},"^(CUTMODE ",["G>","ev",{"VAR?":"value"},"/ev",[{"->":".^.b","c":true},{"b":["^true",{"->":".^.^.^.6"},null]}],[{"->":".^.b"},{"b":["^false",{"->":".^.^.^.6"},null]}],"nop","G<",null],"^)","\n",{"#f":3}],"goto":[{"temp=":"target"},{"temp=":"actor"},"^(GOTO ",["G>","ev",{"VAR?":"actor"},"out","/ev","G<",null],"^ to ",["G>","ev",{"VAR?":"target"},"out","/ev","G<",null],"^)","\n",{"#f":3}],"animation":[{"temp=":"wait"},{"temp=":"anim"},{"temp=":"actor"},"^(ANIMATION ",["G>","ev",{"VAR?":"actor"},"out","/ev","G<",null],"^.",["G>","ev",{"VAR?":"anim"},"out","/ev","G<",null],"^ ",["G>","ev",{"VAR?":"wait"},"out","/ev","G<",null],"^)","\n",{"#f":3}],"setModelProp":[{"temp=":"value"},{"temp=":"prop"},"^(SETMODELPROP ",["G>","ev",{"VAR?":"prop"},"out","/ev","G<",null],"^=",["G>","ev",{"VAR?":"value"},"out","/ev","G<",null],"^)","\n",{"#f":3}],"getModelProp":[{"temp=":"prop"},"^(GETMODELPROP ",["G>","ev",{"VAR?":"prop"},"out","/ev","G<",null],"^)","\n",{"#f":3}],"init":[["ev","str","^red","/str","str","^target","/str",{"x()":"goto","exArgs":2},"pop","/ev","\n","ev","str","^green","/str","str","^stand.left","/str",0,{"x()":"animation","exArgs":3},"pop","/ev","\n","ev","str","^currentScene.actors[red].state","/str","str","^RED COLOR","/str",{"x()":"setModelProp","exArgs":2},"pop","/ev","\n","^Hi! This is a graphic adventure written with Ink! ",{"#":"actor:green"},"\n","^Can you drive your game and story throught the Ink language? ",{"#":"actor:green"},"\n",["ev",{"^->":"init.0.40.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^Yes, I can do everything with Ink.",{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.40.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n",{"->":"init.0.g-0"},{"#f":5}]}],["ev",{"^->":"init.0.41.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^I don't think so.",{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.41.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n",{"->":"init.0.g-0"},{"#f":5}]}],["ev",{"^->":"init.0.42.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^I know nothing about Ink",{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.42.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n",{"->":"init.0.g-0"},{"#f":5}]}],{"g-0":["^Well, you did it! ",{"#":"actor:green"},"\n","^The red character state is: ",["G>","ev","str","^currentScene.actors[red].state","/str",{"x()":"getModelProp","exArgs":1},"out","/ev","G<",null],"\n","end",null]}],{"#f":3}],"#f":3}]}
+{"inkVersion":16,"root":[{"->":"init"},"done",{"init":[["^> action: Goto ",{"#":"actor:red"},{"#":"target: target"},"\n","^> action: Animation ",{"#":"animation: green.stand.left"},{"#":"wait:false"},"\n","^green: Hi! This is a graphic adventure written with Ink!","\n","^green: Can you drive your game and story throught the Ink language?","\n",["ev",{"^->":"init.0.12.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^Yes, I can do everything with Ink.",{"#":"actor:red"},{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.12.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n",{"->":"init.0.g-0"},{"#f":7}]}],["ev",{"^->":"init.0.13.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^I don't think so.",{"#":"actor:red"},{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.13.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n",{"->":"init.0.g-0"},{"#f":7}]}],["ev",{"^->":"init.0.14.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^I know nothing about Ink",{"#":"actor:red"},{"->":"$r","var":true},null],"c":["ev",{"^->":"init.0.14.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n",{"->":"init.0.g-0"},{"#f":7}]}],{"g-0":["^green: Well, you did it!","\n","end",{"#f":7}]}],{"#f":3}],"#f":3}],"listDefs":{}}

adventure-test-ink/android/assets/model/test2.ink.json

@@ -1 +1 @@
-{"inkVersion":15,"root":[{"->":"d1"},"done",{"d1":[["^Hi!","\n","^How are you?","\n","^Fine, thanks! ",{"#":"actor: green"},"\n","^Are you hungry? ",{"#":"actor:green"},"\n",["ev",{"^->":"d1.0.10.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^No",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.10.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"^, I don't","\n","\n","^Ok, let me know when you want some food. ",{"#":"actor:green"},"\n",{"->":"d1.0.g-0"},{"#f":7}]}],["ev",{"^->":"d1.0.11.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^Yes",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.11.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","^Would you like a hamburger? ",{"#":"actor:green"},"\n",["ev",{"^->":"d1.0.11.c.10.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^Yes",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.11.c.10.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","^Maybe you are too fat, here you have a banana. ",{"#":"actor:green"},"\n",{"->":"d1.0.g-0"},{"#f":7}]}],["ev",{"^->":"d1.0.11.c.11.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^No",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.11.c.11.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","^Well, here you have a banana. ",{"#":"actor:green"},"\n",{"->":"d1.0.g-0"},{"#f":7}]}],{"#f":7}]}],{"g-0":["^Bye","\n","end",{"#f":7}]}],{"#f":3}],"#f":3}]}
+{"inkVersion":16,"root":[{"->":"d1"},"done",{"d1":[["^Hi! ",{"#":"actor:player"},"\n","^How are you? ",{"#":"actor:player"},"\n","^Fine, thanks! ",{"#":"actor: green"},"\n","^Are you hungry? ",{"#":"actor:green"},"\n",["ev",{"^->":"d1.0.12.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^player: No",{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.12.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"^, I don't.","\n","\n","^Ok, let me know when you want some food. ",{"#":"actor:green"},"\n",{"->":"d1.0.g-0"},{"#f":7}]}],["ev",{"^->":"d1.0.13.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^Yes",{"#":"actor:player"},{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.13.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","^Would you like a hamburger? ",{"#":"actor:green"},"\n",["ev",{"^->":"d1.0.13.c.10.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^Yes",{"#":"actor:player"},{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.13.c.10.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","^Maybe you are too fat, here you have a banana. ",{"#":"actor:green"},"\n",{"->":"d1.0.g-0"},{"#f":7}]}],["ev",{"^->":"d1.0.13.c.11.$r1"},{"temp=":"$r"},"str",{"->":".^.s"},[{"#n":"$r1"}],"/str","/ev",{"*":".^.c","flg":18},{"s":["^No",{"#":"actor:player"},{"->":"$r","var":true},null],"c":["ev",{"^->":"d1.0.13.c.11.c.$r2"},"/ev",{"temp=":"$r"},{"->":".^.^.s"},[{"#n":"$r2"}],"\n","^Well, here you have a banana. ",{"#":"actor:green"},"\n",{"->":"d1.0.g-0"},{"#f":7}]}],{"#f":7}]}],{"g-0":["^Bye   ",{"#":"actor:player"},"\n","end",{"#f":7}]}],{"#f":3}],"#f":3}],"listDefs":{}}

adventure-test-project/IMAGES-RAW/particles/fire.png

@@ -0,0 +1,26 @@
+{
+        pot: false,
+        paddingX: 2,
+        paddingY: 2,
+        duplicatePadding: true,
+        edgePadding: true,
+        rotation: false,
+        minWidth: 16,
+        minHeight: 16,
+        maxWidth: 4096,
+        maxHeight: 4096,
+        stripWhitespaceX: true,
+        stripWhitespaceY: true,
+        alphaThreshold: 0,
+        filterMin: Linear,
+        filterMag: Linear,
+        wrapX: ClampToEdge,
+        wrapY: ClampToEdge,
+        format: RGBA8888,
+        alias: true,
+        outputFormat: png,
+        jpegQuality: 0.9,
+        ignoreBlankImages: true,
+        fast: false,
+        debug: false,
+}