Merge remote-tracking branch 'github/master'

This commit is contained in:
Renge 2022-05-09 13:29:18 -04:00
commit e220aa7e25
4 changed files with 5 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -30,7 +30,7 @@
{ {
"type": "loadSprite", "type": "loadSprite",
"key": "enemies", "key": "enemies",
"path": "shattered_sword_assets/images/forest_story1.png", "path": "shattered_sword_assets/images/porcelain_story1.png",
"positon": [ "positon": [
300, 300,
150 150
@ -52,8 +52,8 @@
}, },
{ {
"type": "loadSprite", "type": "loadSprite",
"key": "gap", "key": "jump",
"path": "shattered_sword_assets/images/forest_story2.png", "path": "shattered_sword_assets/images/porcelain_story2.png",
"positon": [ "positon": [
300, 300,
150 150
@ -71,7 +71,7 @@
"actions": [ "actions": [
{ {
"type": "hideSprite", "type": "hideSprite",
"key": "gap" "key": "jump"
} }
] ]
} }

View File

@ -45,7 +45,7 @@ export default class Porcelain extends GameLevel {
protected playStartStory(): void { protected playStartStory(): void {
if (!this.touchedStartCheckPoint) { if (!this.touchedStartCheckPoint) {
this.touchedStartCheckPoint = true; this.touchedStartCheckPoint = true;
this.storyLoader("shattered_sword_assets/jsons/level1story.json"); this.storyLoader("shattered_sword_assets/jsons/level2story.json");
this.startTimer(); this.startTimer();
} }
} }