X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fracer.qc;h=c20ba7acfdb13a87351cd8960d0b2724ee5243b9;hb=84c1fec4b12978d77e526be62253cb361d0a3a4a;hp=34302074d8172fa0a158bc3c8d0639eaac8dc3de;hpb=d88aaf89d5bc44e3529b7317718825b6f02a505c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index 34302074d..c20ba7acf 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -1,6 +1,5 @@ #define RACER_MIN '-120 -120 -40' #define RACER_MAX '120 120 40' -#define RACER_ENGINE "sound/vehicles/racer.wav" #ifdef SVQC void racer_exit(float eject); @@ -256,32 +255,17 @@ float racer_frame() vector df; float ftmp; - player = self; - racer = self.vehicle; + if(intermission_running) + return 1; + player = self; + racer = self.vehicle; + self = racer; + player.BUTTON_ZOOM = player.BUTTON_CROUCH = 0; - - self = racer; -#ifdef VEHICLES_CSQC - racer.SendFlags |= VSF_MOVEMENT; - - // Send a origin update every 10'th serevr frame. - racer.framecounter += 1; - if(racer.framecounter >= 600) - { - racer.SendFlags |= VSF_ORIGIN; - racer.framecounter = 0; - } -#endif - - if(player.BUTTON_USE) - { - vehicles_exit(VHEF_NORMAL); - self = player; - return 0; - } - + vehicles_painframe(); + if(racer.deadflag != DEAD_NO) { self = player; @@ -293,40 +277,6 @@ float racer_frame() crosshair_trace(player); -#if VEHICLES_VIEWROTATE_CROSSHAIR - float ftmp2; - racer.angles_x *= -1; - df = vectoangles(normalize(trace_endpos - self.origin + '0 0 32')); - if(df_x > 180) df_x -= 360; - if(df_x < -180) df_x += 360; - if(df_y > 180) df_y -= 360; - if(df_y < -180) df_y += 360; - - // Yaw - ftmp = autocvar_g_vehicle_racer_turnspeed * frametime; - ftmp2 = ftmp * -1; - - ftmp = bound(ftmp2, shortangle_f(df_y - racer.angles_y, racer.angles_y), ftmp); - ftmp2 = anglemods(racer.angles_y + ftmp); - - // Roll - ftmp = bound(-45, shortangle_f(df_z + ((racer.angles_y - ftmp2) * autocvar_g_vehicle_racer_turnroll), racer.angles_z), 45); - ftmp = anglemods(racer.angles_z + ftmp) * frametime; - racer.angles_z = bound(-65, racer.angles_z + ftmp, 65); - - // Turn - racer.angles_y = ftmp2; - - // Pitch - ftmp = autocvar_g_vehicle_racer_pitchspeed * frametime; - ftmp2 = ftmp * -1; - - ftmp = bound(ftmp2, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp); - racer.angles_x = anglemods(racer.angles_x + ftmp); - - makevectors(racer.angles); - racer.angles_x *= -1; -#else racer.angles_x *= -1; // Yaw @@ -344,7 +294,7 @@ float racer_frame() makevectors(racer.angles); racer.angles_x *= -1; -#endif + ftmp = racer.velocity_z; df = racer.velocity * -autocvar_g_vehicle_racer_friction; @@ -372,7 +322,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_BASE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/racer_move.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } else @@ -381,28 +331,40 @@ 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_BASE, ATTN_NORM); + sound (self, CHAN_TRIGGER, "vehicles/racer_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); } } // Afterburn if (player.BUTTON_JUMP && racer.vehicle_energy >= (autocvar_g_vehicle_racer_afterburn_cost * frametime)) { + if(time - racer.wait > 0.2) + pointparticles(particleeffectnum("wakizashi_booster_smoke"), self.origin, '0 0 0', 1); + racer.wait = time; racer.vehicle_energy -= autocvar_g_vehicle_racer_afterburn_cost * frametime; df += (v_forward * autocvar_g_vehicle_racer_speed_afterburn); + if(self.invincible_finished < time) + { + traceline(self.origin, self.origin - '0 0 256', MOVE_NORMAL, self); + if(trace_fraction != 1.0) + pointparticles(particleeffectnum("smoke_small"), trace_endpos, '0 0 0', 1); + + self.invincible_finished = time + 0.1 + (random() * 0.1); + } + if(self.strength_finished < time) { //self.sounds = 2; self.strength_finished = time + 10.922667; //soundlength("vehicles/racer_boost.wav"); - sound (self, CHAN_PLAYER, "vehicles/racer_boost.wav", VOL_BASE, 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_BASE, ATTN_NORM); + sound (self, CHAN_PAIN, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); } @@ -455,7 +417,7 @@ float racer_frame() if(player.BUTTON_ATCK2) { self.misc_bulletcounter += 1; - racer.delay = time + 0.2; + racer.delay = time + 0.3; if(self.misc_bulletcounter == 1) racer_fire_rocket("tag_rocket_r", (self.lock_strength == 1 && self.lock_target) ? self.lock_target : world); else if(self.misc_bulletcounter == 2) @@ -509,17 +471,7 @@ void racer_think() */ racer_align4point(); //time - self.nextthink); -#ifdef VEHICLES_CSQC - self.SendFlags |= VSF_MOVEMENT; - // Send a origin update every 10'th serevr frame. - self.framecounter += 1; - if(self.framecounter >= 10) - { - self.SendFlags |= VSF_ORIGIN; - self.framecounter = 0; - } -#endif /* //if(self.velocity_z > 0) // self.velocity_z *= 0.95; @@ -541,10 +493,9 @@ void racer_enter() self.movetype = MOVETYPE_BOUNCE; self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health); self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield); -#ifdef VEHICLES_CSQC - if(self.SendEntity) - self.SendFlags |= VSF_SETUP; -#endif + + if(self.owner.flagcarried) + setorigin(self.owner.flagcarried, '-190 0 96'); } void racer_exit(float eject) @@ -554,7 +505,8 @@ void racer_exit(float eject) self.think = racer_think; self.nextthink = time; self.movetype = MOVETYPE_TOSS; - + sound (self, CHAN_PAIN, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); + if not (self.owner) return; @@ -594,9 +546,6 @@ void racer_spawn() void racer_blowup() { - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("explosion_big"), self.origin, '0 0 0', 1); - self.deadflag = DEAD_DEAD; self.vehicle_exit(VHEF_NORMAL); @@ -606,7 +555,6 @@ void racer_blowup() autocvar_g_vehicle_racer_blowup_forceintensity, DEATH_WAKIBLOWUP, world); - self.alpha = -1; self.nextthink = time + autocvar_g_vehicle_racer_respawntime; self.think = racer_spawn; self.movetype = MOVETYPE_NONE; @@ -623,7 +571,6 @@ void racer_blowup() void racer_deadtouch() { - dprint("Boink!\n"); self.avelocity_x *= 0.7; self.cnt -= 1; if(self.cnt <= 0) @@ -658,13 +605,6 @@ void racer_die() self.nextthink = 2 + time + random() * 3; } -#ifdef VEHICLES_CSQC -void racer_send_exta(entity to) -{ - -} -#endif - void racer_dinit() { if not (vehicle_initialize( @@ -685,9 +625,7 @@ void racer_dinit() remove(self); return; } -#ifdef VEHICLES_CSQC - self.vehile_send_exta = racer_send_exta; -#endif + if(autocvar_g_vehicle_racer_hovertype != 0) racer_force_from_tag = vehicles_force_fromtag_maglev; else @@ -703,11 +641,11 @@ void racer_dinit() void spawnfunc_vehicle_racer() { + self.vehicle_flags |= VHF_DMGSHAKE; + self.vehicle_flags |= VHF_DMGROLL; - precache_sound ("weapons/laserimpact.wav"); precache_sound ("weapons/lasergun_fire.wav"); precache_sound ("weapons/rocket_fire.wav"); - precache_sound ("weapons/rocket_impact.wav"); precache_sound ("vehicles/racer_idle.wav"); precache_sound ("vehicles/racer_move.wav"); @@ -734,75 +672,4 @@ void spawnfunc_vehicle_racer() self.think = racer_dinit; self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } - #endif // SVQC - -#ifdef CSQC -#ifdef VEHICLES_CSQC -void racer_draw() -{ - /*float dt; - - dt = time - self.lastupdate; - self.lastupdate = time; - if(dt < 0) - return; - */ - //self.origin += dt * self.velocity; - //self.origin_z -= dt * getstatf(STAT_MOVEVARS_GRAVITY); - //setorigin(self, self.origin); - - if(vehicle_hudmodel.owner == self) - { - setorigin(vehicle_hudmodel, self.origin); - vehicle_hudmodel.angles = self.angles; - } - - -} - -void racer_draw2d() -{ - -} - -void racer_read_extra() -{ - -} - -entity racer_hud; -entity racer_vp; -void racer_hud_draw() -{ - -} - -void vehicle_racer_assemble() -{ - setmodel(self, "models/vehicles/wakizashi.dpm"); - self.scale = 0.5; - self.movetype = MOVETYPE_BOUNCE; - - //self.entremove = VehicleRacerRemove; - setsize(self, '-60 -60 -20', '60 60 20'); - self.draw = racer_draw; - self.drawmask = MASK_NORMAL; - self.solid = SOLID_BBOX; - self.lastupdate = time; - self.vehile_read_exta = racer_read_extra; - - if(racer_hud == world) - { - dprint("SpawnHUUUOOOUUUDDD\n"); - racer_hud = spawn(); - setmodel(racer_hud, "models/vehicles/wakizashi_cockpit.dpm"); - racer_hud.drawmask = MASK_NORMAL; - racer_hud.renderflags = RF_VIEWMODEL; - racer_hud.scale = 0.5; - } - vehicle_hudmodel = racer_hud; // FIXME!! - racer_hud.draw = racer_hud_draw; -} -#endif -#endif //CSQC