Merge pull request #1 from pengyu/sound_dev

Sound dev
BlackScorpGames · Feb 19, 2012 · 547ca06 · 547ca06
2 parents befd59a + f7ebe62
commit 547ca06
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /nbproject/private/
 /assets/img/.fr-5KubhJ/
 /nbproject
+.*.sw?
diff --git a/assets/js/effects.js b/assets/js/effects.js
@@ -9,7 +9,7 @@ Crafty.c("RandomExplosion",{
         .animate("explode"+rand,10)
         .delay(function(){this.destroy()},500);
 
-//        Crafty.audio.play("explosion"+(rand %2));
+        Crafty.audio.play("explosion"+(rand %2));
     }
 });
 Crafty.c("Damage",{

diff --git a/assets/js/enemys.js b/assets/js/enemys.js
@@ -218,7 +218,7 @@ Crafty.c("Level2",{
         this.destroy();
     },
     shoot:function(){
-        var bullet = Crafty.e("Weapon1","EnemyBullet");
+        var bullet = Crafty.e("Weapon2","EnemyBullet");
         bullet.attr({
             x: this._x+this._w/2-bullet.w/2,
             y: this._y+this._h-bullet.h/2,

diff --git a/assets/js/levels.js b/assets/js/levels.js
@@ -53,7 +53,7 @@ Crafty.scene("Level1",function(){
     //Setup background of level
     Crafty.background("url(assets/img/bg.png)");
     //Play background music and repeat
-    // Crafty.audio.play("space",-1);
+    //Crafty.audio.play("space",-1);
     $('.level').text('Level: 1');
 
     var spotEnemys = function(frame){   
@@ -85,4 +85,4 @@ Crafty.scene("Level1",function(){
     });
 
 
-});
+});
diff --git a/assets/js/sounds.js b/assets/js/sounds.js
@@ -1,9 +1,37 @@
-/*
-Crafty.audio.add("space", "media/music/through-space.ogg");
-Crafty.audio.add("explosion0","media/sounds/explodemini.wav");
-Crafty.audio.add("explosion1","media/sounds/explode.wav");
-Crafty.audio.add("laser1","media/sounds/laser1.wav");
-Crafty.audio.add("laser2","media/sounds/laser2.wav");
-Crafty.audio.add("laser3","media/sounds/laser3.wav");
-Crafty.audio.add("laser4","media/sounds/laser4.wav");
-*/
+Crafty.audio.add({
+    space: [
+      "media/music/through-space.wav",
+      "media/music/through-space.mp3",
+      "media/music/through-space.ogg"
+    ],
+    explosion0: [
+      "media/sounds/explodemini.wav",
+      "media/sounds/explodemini.mp3",
+      "media/sounds/explodemini.ogg"
+    ],
+    explosion1: [
+      "media/sounds/explode.wav",
+      "media/sounds/explode.mp3",
+      "media/sounds/explode.ogg"
+    ],
+    laser1: [
+      "media/sounds/laser1.wav",
+      "media/sounds/laser1.mp3",
+      "media/sounds/laser1.ogg"
+    ],
+    laser2: [
+      "media/sounds/laser2.wav",
+      "media/sounds/laser2.mp3",
+      "media/sounds/laser2.ogg"
+    ],
+    laser3: [
+      "media/sounds/laser3.wav",
+      "media/sounds/laser3.mp3",
+      "media/sounds/laser3.ogg"
+    ],
+    laser4: [
+      "media/sounds/laser4.wav",
+      "media/sounds/laser4.mp3",
+      "media/sounds/laser4.ogg"
+    ]
+  });
diff --git a/assets/js/weapons.js b/assets/js/weapons.js
@@ -26,7 +26,7 @@ Crafty.c("Weapon1",{
         .attr({
             dmg:1
         });
-        //Crafty.audio.play("laser1");
+        Crafty.audio.play("laser1");
     } 
 });
 Crafty.c("Weapon2",{
@@ -40,6 +40,6 @@ Crafty.c("Weapon2",{
         }).attr({
             dmg:2
         });
-        //Crafty.audio.play("laser2");
+        Crafty.audio.play("laser2");
     } 
-});
+});
diff --git a/index.html b/index.html
@@ -3,7 +3,10 @@
     <head>
         <meta charset="UTF-8" />
         <title>Cron</title>
+        <!--
         <script type="text/javascript" src="http://cdn.crafty-modules.com/crafty-DEBUG.js"></script>
+        -->
+        <script type="text/javascript" src="http://localhost/~pengy/crafty/crafty.js"></script>
         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
         <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
         <script type="text/javascript" src="assets/js/sprites.js"></script>

diff --git a/media/music/spaceship.mp3 b/media/music/spaceship.mp3
diff --git a/media/music/spaceship.ogg b/media/music/spaceship.ogg
diff --git a/media/music/through-space.mp3 b/media/music/through-space.mp3
diff --git a/media/music/through-space.wav b/media/music/through-space.wav
diff --git a/media/sounds/explode.mp3 b/media/sounds/explode.mp3
diff --git a/media/sounds/explode.ogg b/media/sounds/explode.ogg
diff --git a/media/sounds/explodemini.mp3 b/media/sounds/explodemini.mp3
diff --git a/media/sounds/explodemini.ogg b/media/sounds/explodemini.ogg
diff --git a/media/sounds/laser1.mp3 b/media/sounds/laser1.mp3
diff --git a/media/sounds/laser1.ogg b/media/sounds/laser1.ogg
diff --git a/media/sounds/laser2.mp3 b/media/sounds/laser2.mp3
diff --git a/media/sounds/laser2.ogg b/media/sounds/laser2.ogg
diff --git a/media/sounds/laser3.mp3 b/media/sounds/laser3.mp3
diff --git a/media/sounds/laser3.ogg b/media/sounds/laser3.ogg
diff --git a/media/sounds/laser4.mp3 b/media/sounds/laser4.mp3
diff --git a/media/sounds/laser4.ogg b/media/sounds/laser4.ogg