Skip to content

Commit b961eaf

Browse files
bladecoderbladecoder
committed
Update to latest engine v2.1.0-SNAPSHOT
1 parent 7498e11 commit b961eaf

File tree

8 files changed

+49
-58
lines changed

8 files changed

+49
-58
lines changed

‎venus/assets/BladeEngine.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
INIT_SCREEN=org.bladecoder.venus.InitScreen
22
MENU_SCREEN=org.bladecoder.venus.VenusMenuScreen
3-
bladeEngineVersion=2.0.6
3+
bladeEngineVersion=2.1.0-SNAPSHOT
44
bonasera_android_url=amzn\://apps/android?asin\=B01MU6RADE
55
bonasera_desktop_url=http\://store.steampowered.com/app/536430
66
bonasera_ios_url=https\://itunes.apple.com/us/app/revenge-johnny-bonasera/id1151361813

‎venus/assets/model/c00.chapter.json

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
bladeEngineVersion: "1.0.7",
2+
bladeEngineVersion: "2.1.0-SNAPSHOT",
33
sounds: {
44
rope_click: {
55
id: "rope_click",
@@ -731,9 +731,9 @@ scenes: {
731731
keepDirection: false
732732
},
733733
{
734-
class: "com.bladecoder.engine.actions.SoundAction",
735-
actor: "policeman",
736-
play: "fall"
734+
class: "com.bladecoder.engine.actions.PlaySoundAction",
735+
sound: "policeman_fall",
736+
stop: false
737737
},
738738
{
739739
class: "com.bladecoder.engine.actions.SayAction",
@@ -783,7 +783,8 @@ scenes: {
783783
},
784784
{
785785
class: "com.bladecoder.engine.actions.LeaveAction",
786-
scene: "endSCN"
786+
scene: "endSCN",
787+
init: true
787788
}
788789
]
789790
},
@@ -1662,9 +1663,9 @@ scenes: {
16621663
keepDirection: false
16631664
},
16641665
{
1665-
class: "com.bladecoder.engine.actions.SoundAction",
1666-
actor: "chair",
1667-
play: "chair_squeek"
1666+
class: "com.bladecoder.engine.actions.PlaySoundAction",
1667+
sound: "chair_chair_squeek",
1668+
stop: false
16681669
},
16691670
{
16701671
class: "com.bladecoder.engine.actions.WaitAction",
@@ -1727,9 +1728,9 @@ scenes: {
17271728
keepDirection: false
17281729
},
17291730
{
1730-
class: "com.bladecoder.engine.actions.SoundAction",
1731-
actor: "chair",
1732-
play: "chair_squeek"
1731+
class: "com.bladecoder.engine.actions.PlaySoundAction",
1732+
sound: "chair_chair_squeek",
1733+
stop: false
17331734
},
17341735
{
17351736
class: "com.bladecoder.engine.actions.WaitAction",
@@ -1796,9 +1797,9 @@ scenes: {
17961797
time: 1
17971798
},
17981799
{
1799-
class: "com.bladecoder.engine.actions.SoundAction",
1800-
actor: "chair",
1801-
play: "chair_broken"
1800+
class: "com.bladecoder.engine.actions.PlaySoundAction",
1801+
sound: "chair_chair_broken",
1802+
stop: false
18021803
},
18031804
{
18041805
class: "com.bladecoder.engine.actions.AnimationAction",
@@ -1969,7 +1970,8 @@ scenes: {
19691970
},
19701971
{
19711972
class: "com.bladecoder.engine.actions.LeaveAction",
1972-
scene: "scene2"
1973+
scene: "scene2",
1974+
init: true
19731975
}
19741976
]
19751977
},
@@ -2391,9 +2393,9 @@ scenes: {
23912393
keepDirection: false
23922394
},
23932395
{
2394-
class: "com.bladecoder.engine.actions.SoundAction",
2395-
actor: "cutter",
2396-
play: "drill"
2396+
class: "com.bladecoder.engine.actions.PlaySoundAction",
2397+
sound: "cutter_drill",
2398+
stop: false
23972399
},
23982400
{
23992401
class: "com.bladecoder.engine.actions.AnimationAction",
@@ -2404,8 +2406,9 @@ scenes: {
24042406
keepDirection: false
24052407
},
24062408
{
2407-
class: "com.bladecoder.engine.actions.SoundAction",
2408-
actor: "cutter"
2409+
class: "com.bladecoder.engine.actions.PlaySoundAction",
2410+
sound: "cutter_drill",
2411+
stop: true
24092412
},
24102413
{
24112414
class: "com.bladecoder.engine.actions.SayAction",
@@ -2480,9 +2483,9 @@ scenes: {
24802483
keepDirection: false
24812484
},
24822485
{
2483-
class: "com.bladecoder.engine.actions.SoundAction",
2484-
actor: "cutter",
2485-
play: "drill"
2486+
class: "com.bladecoder.engine.actions.PlaySoundAction",
2487+
sound: "cutter_drill",
2488+
stop: false
24862489
},
24872490
{
24882491
class: "com.bladecoder.engine.actions.AnimationAction",
@@ -2493,8 +2496,9 @@ scenes: {
24932496
keepDirection: false
24942497
},
24952498
{
2496-
class: "com.bladecoder.engine.actions.SoundAction",
2497-
actor: "cutter"
2499+
class: "com.bladecoder.engine.actions.PlaySoundAction",
2500+
sound: "cutter_drill",
2501+
stop: true
24982502
},
24992503
{
25002504
class: "com.bladecoder.engine.actions.AnimationAction",
@@ -2653,9 +2657,9 @@ scenes: {
26532657
actor: "cutter"
26542658
},
26552659
{
2656-
class: "com.bladecoder.engine.actions.SoundAction",
2657-
actor: "cutter",
2658-
play: "click"
2660+
class: "com.bladecoder.engine.actions.PlaySoundAction",
2661+
sound: "cutter_click",
2662+
stop: false
26592663
},
26602664
{
26612665
class: "com.bladecoder.engine.actions.AnimationAction",
@@ -2964,9 +2968,9 @@ scenes: {
29642968
state: "WITH_GODDESS"
29652969
},
29662970
{
2967-
class: "com.bladecoder.engine.actions.SoundAction",
2968-
actor: "diosa",
2969-
play: "chords"
2971+
class: "com.bladecoder.engine.actions.PlaySoundAction",
2972+
sound: "diosa_chords",
2973+
stop: false
29702974
},
29712975
{
29722976
class: "com.bladecoder.engine.actions.SetCutmodeAction",
@@ -4358,7 +4362,8 @@ scenes: {
43584362
},
43594363
{
43604364
class: "com.bladecoder.engine.actions.LeaveAction",
4361-
scene: "scene1"
4365+
scene: "scene1",
4366+
init: true
43624367
}
43634368
]
43644369
},
@@ -4371,7 +4376,8 @@ scenes: {
43714376
},
43724377
{
43734378
class: "com.bladecoder.engine.actions.LeaveAction",
4374-
scene: "scene1"
4379+
scene: "scene1",
4380+
init: true
43754381
}
43764382
]
43774383
}
@@ -4386,4 +4392,4 @@ scenes: {
43864392
}
43874393
},
43884394
initScene: "scene0"
4389-
}
4395+
}

‎venus/assets/model/world.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ default.lookat.0.text=I'm not interested.
22
default.pickup.0.text=What for?
33
default.use.0.text=I don't know what to do with that.
44
ui.back=Back
5+
ui.bonaseraLink=FULL FEATURED ADVENTURE!\nThe Revenge of Johnny Bonasera
56
ui.continue=Continue
67
ui.credits=Credits
78
ui.help=Help
@@ -16,4 +17,3 @@ ui.quit=Exit
1617
ui.remove=Are you sure you want to remove this saved game?
1718
ui.save=Save Game
1819
ui.yes=YES
19-
ui.bonaseraLink=FULL FEATURED ADVENTURE!\nThe Revenge of Johnny Bonasera

‎venus/core/src/main/java/org/bladecoder/venus/VenusMenuScreen.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.badlogic.gdx.utils.Scaling;
3131
import com.bladecoder.engine.assets.EngineAssetManager;
3232
import com.bladecoder.engine.i18n.I18N;
33-
import com.bladecoder.engine.model.World;
3433
import com.bladecoder.engine.ui.MenuScreen;
3534
import com.bladecoder.engine.ui.UI;
3635
import com.bladecoder.engine.util.Config;
@@ -54,26 +53,12 @@ public void show() {
5453
setPrefLang();
5554

5655
super.show();
57-
58-
saveGameIOSFix();
5956

6057
addLangButton();
6158

6259
addLinkButtons();
6360
}
6461

65-
private void saveGameIOSFix() {
66-
if (Gdx.app.getType() == ApplicationType.iOS && World.getInstance().getCurrentScene() != null) {
67-
68-
try {
69-
World.getInstance().saveGameState();
70-
} catch (IOException e) {
71-
EngineLogger.error(e.getMessage());
72-
}
73-
74-
}
75-
}
76-
7762
private void setPrefLang() {
7863

7964
// Parse languages

‎venus/core/src/main/java/org/bladecoder/venus/actions/scene1/PickupCableAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class PickupCableAction implements Action, ActionCallback, Serializable {
3535
private World w;
3636

3737
@Override
38-
public void setWorld(World w) {
38+
public void init(World w) {
3939
this.w = w;
4040
}
4141

@@ -69,7 +69,7 @@ public void resume() {
6969

7070
} else { // 2. PICKUP THE CABLE
7171

72-
SpriteActor cabinet_off = (SpriteActor) World.getInstance().getCurrentScene()
72+
SpriteActor cabinet_off = (SpriteActor) w.getCurrentScene()
7373
.getActor("cabinet_off", false);
7474

7575
if (actor.getState().equals("CONNECTED")) {

‎venus/core/src/main/java/org/bladecoder/venus/actions/scene1/UseCutMachineCableAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public class UseCutMachineCableAction implements Action {
2626
private World w;
2727

2828
@Override
29-
public void setWorld(World w) {
29+
public void init(World w) {
3030
this.w = w;
3131
}
3232

3333
@Override
3434
public boolean run(VerbRunner cb) {
35-
SpriteActor a = (SpriteActor)World.getInstance().getCurrentScene().getActor("cutter", true);
36-
InteractiveActor target = (InteractiveActor)World.getInstance().getCurrentScene().getActor("cable", true);
35+
SpriteActor a = (SpriteActor)w.getCurrentScene().getActor("cutter", true);
36+
InteractiveActor target = (InteractiveActor)w.getCurrentScene().getActor("cable", true);
3737

3838
// EngineLogger.debug("USING " + actor.getDesc() + " IN " + target.getDesc());
3939

‎venus/core/src/main/java/org/bladecoder/venus/actions/scene2/GetBonaseraAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class GetBonaseraAction implements Action {
1313

1414
@Override
15-
public void setWorld(World w) {
15+
public void init(World w) {
1616
}
1717

1818
@Override

‎venus/core/src/main/java/org/bladecoder/venus/actions/scene2/Scene2InitAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Scene2InitAction implements Action {
2323
private World w;
2424

2525
@Override
26-
public void setWorld(World w) {
26+
public void init(World w) {
2727
this.w = w;
2828
}
2929

0 commit comments

Comments
 (0)