Skip to content

Commit

Permalink
better connect sound
Browse files Browse the repository at this point in the history
  • Loading branch information
pedersen committed Aug 25, 2014
1 parent 7760a6c commit a8abb86
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,21 @@ node_modules

*~

/game.tar.gz
/root/LICENSE
/root/README.md
/root/assets/OSAA_LOGO.png
/root/assets/connect-old1.wav
/root/assets/connect.ogg
/root/assets/connect.wav
/root/assets/jump.ogg
/root/assets/jump.wav
/root/assets/sound/connect.wav
/root/game.js
/root/gulpfile.js
/root/[email protected]:1408975292
/root/package.json
/root/phaser.d.ts
/root/phaser.js
/root/phaser.min.js
/src/Trail.ts
Binary file added root/assets/sound/connect.ogg
Binary file not shown.
6 changes: 3 additions & 3 deletions src/PlayState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module states {
collideSound: Phaser.Sound;
motorSound: Phaser.Sound;
powerupSound: Phaser.Sound;
dingSound: Phaser.Sound;
connectSound: Phaser.Sound;

nextMotorPlay: number;
nextPuff: number;
Expand Down Expand Up @@ -71,7 +71,7 @@ module states {

end_mission() {

this.dingSound.play();
this.connectSound.play();

if (this.mission_idx > 0) {
this.get_permuted_house(this.mission_idx-2).remove_emitter();
Expand Down Expand Up @@ -174,7 +174,7 @@ module states {
this.game.physics.p2.friction = 100;

this.collideSound = this.game.add.sound("collide");
this.dingSound = this.game.add.sound("ding");
this.connectSound = this.game.add.sound("connect");
this.motorSound = this.game.add.sound("motorsound");
this.powerupSound = this.game.add.sound("powerup");

Expand Down
3 changes: 2 additions & 1 deletion src/PreloadState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ module states {
this.game.load.image("hep", "assets/hep.png");

this.game.load.audio("motorsound", "assets/sound/sound_motor.wav");
this.game.load.audio("ding", "assets/sound/sound_haleding.wav");
// this.game.load.audio("ding", "assets/sound/sound_haleding.wav");
this.game.load.audio("connect", "assets/sound/connect.ogg");
this.game.load.audio("collide", "assets/sound/sound_kollision.wav");
this.game.load.audio("powerup", "assets/sound/sound_powerup.wav");
//this.game.load.audio("motorstrained", "assets/sound/sound_motorbelastet.wav");
Expand Down

0 comments on commit a8abb86

Please sign in to comment.