Changeset 129

Timestamp:

01/23/12 23:27:51 (13 years ago)

Author:

atzm

Message:

modified damaged behavior

Location:

pycodeshooter/trunk

Files:

• index.html (modified) (2 diffs)
• shooter/system.js (modified) (3 diffs)
• sounds/se_pyuun.ogg (deleted)

pycodeshooter/trunk/index.html

@@ -42 +42 @@
         registerSound("se_start", document.getElementById("se_start"));
         registerSound("se_encounter", document.getElementById("se_encounter"));
-        registerSound("se_damage_enemy", document.getElementById("se_damage_enemy"));
-        registerSound("se_damage_player", document.getElementById("se_damage_player"));
+        registerSound("se_damage", document.getElementById("se_damage"));
         registerSound("se_bomb", document.getElementById("se_bomb"));
         registerSound("se_destroy", document.getElementById("se_destroy"));
@@ -170 +169 @@
                 <audio src="sounds/se_coinin_1.ogg", id="se_start" preload="auto" />
                 <audio src="sounds/se_denshion_1.ogg", id="se_encounter" preload="auto" />
-                <audio src="sounds/se_pyuun.ogg", id="se_damage_player" preload="auto" />
-                <audio src="sounds/se_click_2.ogg", id="se_damage_enemy" preload="auto" />
+                <audio src="sounds/se_click_2.ogg", id="se_damage" preload="auto" />
                 <audio src="sounds/se_zusyunzusyun.ogg", id="se_bomb" preload="auto" />
                 <audio src="sounds/se_zugan.ogg", id="se_destroy" preload="auto" />

pycodeshooter/trunk/shooter/system.js

@@ -188 +188 @@
 
         if (enemy.isDead()) {
-            playSound("se_destroy");
-
-            addDeathPieces(
-                enemy.x, enemy.y,
-                [6, 8, 10], ["#55F", "#AAF"], 3, 8
-            );
-
             if (System.score[trooper.name] !== undefined) {
                 System.score[trooper.name] += enemy.maxLife * 100;
@@ -353 +346 @@
         brrgs
     );
-    enemy.registerCallback("damaged", function() {playSound("se_damage_enemy")});
+
+    enemy.registerCallback("damaged", function() {
+        if (enemy.isDead()) {
+            playSound("se_destroy");
+
+            addDeathPieces(
+                enemy.x, enemy.y,
+                [6, 8, 10], ["#F55", "#FAA"], 3, 8
+            );
+        }
+        else {
+            playSound("se_damage");
+        }
+    });
 
     System.enemies.push(enemy);
@@ -533 +539 @@
                           -0.5)]
     );
-    trooper.registerCallback("addBomb", function(){playSound("se_bomb")});
-    trooper.registerCallback("damaged", function(){playSound("se_damage_player")});
+    trooper.registerCallback("addBomb", function() { playSound("se_bomb"); });
+    trooper.registerCallback("damaged", function() {
+        playSound("se_destroy");
+
+        addDeathPieces(
+            trooper.x, trooper.y,
+            [6, 8, 10], ["#55F", "#AAF"], 3, 8
+        );
+
+        for (var i = 0; i < System.enemies.length; i++) {
+            System.enemies[i].clearBullet();
+        }
+
+        trooper.x = System.screen.width / 2;
+        trooper.y = System.screen.height - System.screen.height / 7;
+    });
 
     System.players.push(trooper);