X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fracer.qc;h=237f0dce923f0b92d8c9f9edc4de775e854efe20;hp=d245f8178bdd143721a30dd1ac3db1678f03caa4;hb=168ad453c4365703f38247b28321f1c420a41deb;hpb=01f1f0e22a9e50f5ab1184accdcd890ecd71108b diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index d245f8178..237f0dce9 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -1,7 +1,7 @@ #define RACER_MIN '-120 -120 -40' #define RACER_MAX '120 120 40' -#define RACER_TICRATE 0.05 +#ifdef SVQC void racer_exit(float eject); void racer_enter(); @@ -16,6 +16,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; @@ -36,15 +37,18 @@ float autocvar_g_vehicle_racer_shield; float autocvar_g_vehicle_racer_shield_regen; float autocvar_g_vehicle_racer_shield_regen_pause; -float autocvar_g_vehicle_racer_laser_cost; -float autocvar_g_vehicle_racer_laser_damage; -float autocvar_g_vehicle_racer_laser_radius; -float autocvar_g_vehicle_racer_laser_refire; -float autocvar_g_vehicle_racer_laser_speed; +float autocvar_g_vehicle_racer_cannon_cost; +float autocvar_g_vehicle_racer_cannon_damage; +float autocvar_g_vehicle_racer_cannon_radius; +float autocvar_g_vehicle_racer_cannon_refire; +float autocvar_g_vehicle_racer_cannon_speed; +float autocvar_g_vehicle_racer_cannon_spread; +float autocvar_g_vehicle_racer_cannon_force; float autocvar_g_vehicle_racer_rocket_accel; float autocvar_g_vehicle_racer_rocket_damage; float autocvar_g_vehicle_racer_rocket_radius; +float autocvar_g_vehicle_racer_rocket_force; float autocvar_g_vehicle_racer_rocket_refire; float autocvar_g_vehicle_racer_rocket_speed; float autocvar_g_vehicle_racer_rocket_turnrate; @@ -56,7 +60,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; @@ -70,30 +73,31 @@ void racer_align4point() vector push_vector, v_add; float fl_push, fr_push, bl_push, br_push; + push_vector = racer_force_from_tag("tag_engine_fr", autocvar_g_vehicle_racer_springlength, autocvar_g_vehicle_racer_hoverpower); fr_push = force_fromtag_normpower; - vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); + //vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); push_vector += racer_force_from_tag("tag_engine_fl", autocvar_g_vehicle_racer_springlength, autocvar_g_vehicle_racer_hoverpower); fl_push = force_fromtag_normpower; - vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); + //vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); push_vector += racer_force_from_tag("tag_engine_br", autocvar_g_vehicle_racer_springlength, autocvar_g_vehicle_racer_hoverpower); br_push = force_fromtag_normpower; - vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); + //vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); push_vector += racer_force_from_tag("tag_engine_bl", autocvar_g_vehicle_racer_springlength, autocvar_g_vehicle_racer_hoverpower); bl_push = force_fromtag_normpower; - vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); + //vehicles_sweap_collision(force_fromtag_origin, self.velocity, frametime, v_add, autocvar_g_vehicle_racer_collision_multiplier); self.velocity += (push_vector * frametime); // Anti ocilation if(self.velocity_z > 0) - self.velocity_z *= autocvar_g_vehicle_racer_upforcedamper; + self.velocity_z *= 1 - (autocvar_g_vehicle_racer_upforcedamper * frametime); - self.velocity += v_add; - self.velocity_z -= autocvar_sv_gravity * frametime; + self.velocity += v_add; + //self.velocity_z -= autocvar_sv_gravity * frametime; push_vector_x = (fl_push - bl_push); push_vector_x += (fr_push - br_push); @@ -106,66 +110,27 @@ void racer_align4point() // Apply angle diffrance self.angles_z += push_vector_z * frametime; self.angles_x += push_vector_x * frametime; + // Apply stabilizer self.angles_x *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * frametime); self.angles_z *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * frametime); } -void racer_rocket_explode() -{ - PROJECTILE_TOUCH; - if(other.owner == self.owner) - return; - - self.event_damage = SUB_Null; - - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("rocket_explode"), findbetterlocation (self.origin, 16), '0 0 0', 1); - RadiusDamage (self, self.realowner ,autocvar_g_vehicle_racer_rocket_damage, 0, autocvar_g_vehicle_racer_rocket_radius, world, 150, DEATH_WAKIROCKET, world); - - remove (self); -} - -void racer_bolt_explode() -{ - PROJECTILE_TOUCH; - pointparticles(particleeffectnum("wakizashi_gun_impact"), findbetterlocation (self.origin, 8), trace_plane_normal * 1000, 1); - RadiusDamage (self, self.realowner, autocvar_g_vehicle_racer_laser_damage, 0, autocvar_g_vehicle_racer_laser_radius, world, 150, DEATH_WAKIGUN, world); - sound (self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); - remove (self); -} - void racer_fire_cannon(string tagname) { - entity bolt; vector v; + entity bolt; - bolt = spawn(); - sound (self, CHAN_WEAPON, "weapons/lasergun_fire.wav", VOL_BASE, ATTN_NORM); - - setorigin(bolt, gettaginfo(self, gettagindex(self, tagname))); - PROJECTILE_MAKETRIGGER(bolt); - - bolt.movetype = MOVETYPE_FLYMISSILE; - bolt.flags = FL_PROJECTILE | FL_NOTARGET; - bolt.owner = self; - bolt.realowner = self.owner; - bolt.touch = racer_bolt_explode; - bolt.think = racer_bolt_explode; - bolt.nextthink = time + 9; - - bolt.bot_dodge = TRUE; - bolt.bot_dodgerating = autocvar_g_vehicle_racer_laser_damage; + v = gettaginfo(self, gettagindex(self, tagname)); + 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, TRUE, TRUE); // Fix z-aim (for chase mode) v = normalize(trace_endpos - bolt.origin); v_forward_z = v_z * 0.5; - - bolt.velocity = v_forward * autocvar_g_vehicle_racer_laser_speed; - - pointparticles(particleeffectnum("wakizashi_gun_muzzleflash"), bolt.origin, bolt.velocity, 1); - - CSQCProjectile(bolt, TRUE, PROJECTILE_LASER, TRUE); + bolt.velocity = v_forward * autocvar_g_vehicle_racer_cannon_speed; } void racer_rocket_groundhugger() @@ -175,9 +140,9 @@ void racer_rocket_groundhugger() self.nextthink = time; - if ((self.owner.deadflag != DEAD_NO) || (self.cnt < time)) + if(self.owner.deadflag != DEAD_NO || self.cnt < time) { - racer_rocket_explode(); + self.use(); return; } @@ -223,9 +188,9 @@ void racer_rocket_tracker() self.nextthink = time; - if ((self.owner.deadflag != DEAD_NO) || (self.cnt < time)) + if (self.owner.deadflag != DEAD_NO || self.cnt < time) { - racer_rocket_explode(); + self.use(); return; } @@ -263,60 +228,44 @@ void racer_rocket_tracker() void racer_fire_rocket(string tagname, entity trg) { + vector v; entity rocket; - sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", VOL_BASE, ATTN_NORM); - - rocket = spawn(); - setsize (rocket, '-1 -1 -1', '1 1 1'); - setorigin(rocket, gettaginfo(self, gettagindex(self, tagname))); + v = gettaginfo(self, gettagindex(self, tagname)); + 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, FALSE, FALSE); rocket.lip = autocvar_g_vehicle_racer_rocket_accel * sys_frametime; rocket.wait = autocvar_g_vehicle_racer_rocket_turnrate; - rocket.solid = SOLID_BBOX; - rocket.movetype = MOVETYPE_FLYMISSILE; - rocket.flags = FL_PROJECTILE; - rocket.owner = self; - rocket.realowner = self.owner; - rocket.touch = racer_rocket_explode; - rocket.bot_dodge = TRUE; - rocket.bot_dodgerating = autocvar_g_vehicle_racer_rocket_damage; - rocket.cnt = time + 9; - rocket.velocity = v_forward * autocvar_g_vehicle_racer_rocket_speed; + rocket.nextthink = time; + rocket.enemy = trg; + rocket.cnt = time + 15; if(trg) rocket.think = racer_rocket_tracker; else rocket.think = racer_rocket_groundhugger; - - rocket.nextthink = time; - rocket.enemy = trg; - - CSQCProjectile(rocket, TRUE, PROJECTILE_ROCKET, TRUE); } -.float fire1_waspressed; -.float fire2_waspressed; float racer_frame() { entity player, racer; vector df; - float ftmp, ftmp2; + 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; - - if(player.BUTTON_USE) - { - vehicles_exit(VHEF_NORMAL); - self = player; - return 0; - } - + + vehicles_painframe(); + if(racer.deadflag != DEAD_NO) { self = player; @@ -325,61 +274,31 @@ float racer_frame() } racer_align4point(); - // Move abt crosshir insted of v_angle. this allows custom chase camera. - crosshair_trace(player); -#if VEHICLES_VIEWROTATE_CROSSHAIR - 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 * sys_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 * sys_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); + crosshair_trace(player); - makevectors(racer.angles); - racer.angles_x *= -1; -#else racer.angles_x *= -1; // Yaw - ftmp = autocvar_g_vehicle_racer_turnspeed * sys_frametime; + ftmp = autocvar_g_vehicle_racer_turnspeed * frametime; ftmp = bound(-ftmp, shortangle_f(player.v_angle_y - racer.angles_y, racer.angles_y), ftmp); racer.angles_y = anglemods(racer.angles_y + ftmp); // Roll - racer.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * sys_frametime; + racer.angles_z += -ftmp * autocvar_g_vehicle_racer_turnroll * frametime; // Pitch - ftmp = autocvar_g_vehicle_racer_pitchspeed * sys_frametime; + ftmp = autocvar_g_vehicle_racer_pitchspeed * frametime; ftmp = bound(-ftmp, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp); racer.angles_x = bound(-30, anglemods(racer.angles_x + ftmp), 30); 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) { @@ -396,20 +315,58 @@ float racer_frame() else if(player.movement_y > 0) df += v_right * autocvar_g_vehicle_racer_speed_strafe; } - - // limit _z to avoid flying on normal thrust - if(df_z > 0) - df_z = min(df_z, 700); - + + 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)) { + 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); - self.owner.vehicle_energy = racer.vehicle_energy / autocvar_g_vehicle_racer_energy; + + 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_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; @@ -419,9 +376,9 @@ float racer_frame() if(player.BUTTON_ATCK) if(time > racer.attack_finished_single) - if(racer.vehicle_energy >= autocvar_g_vehicle_racer_laser_cost) + if(racer.vehicle_energy >= autocvar_g_vehicle_racer_cannon_cost) { - racer.vehicle_energy -= autocvar_g_vehicle_racer_laser_cost; + racer.vehicle_energy -= autocvar_g_vehicle_racer_cannon_cost; racer.wait = time; crosshair_trace(player); @@ -435,13 +392,13 @@ float racer_frame() racer_fire_cannon("tag_fire2"); racer.cnt = 1; } - racer.attack_finished_single = time + autocvar_g_vehicle_racer_laser_refire; - self.owner.vehicle_energy = racer.vehicle_energy / autocvar_g_vehicle_racer_energy; + racer.attack_finished_single = time + autocvar_g_vehicle_racer_cannon_refire; + //self.owner.vehicle_energy = racer.vehicle_energy / autocvar_g_vehicle_racer_energy; } if(autocvar_g_vehicle_racer_rocket_locktarget) { - vehicles_locktarget2((1 / autocvar_g_vehicle_racer_rocket_locking_time) * frametime, + vehicles_locktarget((1 / autocvar_g_vehicle_racer_rocket_locking_time) * frametime, (1 / autocvar_g_vehicle_racer_rocket_locking_releasetime) * frametime, autocvar_g_vehicle_racer_rocket_locked_time); @@ -459,19 +416,22 @@ float racer_frame() if(time > racer.delay) if(player.BUTTON_ATCK2) { - racer_fire_rocket("tag_rocket_r", ((self.lock_strength == 1 && self.lock_target) ? self.lock_target : world)); - racer_fire_rocket("tag_rocket_l", ((self.lock_strength == 1 && self.lock_target) ? self.lock_target : world)); - - self.lock_strength = 0; - self.lock_target = world; + self.misc_bulletcounter += 1; + 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) + { + racer_fire_rocket("tag_rocket_l", (self.lock_strength == 1 && self.lock_target) ? self.lock_target : world); + self.lock_strength = 0; + self.lock_target = world; + self.misc_bulletcounter = 0; - racer.delay = time + autocvar_g_vehicle_racer_rocket_refire; - racer.lip = time; + racer.delay = time + autocvar_g_vehicle_racer_rocket_refire; + racer.lip = time; + } } - - player.fire2_waspressed = player.BUTTON_ATCK2; - - 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); @@ -484,6 +444,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); @@ -499,128 +460,92 @@ float racer_frame() void racer_think() { - float a, b, c; - - self.nextthink = time; - - a = autocvar_g_vehicle_racer_anglestabilizer; + /* + float a, b, c;a = autocvar_g_vehicle_racer_anglestabilizer; b = autocvar_g_vehicle_racer_springlength; c = autocvar_g_vehicle_racer_hoverpower; autocvar_g_vehicle_racer_anglestabilizer = 36; autocvar_g_vehicle_racer_springlength = 96; autocvar_g_vehicle_racer_hoverpower = 300; + */ - racer_align4point(); + racer_align4point(); //time - self.nextthink); - if(self.velocity_z < 0) - self.velocity_z *= 0.95; + /* + //if(self.velocity_z > 0) + // self.velocity_z *= 0.95; autocvar_g_vehicle_racer_anglestabilizer = a; autocvar_g_vehicle_racer_springlength = b; autocvar_g_vehicle_racer_hoverpower = c; + */ - self.velocity_x *= 0.95; - self.velocity_y *= 0.95; + self.velocity_x *= 0.9; + self.velocity_y *= 0.9; + self.velocity_z *= 0.8; + self.velocity_z += sin(time * 2) * 16; + self.nextthink = time; // + 0.05; } 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); + + if(self.owner.flagcarried) + setorigin(self.owner.flagcarried, '-190 0 96'); } -void racer_spawn(); - void racer_exit(float eject) { - vehicles_setreturn(autocvar_g_vehicle_racer_respawntime, racer_spawn); - + vector spot; + 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; 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; } -void racer_touch() -{ - if(self.owner) - { - //self.velocity = 0.999 * self.velocity; - // TO-DO Impact reaction (crush players, damage self on high speed impact etc) - return; - } - - if(other.classname != "player") - return; - - if(other.deadflag != DEAD_NO) - return; - - if(other.vehicle != world) - return; - - vehicles_enter(); -} - void racer_spawn() { - self.think = racer_think; - self.nextthink = time; - - self.flags = FL_NOTARGET; - self.effects = 0; - + self.think = racer_think; + self.nextthink = time; self.vehicle_health = autocvar_g_vehicle_racer_health; self.vehicle_shield = autocvar_g_vehicle_racer_shield; - self.event_damage = vehicles_damage; - self.touch = racer_touch; - - self.iscreature = TRUE; - self.scale = 0.5; - self.movetype = MOVETYPE_BOUNCEMISSILE; - self.solid = SOLID_SLIDEBOX; - self.takedamage = DAMAGE_AIM; - - self.alpha = 1; - self.colormap = 1024; - self.deadflag = DEAD_NO; - self.bot_attack = TRUE; - - self.vehicle_energy = 1; - self.vehicle_hudmodel.viewmodelforclient = self; - - setorigin(self, self.pos1); - self.angles = self.pos2; + self.movetype = MOVETYPE_TOSS; + self.solid = SOLID_SLIDEBOX; + self.delay = time; + self.scale = 0.5; setsize(self, RACER_MIN * 0.5, RACER_MAX * 0.5); - pointparticles(particleeffectnum("teleport"), self.origin + '0 0 64', '0 0 0', 1); - self.delay = time; - - vehicles_common_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); - self.deadflag = DEAD_DEAD; self.vehicle_exit(VHEF_NORMAL); @@ -630,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; @@ -641,6 +565,8 @@ void racer_blowup() self.velocity = '0 0 0'; setorigin(self, self.pos1); + self.think = racer_spawn; + self.nextthink = time + autocvar_g_vehicle_racer_respawntime; } void racer_deadtouch() @@ -655,27 +581,24 @@ void racer_die() { self.health = 0; self.event_damage = SUB_Null; - self.iscreature = FALSE; self.solid = SOLID_CORPSE; self.takedamage = DAMAGE_NO; 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); - - self.velocity += '0 0 700'; + + 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.colormod = '-0.5 -0.5 -0.5'; + self.velocity += '0 0 700'; + self.colormod = '-0.5 -0.5 -0.5'; self.think = racer_blowup; self.nextthink = 2 + time + random() * 3; @@ -692,9 +615,11 @@ void racer_dinit() HUD_WAKIZASHI, 0.5 * RACER_MIN, 0.5 * RACER_MAX, FALSE, - racer_spawn, racer_frame, + 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; @@ -709,21 +634,26 @@ void racer_dinit() self.scale = 0.5; setattachment(self.vehicle_hudmodel, self, ""); setattachment(self.vehicle_viewport, self, "tag_viewport"); + + self.mass = 900; } 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"); + precache_sound ("vehicles/racer_boost.wav"); precache_model ("models/vhshield.md3"); precache_model ("models/vehicles/wakizashi.dpm"); precache_model ("models/vehicles/wakizashi_cockpit.dpm"); - vehicles_configcheck("vehicle_racer.cfg", autocvar_g_vehicle_racer_health); if(autocvar_g_vehicle_racer_energy) if(autocvar_g_vehicle_racer_energy_regen) @@ -739,5 +669,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