X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fracer.qc;h=f62925f299b659efdc671b89a7bc28f607477335;hb=e578287a40760a4fb6fddc674a9a5701e90f4dc1;hp=d17d1080cf9172f4c87e4526b623be7eac35b11f;hpb=c2ada41d4d1a6b626dcd056ed1e46fe23aa6b3e1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index d17d1080c..f62925f29 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -1,7 +1,8 @@ #define RACER_MIN '-120 -120 -40' #define RACER_MAX '120 120 40' -#define RACER_TICRATE 0.05 +#define RACER_ENGINE "sound/vehicles/racer.wav" +#ifdef SVQC void racer_exit(float eject); void racer_enter(); @@ -16,6 +17,7 @@ float autocvar_g_vehicle_racer_speed_forward; float autocvar_g_vehicle_racer_speed_strafe; float autocvar_g_vehicle_racer_springlength; float autocvar_g_vehicle_racer_upforcedamper; +float autocvar_g_vehicle_racer_friction; float autocvar_g_vehicle_racer_hovertype; float autocvar_g_vehicle_racer_hoverpower; @@ -59,7 +61,6 @@ float autocvar_g_vehicle_racer_rocket_locked_time; float autocvar_g_vehicle_racer_rocket_locked_maxangle; float autocvar_g_vehicle_racer_respawntime; -float autocvar_g_vehicle_racer_collision_multiplier; float autocvar_g_vehicle_racer_blowup_radius; float autocvar_g_vehicle_racer_blowup_coredamage; @@ -122,10 +123,10 @@ void racer_fire_cannon(string tagname) entity bolt; v = gettaginfo(self, gettagindex(self, tagname)); - bolt = vehicles_projectile("wakizashi_gun_impact", "weapons/laserimpact.wav", "wakizashi_gun_muzzleflash", "weapons/lasergun_fire.wav", + bolt = vehicles_projectile("wakizashi_gun_muzzleflash", "weapons/lasergun_fire.wav", v, normalize(v_forward + randomvec() * autocvar_g_vehicle_racer_cannon_spread) * autocvar_g_vehicle_racer_cannon_speed, autocvar_g_vehicle_racer_cannon_damage, autocvar_g_vehicle_racer_cannon_radius, autocvar_g_vehicle_racer_cannon_force, 0, - DEATH_WAKIGUN, PROJECTILE_WAKICANNON, 0); + DEATH_WAKIGUN, PROJECTILE_WAKICANNON, 0, TRUE, TRUE); // Fix z-aim (for chase mode) v = normalize(trace_endpos - bolt.origin); @@ -232,10 +233,10 @@ void racer_fire_rocket(string tagname, entity trg) entity rocket; v = gettaginfo(self, gettagindex(self, tagname)); - rocket = vehicles_projectile("rocket_explode", "weapons/rocket_impact.wav", "", "weapons/rocket_fire.wav", + rocket = vehicles_projectile("wakizashi_rocket_launch", "weapons/rocket_fire.wav", v, v_forward * autocvar_g_vehicle_racer_rocket_speed, autocvar_g_vehicle_racer_rocket_damage, autocvar_g_vehicle_racer_rocket_radius, autocvar_g_vehicle_racer_rocket_force, 3, - DEATH_WAKIROCKET, PROJECTILE_WAKIROCKET, 20); + DEATH_WAKIROCKET, PROJECTILE_WAKIROCKET, 20, FALSE, FALSE); rocket.lip = autocvar_g_vehicle_racer_rocket_accel * sys_frametime; rocket.wait = autocvar_g_vehicle_racer_rocket_turnrate; @@ -262,13 +263,15 @@ float racer_frame() self = racer; + /* if(player.BUTTON_USE) { vehicles_exit(VHEF_NORMAL); self = player; return 0; } - + */ + if(racer.deadflag != DEAD_NO) { self = player; @@ -280,40 +283,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 @@ -331,9 +300,11 @@ float racer_frame() makevectors(racer.angles); racer.angles_x *= -1; -#endif - df = racer.velocity * -0.5; + + ftmp = racer.velocity_z; + df = racer.velocity * -autocvar_g_vehicle_racer_friction; + racer.velocity_z = ftmp; if(player.movement_x != 0) { @@ -350,16 +321,46 @@ float racer_frame() else if(player.movement_y > 0) df += v_right * autocvar_g_vehicle_racer_speed_strafe; } - + + if(vlen(player.movement) != 0) + { + if(self.sound_nexttime < time || self.sounds != 1) + { + self.sounds = 1; + self.sound_nexttime = time + 10.922667; //soundlength("vehicles/racer_move.wav"); + sound (self, CHAN_TRIGGER, "vehicles/racer_move.wav", VOL_VEHICLEENGINE, ATTN_NORM); + } + } + else + { + if(self.sound_nexttime < time || self.sounds != 0) + { + self.sounds = 0; + self.sound_nexttime = time + 11.888604; //soundlength("vehicles/racer_idle.wav"); + sound (self, CHAN_TRIGGER, "vehicles/racer_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); + } + } + // Afterburn - if (player.BUTTON_JUMP) - if(racer.vehicle_energy >= (autocvar_g_vehicle_racer_afterburn_cost * frametime)) + if (player.BUTTON_JUMP && racer.vehicle_energy >= (autocvar_g_vehicle_racer_afterburn_cost * frametime)) { racer.wait = time; racer.vehicle_energy -= autocvar_g_vehicle_racer_afterburn_cost * frametime; df += (v_forward * autocvar_g_vehicle_racer_speed_afterburn); - self.owner.vehicle_energy = racer.vehicle_energy / autocvar_g_vehicle_racer_energy; + + if(self.strength_finished < time) + { + //self.sounds = 2; + self.strength_finished = time + 10.922667; //soundlength("vehicles/racer_boost.wav"); + sound (self, CHAN_PAIN, "vehicles/racer_boost.wav", VOL_VEHICLEENGINE, ATTN_NORM); + } } + else + { + self.strength_finished = 0; + sound (self, CHAN_PAIN, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); + } + racer.velocity += df * frametime; @@ -386,7 +387,7 @@ float racer_frame() racer.cnt = 1; } racer.attack_finished_single = time + autocvar_g_vehicle_racer_cannon_refire; - self.owner.vehicle_energy = racer.vehicle_energy / autocvar_g_vehicle_racer_energy; + //self.owner.vehicle_energy = racer.vehicle_energy / autocvar_g_vehicle_racer_energy; } if(autocvar_g_vehicle_racer_rocket_locktarget) @@ -410,7 +411,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) @@ -424,7 +425,7 @@ float racer_frame() racer.lip = time; } } - player.vehicle_reload1 = (time - racer.lip) / (racer.delay - racer.lip); + player.vehicle_reload1 = bound(0, 100 * ((time - racer.lip) / (racer.delay - racer.lip)), 100); if(self.vehicle_flags & VHF_SHIELDREGEN) vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime); @@ -437,6 +438,7 @@ float racer_frame() VEHICLE_UPDATE_PLAYER(health, racer); + VEHICLE_UPDATE_PLAYER(energy, racer); if(self.vehicle_flags & VHF_HASSHIELD) VEHICLE_UPDATE_PLAYER(shield, racer); @@ -477,18 +479,23 @@ void racer_think() self.velocity_y *= 0.9; self.velocity_z *= 0.8; self.velocity_z += sin(time * 2) * 16; - self.nextthink = time + 0.05; + self.nextthink = time; // + 0.05; } void racer_enter() { - self.movetype = MOVETYPE_BOUNCE; //MISSILE; + 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); + + if(self.owner.flagcarried) + setorigin(self.owner.flagcarried, '-190 0 96'); } void racer_exit(float eject) { + vector spot; + self.think = racer_think; self.nextthink = time; self.movetype = MOVETYPE_TOSS; @@ -499,14 +506,18 @@ void racer_exit(float eject) makevectors(self.angles); if(eject) { - setorigin(self.owner, self.origin + v_forward * 100 + v_up * 32); + spot = self.origin + v_forward * 100 + '0 0 64'; + spot = vehicles_findgoodexit(spot); + setorigin(self.owner , spot); self.owner.velocity = (v_up + v_forward * 0.25) * 750; } else { - setorigin(self.owner, self.origin - v_forward * 100 + v_up * 32); - self.owner.velocity = v_forward * -150; + spot = self.origin - v_forward * 200 + '0 0 64'; + spot = vehicles_findgoodexit(spot); + setorigin(self.owner , spot); } + self.owner = world; } @@ -529,7 +540,7 @@ void racer_spawn() void racer_blowup() { sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1); + pointparticles(particleeffectnum("explosion_big"), self.origin, '0 0 0', 1); self.deadflag = DEAD_DEAD; self.vehicle_exit(VHEF_NORMAL); @@ -557,6 +568,7 @@ void racer_blowup() void racer_deadtouch() { + dprint("Boink!\n"); self.avelocity_x *= 0.7; self.cnt -= 1; if(self.cnt <= 0) @@ -573,15 +585,15 @@ void racer_die() self.deadflag = DEAD_DYING; self.movetype = MOVETYPE_BOUNCE; self.wait = time; - self.cnt = 1 + random() * 3; + self.cnt = 1 + random() * 2; self.touch = racer_deadtouch; - - pointparticles(particleeffectnum("rocket_explode"), findbetterlocation (self.origin, 16), '0 0 0', 1); + + pointparticles(particleeffectnum("explosion_medium"), self.origin, '0 0 0', 1); if(random() < 0.5) - self.avelocity_z = 16; + self.avelocity_z = 32; else - self.avelocity_z = -16; + self.avelocity_z = -32; self.avelocity_x = -vlen(self.velocity) * 0.2; self.velocity += '0 0 700'; @@ -605,7 +617,8 @@ void racer_dinit() racer_spawn, autocvar_g_vehicle_racer_respawntime, racer_frame, racer_enter, racer_exit, - racer_die, racer_think)) + racer_die, racer_think, + TRUE)) { remove(self); return; @@ -618,8 +631,8 @@ void racer_dinit() // FIXME: this be hakkz, fix the models insted (scale body, add tag_viewport to the hudmodel). self.scale = 0.5; - //setattachment(self.vehicle_hudmodel, self, ""); - //setattachment(self.vehicle_viewport, self, "tag_viewport"); + setattachment(self.vehicle_hudmodel, self, ""); + setattachment(self.vehicle_viewport, self, "tag_viewport"); self.mass = 900; } @@ -631,6 +644,10 @@ void spawnfunc_vehicle_racer() 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"); + precache_sound ("vehicles/racer_boost.wav"); precache_model ("models/vhshield.md3"); precache_model ("models/vehicles/wakizashi.dpm"); @@ -651,5 +668,6 @@ void spawnfunc_vehicle_racer() self.vehicle_flags |= VHF_HEALTHREGEN; self.think = racer_dinit; - self.nextthink = time + 1; + self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } +#endif // SVQC