relabeled repid fire

metalx1000 · Jun 27, 2015 · 864ec20 · 864ec20
1 parent e191323
commit 864ec20
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/js/.player.js.swp b/js/.player.js.swp
diff --git a/js/hud.js b/js/hud.js
@@ -7,7 +7,7 @@ function preload_hud(){
   game.load.image('hud_invincibility','res/images/hud_invincibility.png');
   game.load.image('hud_diagonal_gun','res/images/hud_diagonal_gun.png');
   game.load.image('hud_wingman2','res/images/hud_wingman2.png');
-  game.load.image('hud_straight_gun','res/images/hud_straight_gun.png');
+  game.load.image('hud_rapid_fire','res/images/hud_rapid_fire.png');
 
   game.load.spritesheet('loading', 'res/sprites/hud_loading.png', 446, 81);
 }

diff --git a/js/media.js b/js/media.js
@@ -1,6 +1,6 @@
 function preload_sounds(){
   //sounds
-  var sounds = ["coin10","explosion1","explosion2","hit","laser1","laser2","mega1","invincibility","wingman","powerup","straight_gun"];
+  var sounds = ["coin10","explosion1","explosion2","hit","laser1","laser2","mega1","invincibility","wingman","powerup","rapid_fire"];
   sounds.forEach(function(snd){
     game.load.audio(snd,['res/sounds/'+snd+'.wav','res/sounds/'+snd+'.ogg','res/sounds/'+snd+'.mp3']);
   });
@@ -25,7 +25,7 @@ function preload_sounds(){
     "player",
     "player_invincible",
     "repair",
-    "straight_gun",
+    "rapid_fire",
     "invincibility",
     "wingman",
     "wingman2",

diff --git a/js/powerups.js b/js/powerups.js
@@ -5,7 +5,7 @@ function create_powerup(){
   powerups = game.add.group();
   powerups.enableBody = true;
   wingmen = game.add.group();
-  powerup_list = ["missile2","wingman","wingman2","invincibility","diagonal_gun","straight_gun"];
+  powerup_list = ["missile2","wingman","wingman2","invincibility","diagonal_gun","rapid_fire"];
 }
 
 function update_powerup(){
@@ -85,11 +85,11 @@ function collect_powerup(player,powerup){
     var snd = game.add.audio("powerup");    
     snd.play();
     wingman_backup();
-  }else if(powerup.type == "straight_gun"){
+  }else if(powerup.type == "rapid_fire"){
     message("hud_" + powerup.type);
     var snd = game.add.audio(powerup.type);
     snd.play();
-    straight_gun();
+    rapid_fire();
   }
 
   kill_powerup(powerup);
@@ -183,7 +183,7 @@ function wingman_shoot(wingman){
   shoot(wingman,-2,"player-bullet",undefined,undefined,undefined,-20);
 }
 
-function straight_gun(){
+function rapid_fire(){
   var i = 0;
   var timer = setInterval(function(){
     shoot(player,-5,"player-bullet");

diff --git a/res/images/hud_straight_gun.png → res/images/hud_rapid_fire.png b/res/images/hud_straight_gun.png → res/images/hud_rapid_fire.png
diff --git a/res/sounds/straight_gun.mp3 → res/sounds/rapid_fire.mp3 b/res/sounds/straight_gun.mp3 → res/sounds/rapid_fire.mp3
diff --git a/res/sounds/straight_gun.ogg → res/sounds/rapid_fire.ogg b/res/sounds/straight_gun.ogg → res/sounds/rapid_fire.ogg
diff --git a/res/sounds/straight_gun.wav → res/sounds/rapid_fire.wav b/res/sounds/straight_gun.wav → res/sounds/rapid_fire.wav
diff --git a/res/sprites/straight_gun.png → res/sprites/rapid_fire.png b/res/sprites/straight_gun.png → res/sprites/rapid_fire.png