]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add new arc sounds by Archer (known issue: loop sound doesn't loop)
authorMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 23:44:36 +0000 (10:44 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 23:44:36 +0000 (10:44 +1100)
qcsrc/common/weapons/w_arc.qc
sound/weapons/arc_fire.ogg [new file with mode: 0644]
sound/weapons/arc_loop.ogg [new file with mode: 0644]
sound/weapons/arc_stop.ogg [new file with mode: 0644]

index 83cd7975534c0f93b578079db99f35027a4f3853..8959619951041ae3661a93cef9e588391a9a42a3 100644 (file)
@@ -577,7 +577,7 @@ void W_Arc_Beam(float burst)
        // only play fire sound if 1 sec has passed since player let go the fire button
        if(time - self.beam_prev > 1)
        {
-               sound(self, CH_WEAPON_A, "weapons/lgbeam_fire.wav", VOL_BASE, ATTN_NORM);
+               sound(self, CH_WEAPON_A, "weapons/arc_fire.wav", VOL_BASE, ATTN_NORM);
        }
 
        entity beam = self.arc_beam = spawn();
@@ -613,7 +613,7 @@ void Arc_Smoke()
                        if ( !self.arc_smoke_sound )
                        {
                                self.arc_smoke_sound = 1;
-                               sound(self, CH_SHOTS_SINGLE, "weapons/gauntletbeam_fly.wav", VOL_BASE, ATTN_NORM);
+                               sound(self, CH_SHOTS_SINGLE, "weapons/arc_loop.wav", VOL_BASE, ATTN_NORM);
                        }
                }
        }
@@ -697,6 +697,7 @@ float W_Arc(float req)
                        
                        if(self.arc_BUTTON_ATCK_prev != 0)
                        {
+                               sound(self, CH_WEAPON_A, "weapons/arc_stop.wav", VOL_BASE, ATTN_NORM);
                                weapon_thinkf(WFRAME_FIRE1, WEP_CVAR(arc, beam_animtime), w_ready);
                                ATTACK_FINISHED(self) = time + WEP_CVAR(arc, beam_refire) * W_WeaponRateFactor();
                        }
@@ -720,8 +721,9 @@ float W_Arc(float req)
                        precache_model("models/weapons/g_arc.md3");
                        precache_model("models/weapons/v_arc.md3");
                        precache_model("models/weapons/h_arc.iqm");
-                       precache_sound("weapons/lgbeam_fire.wav");
-                       precache_sound("weapons/gauntletbeam_fly.wav");
+                       precache_sound("weapons/arc_fire.wav");
+                       precache_sound("weapons/arc_loop.wav");
+                       precache_sound("weapons/arc_stop.wav");
                        precache_sound("weapons/strength_fire.wav");
                        if(!arc_shotorigin[0])
                        {
@@ -1183,7 +1185,7 @@ void Ent_ReadArcBeam(float isnew)
                self.draw = Draw_ArcBeam;
                self.entremove = Remove_ArcBeam;
                self.move_time = time;
-               loopsound(self, CH_SHOTS_SINGLE, "weapons/lgbeam_fly.wav", VOL_BASE, ATTEN_NORM);
+               loopsound(self, CH_SHOTS_SINGLE, "weapons/arc_loop.wav", VOL_BASE, ATTEN_NORM);
 
                flash = spawn();
                flash.owner = self;
@@ -1531,7 +1533,7 @@ float W_Arc(float req)
                }
                case WR_INIT:
                {
-                       precache_sound("weapons/lgbeam_fly.wav");
+                       precache_sound("weapons/arc_loop.wav");
                        return TRUE;
                }
                case WR_ZOOMRETICLE:
diff --git a/sound/weapons/arc_fire.ogg b/sound/weapons/arc_fire.ogg
new file mode 100644 (file)
index 0000000..c926c63
Binary files /dev/null and b/sound/weapons/arc_fire.ogg differ
diff --git a/sound/weapons/arc_loop.ogg b/sound/weapons/arc_loop.ogg
new file mode 100644 (file)
index 0000000..e33afae
Binary files /dev/null and b/sound/weapons/arc_loop.ogg differ
diff --git a/sound/weapons/arc_stop.ogg b/sound/weapons/arc_stop.ogg
new file mode 100644 (file)
index 0000000..8f12ed3
Binary files /dev/null and b/sound/weapons/arc_stop.ogg differ