From: Jakob MG Date: Thu, 9 Jun 2011 11:15:46 +0000 (+0200) Subject: New raptor fly sounds from nifrek. Make vehicle engines use CHAN_TRIGGER (items slide... X-Git-Tag: xonotic-v0.5.0~199^2~11^2~33 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7fd2d5003523e1ed9c9664de770dc68378ae7da6;p=xonotic%2Fxonotic-data.pk3dir.git New raptor fly sounds from nifrek. Make vehicle engines use CHAN_TRIGGER (items slider in menu). Disable raptor dual / mixed fly sounds for now. Increase engines basevolume. --- diff --git a/qcsrc/client/csqc_constants.qc b/qcsrc/client/csqc_constants.qc index 93051cc4d..5976eb975 100644 --- a/qcsrc/client/csqc_constants.qc +++ b/qcsrc/client/csqc_constants.qc @@ -164,7 +164,6 @@ const float BUTTON_14 = 65536; const float BUTTON_15 = 131072; const float BUTTON_16 = 262144; - const float DRAWFLAG_NORMAL = 0; const float DRAWFLAG_ADDITIVE = 1; const float DRAWFLAG_MODULATE = 2; diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index fd6176728..4abeecf21 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -326,7 +326,7 @@ float racer_frame() { self.sounds = 1; self.sound_nexttime = time + 10.922667; //soundlength("vehicles/racer_move.wav"); - sound (self, CHAN_VOICE, "vehicles/racer_move.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/racer_move.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } else @@ -335,7 +335,7 @@ float racer_frame() { self.sounds = 0; self.sound_nexttime = time + 11.888604; //soundlength("vehicles/racer_idle.wav"); - sound (self, CHAN_VOICE, "vehicles/racer_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/racer_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } @@ -350,13 +350,13 @@ float racer_frame() { //self.sounds = 2; self.strength_finished = time + 10.922667; //soundlength("vehicles/racer_boost.wav"); - sound (self, CHAN_PLAYER, "vehicles/racer_boost.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_PAIN, "vehicles/racer_boost.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } else { self.strength_finished = 0; - sound (self, CHAN_PLAYER, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_PAIN, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); } diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index 37db0cf4b..505014566 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -267,7 +267,7 @@ float raptor_takeoff() if(self.sound_nexttime < time) { self.sound_nexttime = time + 7.955812; //soundlength("vehicles/raptor_fly.wav"); - sound (self, CHAN_VOICE, "vehicles/raptor_fly.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/raptor_speed.wav", VOL_VEHICLEENGINE, ATTN_NORM); } // Takeoff sequense @@ -317,19 +317,28 @@ float raptor_frame() raptor = self.vehicle; self = raptor; + /* ftmp = vlen(self.velocity); if(ftmp > autocvar_g_vehicle_raptor_speed_forward) ftmp = 1; else ftmp = ftmp / autocvar_g_vehicle_raptor_speed_forward; - - if(fabs(ftmp - self.wait) > 0.2 || self.sound_nexttime < time) + */ + if(self.sound_nexttime < time) { - self.sound_nexttime = time + 7.955812; //soundlength("vehicles/raptor_fly.wav"); - sound (self, CHAN_VOICE, "vehicles/raptor_fly.wav", 1 - ftmp, ATTN_NORM ); - sound (self, CHAN_PLAYER, "vehicles/raptor_speed.wav", ftmp, ATTN_NORM); - self.wait = ftmp; + self.sound_nexttime = time + 7.955812; + //dprint("LEN:", ftos(soundlength("vehicles/raptor_fly.wav")), "\n"); + //sound (self, CHAN_VOICE, "vehicles/raptor_fly.wav", 1 - ftmp, ATTN_NORM ); + sound (self, CHAN_TRIGGER, "vehicles/raptor_speed.wav", VOL_VEHICLEENGINE, ATTN_NORM); + //self.wait = ftmp; } + /* + else if(fabs(ftmp - self.wait) > 0.2) + { + sound (self, CHAN_VOICE, "", 1 - ftmp, ATTN_NORM ); + sound (self, CHAN_PLAYER, "", ftmp, ATTN_NORM); + self.wait = ftmp; + }*/ if(player.BUTTON_USE && raptor.deadflag == DEAD_NO) { diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index 051ad1912..71b672ed1 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -236,13 +236,13 @@ float spiderbot_frame() { if(spider.frame == 4 && self.tur_head.wait != 0) { - sound (self, CHAN_VOICE, "vehicles/spiderbot_land.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/spiderbot_land.wav", VOL_VEHICLEENGINE, ATTN_NORM); spider.frame = 5; } if(player.BUTTON_JUMP && self.tur_head.wait < time) { - sound (self, CHAN_VOICE, "vehicles/spiderbot_jump.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/spiderbot_jump.wav", VOL_VEHICLEENGINE, ATTN_NORM); //dprint("spiderbot_jump:", ftos(soundlength("vehicles/spiderbot_jump.wav")), "\n"); self.delay = 0; @@ -260,7 +260,7 @@ float spiderbot_frame() self.delay = 3; self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_idle.wav"); //dprint("spiderbot_idle:", ftos(soundlength("vehicles/spiderbot_idle.wav")), "\n"); - sound (self, CHAN_VOICE, "vehicles/spiderbot_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/spiderbot_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); } movelib_beak_simple(autocvar_g_vehicle_spiderbot_speed_stop); spider.frame = 5; @@ -289,7 +289,7 @@ float spiderbot_frame() { self.delay = 1; self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_walk.wav"); - sound (self, CHAN_VOICE, "vehicles/spiderbot_walk.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/spiderbot_walk.wav", VOL_VEHICLEENGINE, ATTN_NORM); //dprint("spiderbot_walk:", ftos(soundlength("vehicles/spiderbot_walk.wav")), "\n"); } } @@ -310,7 +310,7 @@ float spiderbot_frame() { self.delay = 2; self.sound_nexttime = time + 6.486500; //soundlength("vehicles/spiderbot_strafe.wav"); - sound (self, CHAN_VOICE, "vehicles/spiderbot_strafe.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/spiderbot_strafe.wav", VOL_VEHICLEENGINE, ATTN_NORM); //dprint("spiderbot_strafe:", ftos(soundlength("vehicles/spiderbot_strafe.wav")), "\n"); } } @@ -573,7 +573,7 @@ void spiderbot_blowup() void spiderbot_die() { - sound (self, CHAN_VOICE, "vehicles/spiderbot_die.wav", VOL_BASE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/spiderbot_die.wav", VOL_BASE, ATTN_NORM); pointparticles(particleeffectnum("explosion_medium"), self.origin + '0 0 100', '0 0 0', 1); self.health = 0; diff --git a/sound/vehicles/raptor_fly.wav b/sound/vehicles/raptor_fly.wav index a7f7db7aa..88c8609a5 100644 Binary files a/sound/vehicles/raptor_fly.wav and b/sound/vehicles/raptor_fly.wav differ diff --git a/sound/vehicles/raptor_speed.wav b/sound/vehicles/raptor_speed.wav index f8fd9e420..439eebc2f 100644 Binary files a/sound/vehicles/raptor_speed.wav and b/sound/vehicles/raptor_speed.wav differ