Skip to content

Commit

Permalink
Prepare for v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bladecoder committed Feb 20, 2017
1 parent 364c888 commit 641510b
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 73 deletions.
8 changes: 4 additions & 4 deletions adventure-test-3d/android/assets/BladeEngine.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#Fri Dec 16 13:54:47 CET 2016
gdxVersion=1.9.5
#Mon Feb 20 14:03:51 CET 2017
version=unspecified
debug=false
gdxVersion=1.9.5
inventory_pos=down
bladeEngineVersion=1.1.0
debug=false
pie_mode.desktop=false
bladeEngineVersion=1.2.0
title=Blade Engine 3D Adventure
roboVMVersion=2.3.0
2 changes: 1 addition & 1 deletion adventure-test-3d/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
roboVMVersion=2.3.0
gdxVersion=1.9.5
org.gradle.daemon=true
bladeEngineVersion=1.1.1
bladeEngineVersion=1.2.0
org.gradle.jvmargs=-Xms128m -Xmx1500m
roboVMGradlePluginVersion=2.3.0
appName=adventure-test-3d
Expand Down
42 changes: 8 additions & 34 deletions adventure-test-ink/INK-SRC/test-story.ink
Original file line number Diff line number Diff line change
@@ -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

Expand Down
14 changes: 7 additions & 7 deletions adventure-test-ink/INK-SRC/test2.ink
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions adventure-test-ink/android/assets/BladeEngine.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion adventure-test-ink/android/assets/model/00.chapter.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
bladeEngineVersion: "1.1.0-SNAPSHOT",
bladeEngineVersion: "1.1.2-SNAPSHOT",
scenes: {
"00": {
id: "00",
Expand Down Expand Up @@ -64,6 +64,7 @@ scenes: {
initAnimation: "stand.right"
},
scale: 0.3066198,
rot: 0,
tint: {
r: 1,
a: 1
Expand Down Expand Up @@ -124,6 +125,7 @@ scenes: {
initAnimation: "stand.right"
},
scale: 0.6267129,
rot: 0,
tint: {
g: 1,
a: 1
Expand Down Expand Up @@ -267,6 +269,7 @@ scenes: {
initAnimation: "stand.left"
},
scale: 0.6300766,
rot: 0,
tint: {
g: 1,
a: 1
Expand Down Expand Up @@ -335,6 +338,7 @@ scenes: {
initAnimation: "stand.right"
},
scale: 0.6228006,
rot: 0,
tint: null,
depthType: "VECTOR",
bboxFromRenderer: true,
Expand Down
Original file line number Diff line number Diff line change
@@ -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":{}}
2 changes: 1 addition & 1 deletion adventure-test-ink/android/assets/model/test2.ink.json
Original file line number Diff line number Diff line change
@@ -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":{}}
4 changes: 2 additions & 2 deletions adventure-test-ink/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
appName=adventure-test-ink
bladeEngineVersion=1.1.1
bladeEngineVersion=1.2.0
gdxVersion=1.9.5
roboVMVersion=2.3.0

roboVMGradlePluginVersion=2.3.0
androidGradlePluginVersion=1.5.0

bladeInkVersion=0.3.1
bladeInkVersion=0.4.0

org.gradle.daemon=true
org.gradle.jvmargs=-Xms128m -Xmx1500m
Expand Down
4 changes: 2 additions & 2 deletions adventure-test-project/android/assets/BladeEngine.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#Tue Feb 14 10:46:37 CET 2017
#Mon Feb 20 14:04:34 CET 2017
roboVMVersion=2.3.0
debug=false
gdxVersion=1.9.5
fast_leave=true
bladeEngineVersion=1.1.2-SNAPSHOT
bladeEngineVersion=1.2.0
version=unspecified
title=Blade Engine Adventure
ui_mode=PIE
Expand Down
18 changes: 9 additions & 9 deletions adventure-test-project/android/assets/model/00.chapter.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
bladeEngineVersion: "1.1.1-SNAPSHOT",
bladeEngineVersion: "1.1.2-SNAPSHOT",
scenes: {
"01": {
id: "01",
Expand Down Expand Up @@ -936,8 +936,8 @@ scenes: {
id: "particle",
bbox: [ 0, 0, 0, 0, 0, 0, 0, 0 ],
pos: {
x: 1038.0648,
y: 336.98224
x: 1016.0442,
y: 333.25787
},
visible: true,
desc: null,
Expand Down Expand Up @@ -1123,8 +1123,8 @@ scenes: {
id: "particle2",
bbox: [ 0, 0, 0, 0, 0, 0, 0, 0 ],
pos: {
x: 1654.8639,
y: 40.490112
x: 1551.1857,
y: 19.144714
},
visible: true,
desc: null,
Expand Down Expand Up @@ -1835,8 +1835,8 @@ scenes: {
id: "particle3",
bbox: [ 0, 0, 0, 0, 0, 0, 0, 0 ],
pos: {
x: 1157.9656,
y: 1153.7235
x: -26.70813,
y: 1129.6176
},
visible: true,
desc: null,
Expand All @@ -1850,9 +1850,9 @@ scenes: {
renderer: {
class: "com.bladecoder.engine.model.ParticleRenderer",
atlasName: "particles",
particleName: "rain"
particleName: "rain2"
},
scale: 10,
scale: 1,
rot: 0,
tint: null,
depthType: "NONE",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion adventure-test-project/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
roboVMVersion=2.3.0
gdxVersion=1.9.5
org.gradle.daemon=true
bladeEngineVersion=1.1.2-SNAPSHOT
bladeEngineVersion=1.2.0
org.gradle.jvmargs=-Xms128m -Xmx1500m
roboVMGradlePluginVersion=2.3.0
appName=adventure-test-project
Expand Down
4 changes: 2 additions & 2 deletions adventure-test-spine/android/assets/BladeEngine.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Fri Dec 16 13:58:28 CET 2016
#Mon Feb 20 14:05:41 CET 2017
roboVMVersion=2.3.0
debug=true
gdxVersion=1.9.5
bladeEngineVersion=1.1.0
bladeEngineVersion=1.2.0
scene_screen=com.bladecoder.engine.ui.retro.RetroSceneScreen
version=unspecified
title=Spine Animation Test
Expand Down
2 changes: 1 addition & 1 deletion adventure-test-spine/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
roboVMVersion=2.3.0
gdxVersion=1.9.5
org.gradle.daemon=true
bladeEngineVersion=1.1.1
bladeEngineVersion=1.2.0
org.gradle.jvmargs=-Xms128m -Xmx1500m
roboVMGradlePluginVersion=2.3.0
appName=adventure-test-spine
Expand Down
6 changes: 3 additions & 3 deletions venus/android/assets/BladeEngine.properties
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#Wed Jan 18 23:49:51 CET 2017
#Mon Feb 20 14:03:04 CET 2017
roboVMVersion=2.3.0
debug=false
gdxVersion=1.9.5
bonasera_android_url=https\://play.google.com/store/apps/details?id\=com.bladecoder.lj
bladeEngineVersion=1.1.1-SNAPSHOT
bladeEngineVersion=1.2.0
version=1.2.3
single_action_inventory=true
INIT_SCREEN=org.bladecoder.venus.InitScreen
title=THE GODDESS ROBBERY
ui_mode=PIE
MENU_SCREEN=org.bladecoder.venus.VenusMenuScreen
inventory_pos=down
MENU_SCREEN=org.bladecoder.venus.VenusMenuScreen
bonasera_ios_url=https\://itunes.apple.com/us/app/revenge-johnny-bonasera/id1151361813
bonasera_desktop_url=http\://store.steampowered.com/app/536430
2 changes: 1 addition & 1 deletion venus/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
roboVMVersion=2.3.0
gdxVersion=1.9.5
org.gradle.daemon=true
bladeEngineVersion=1.1.2-SNAPSHOT
bladeEngineVersion=1.2.0
org.gradle.jvmargs=-Xms128m -Xmx1500m
roboVMGradlePluginVersion=2.3.0
version=1.2.3
Expand Down

0 comments on commit 641510b

Please sign in to comment.