X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fracer.qc;h=ff129a4e48c85d68a55dd615b18098cb61f09fb0;hb=5d84c659e4c2c51c996b5330fa19c8a24887e42d;hp=9fbd6541fc8e6af51254de34bc4a2eb9e772ff91;hpb=dc3538ad5afba59f36a79011ec6997553c851c25;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index 9fbd6541f..f009723b7 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -6,6 +6,8 @@ void racer_exit(float eject); void racer_enter(); // Auto cvars +float autocvar_g_vehicle_racer; + float autocvar_g_vehicle_racer_speed_afterburn; float autocvar_g_vehicle_racer_afterburn_cost; @@ -58,6 +60,7 @@ float autocvar_g_vehicle_racer_rocket_locking_time; float autocvar_g_vehicle_racer_rocket_locking_releasetime; float autocvar_g_vehicle_racer_rocket_locked_time; float autocvar_g_vehicle_racer_rocket_locked_maxangle; +float autocvar_g_vehicle_racer_rocket_climbspeed; float autocvar_g_vehicle_racer_respawntime; @@ -66,38 +69,38 @@ float autocvar_g_vehicle_racer_blowup_coredamage; float autocvar_g_vehicle_racer_blowup_edgedamage; float autocvar_g_vehicle_racer_blowup_forceintensity; +float autocvar_g_vehicle_racer_bouncefactor; +float autocvar_g_vehicle_racer_bouncestop; +vector autocvar_g_vehicle_racer_bouncepain; + var vector racer_force_from_tag(string tag_name, float spring_length, float max_power); -void racer_align4point() +void racer_align4point(float _delta) { - vector push_vector, v_add; + vector push_vector; 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, _delta, 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, _delta, 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, _delta, 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, _delta, v_add, autocvar_g_vehicle_racer_collision_multiplier); - self.velocity += (push_vector * frametime); + self.velocity += push_vector * _delta; // Anti ocilation - if(self.velocity_z > 0) - self.velocity_z *= 1 - (autocvar_g_vehicle_racer_upforcedamper * frametime); - - self.velocity += v_add; - //self.velocity_z -= autocvar_sv_gravity * frametime; + if(self.velocity_z > 0) + self.velocity_z *= 1 - autocvar_g_vehicle_racer_upforcedamper * _delta; push_vector_x = (fl_push - bl_push); push_vector_x += (fr_push - br_push); @@ -108,12 +111,12 @@ void racer_align4point() push_vector_z *= 360; // Apply angle diffrance - self.angles_z += push_vector_z * frametime; - self.angles_x += push_vector_x * frametime; + self.angles_z += push_vector_z * _delta; + self.angles_x += push_vector_x * _delta; // Apply stabilizer - self.angles_x *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * frametime); - self.angles_z *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * frametime); + self.angles_x *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * _delta); + self.angles_z *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * _delta); } void racer_fire_cannon(string tagname) @@ -125,7 +128,7 @@ void racer_fire_cannon(string 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); + DEATH_VH_WAKI_GUN, PROJECTILE_WAKICANNON, 0, TRUE, TRUE, self.owner); // Fix z-aim (for chase mode) v = normalize(trace_endpos - bolt.origin); @@ -146,7 +149,7 @@ void racer_rocket_groundhugger() return; } - if not (self.realowner.vehicle) + if (!self.realowner.vehicle) { UpdateCSQCProjectile(self); return; @@ -194,7 +197,7 @@ void racer_rocket_tracker() return; } - if not (self.realowner.vehicle) + if (!self.realowner.vehicle) { UpdateCSQCProjectile(self); return; @@ -205,8 +208,14 @@ void racer_rocket_tracker() newvel = oldvel + self.lip; makevectors(vectoangles(olddir)); + float time_to_impact = min(vlen(self.enemy.origin - self.origin) / vlen(self.velocity), 1); + vector predicted_origin = self.enemy.origin + self.enemy.velocity * time_to_impact; + traceline(self.origin, self.origin + v_forward * 64 - '0 0 32', MOVE_NORMAL, self); - newdir = normalize(self.enemy.origin - self.origin); + newdir = normalize(predicted_origin - self.origin); + + //vector + float height_diff = predicted_origin_z - self.origin_z; if(vlen(newdir - v_forward) > autocvar_g_vehicle_racer_rocket_locked_maxangle) { @@ -216,11 +225,12 @@ void racer_rocket_tracker() return; } - if(trace_fraction != 1.0) + if(trace_fraction != 1.0 && trace_ent != self.enemy) newdir_z += 16 * sys_frametime; self.velocity = normalize(olddir + newdir * autocvar_g_vehicle_racer_rocket_turnrate) * newvel; self.velocity_z -= 800 * sys_frametime; + self.velocity_z += max(height_diff, autocvar_g_vehicle_racer_rocket_climbspeed) * sys_frametime ; UpdateCSQCProjectile(self); return; @@ -228,14 +238,11 @@ void racer_rocket_tracker() void racer_fire_rocket(string tagname, entity trg) { - vector v; - entity rocket; - - v = gettaginfo(self, gettagindex(self, tagname)); - rocket = vehicles_projectile("wakizashi_rocket_launch", "weapons/rocket_fire.wav", + vector v = gettaginfo(self, gettagindex(self, tagname)); + entity rocket = 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); + DEATH_VH_WAKI_ROCKET, PROJECTILE_WAKIROCKET, 20, FALSE, FALSE, self.owner); rocket.lip = autocvar_g_vehicle_racer_rocket_accel * sys_frametime; rocket.wait = autocvar_g_vehicle_racer_rocket_turnrate; @@ -261,11 +268,11 @@ float racer_frame() player = self; racer = self.vehicle; self = racer; - + player.BUTTON_ZOOM = player.BUTTON_CROUCH = 0; - + vehicles_painframe(); - + if(racer.deadflag != DEAD_NO) { self = player; @@ -273,7 +280,7 @@ float racer_frame() return 1; } - racer_align4point(); + racer_align4point(frametime); crosshair_trace(player); @@ -295,84 +302,68 @@ float racer_frame() makevectors(racer.angles); racer.angles_x *= -1; - - ftmp = racer.velocity_z; + //ftmp = racer.velocity_z; df = racer.velocity * -autocvar_g_vehicle_racer_friction; - racer.velocity_z = ftmp; + //racer.velocity_z = ftmp; - if(player.movement_x != 0) - { - if(player.movement_x > 0) - df += v_forward * autocvar_g_vehicle_racer_speed_forward; - else if(player.movement_x < 0) - df -= v_forward * autocvar_g_vehicle_racer_speed_forward; - } - - if(player.movement_y != 0) - { - if(player.movement_y < 0) - df -= v_right * autocvar_g_vehicle_racer_speed_strafe; - else if(player.movement_y > 0) - df += v_right * autocvar_g_vehicle_racer_speed_strafe; - } - if(vlen(player.movement) != 0) { + if(player.movement_x) + df += v_forward * ((player.movement_x > 0) ? autocvar_g_vehicle_racer_speed_forward : -autocvar_g_vehicle_racer_speed_forward); + + if(player.movement_y) + df += v_right * ((player.movement_y > 0) ? autocvar_g_vehicle_racer_speed_strafe : -autocvar_g_vehicle_racer_speed_strafe); + if(self.sound_nexttime < time || self.sounds != 1) - { + { self.sounds = 1; self.sound_nexttime = time + 10.922667; //soundlength("vehicles/racer_move.wav"); - sound (self, CH_TRIGGER_SINGLE, "vehicles/racer_move.wav", VOL_VEHICLEENGINE, ATTN_NORM); + sound (self, CH_TRIGGER_SINGLE, "vehicles/racer_move.wav", VOL_VEHICLEENGINE, ATTEN_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, CH_TRIGGER_SINGLE, "vehicles/racer_idle.wav", VOL_VEHICLEENGINE, ATTN_NORM); - } + sound (self, CH_TRIGGER_SINGLE, "vehicles/racer_idle.wav", VOL_VEHICLEENGINE, ATTEN_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); - + pointparticles(particleeffectnum("wakizashi_booster_smoke"), self.origin - v_forward * 32, v_forward * vlen(self.velocity), 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(racer.invincible_finished < time) + { + traceline(racer.origin, racer.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); + + racer.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.tur_head, CH_TRIGGER_SINGLE, "vehicles/racer_boost.wav", VOL_VEHICLEENGINE, ATTN_NORM); - } + if(racer.strength_finished < time) + { + racer.strength_finished = time + 10.922667; //soundlength("vehicles/racer_boost.wav"); + sound (racer.tur_head, CH_TRIGGER_SINGLE, "vehicles/racer_boost.wav", VOL_VEHICLEENGINE, ATTEN_NORM); + } } else { - self.strength_finished = 0; - sound (self.tur_head, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); + racer.strength_finished = 0; + sound (racer.tur_head, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_VEHICLEENGINE, ATTEN_NORM); } - - racer.velocity += df * frametime; - - df = (vlen(racer.velocity) * autocvar_g_vehicle_racer_downforce * v_up) * frametime; - racer.velocity = racer.velocity - df; - player.movement = racer.velocity; + df -= v_up * (vlen(racer.velocity) * autocvar_g_vehicle_racer_downforce); + player.movement = racer.velocity += df * frametime; if(player.BUTTON_ATCK) if(time > racer.attack_finished_single) @@ -393,7 +384,6 @@ 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; } if(autocvar_g_vehicle_racer_rocket_locktarget) @@ -416,16 +406,17 @@ float racer_frame() if(time > racer.delay) if(player.BUTTON_ATCK2) { - self.misc_bulletcounter += 1; + racer.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) + + if(racer.misc_bulletcounter == 1) + racer_fire_rocket("tag_rocket_r", (racer.lock_strength == 1 && racer.lock_target) ? racer.lock_target : world); + else if(racer.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_fire_rocket("tag_rocket_l", (racer.lock_strength == 1 && racer.lock_target) ? racer.lock_target : world); + racer.lock_strength = 0; + racer.lock_target = world; + racer.misc_bulletcounter = 0; racer.delay = time + autocvar_g_vehicle_racer_rocket_refire; racer.lip = time; @@ -433,22 +424,21 @@ float racer_frame() } 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); - - if(self.vehicle_flags & VHF_HEALTHREGEN) - vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime); + if(racer.vehicle_flags & VHF_SHIELDREGEN) + vehicles_regen(racer.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, TRUE); - if(self.vehicle_flags & VHF_ENERGYREGEN) - vehicles_regen(wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime); + if(racer.vehicle_flags & VHF_HEALTHREGEN) + vehicles_regen(racer.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, FALSE); + if(racer.vehicle_flags & VHF_ENERGYREGEN) + vehicles_regen(racer.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, FALSE); - VEHICLE_UPDATE_PLAYER(health, racer); - VEHICLE_UPDATE_PLAYER(energy, racer); - if(self.vehicle_flags & VHF_HASSHIELD) - VEHICLE_UPDATE_PLAYER(shield, racer); + VEHICLE_UPDATE_PLAYER(player, health, racer); + VEHICLE_UPDATE_PLAYER(player, energy, racer); + if(racer.vehicle_flags & VHF_HASSHIELD) + VEHICLE_UPDATE_PLAYER(player, shield, racer); player.BUTTON_ATCK = player.BUTTON_ATCK2 = 0; setorigin(player,racer.origin + '0 0 32'); @@ -460,54 +450,48 @@ float racer_frame() void racer_think() { - /* - 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(); //time - self.nextthink); - - /* - //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.9; - 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; + + float pushdeltatime = time - self.lastpushtime; + if (pushdeltatime > 0.15) pushdeltatime = 0; + self.lastpushtime = time; + if(!pushdeltatime) return; + + tracebox(self.origin, self.mins, self.maxs, self.origin - ('0 0 1' * autocvar_g_vehicle_racer_springlength), MOVE_NORMAL, self); + + vector df = self.velocity * -autocvar_g_vehicle_racer_friction; + df_z += (1 - trace_fraction) * autocvar_g_vehicle_racer_hoverpower + sin(time * 2) * (autocvar_g_vehicle_racer_springlength * 2); + + self.velocity += df * pushdeltatime; + if(self.velocity_z > 0) + self.velocity_z *= 1 - autocvar_g_vehicle_racer_upforcedamper * pushdeltatime; + + self.angles_x *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * pushdeltatime); + self.angles_z *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * pushdeltatime); } 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); - + self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health) * 100; + self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield) * 100; + if(self.owner.flagcarried) setorigin(self.owner.flagcarried, '-190 0 96'); + + //targetdrone_spawn(self.origin + '0 0 512' + randomvec() * 256, 1); } void racer_exit(float eject) { vector spot; - + self.think = racer_think; self.nextthink = time; - self.movetype = MOVETYPE_TOSS; - sound (self.tur_head, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_VEHICLEENGINE, ATTN_NORM); - - if not (self.owner) + self.movetype = MOVETYPE_BOUNCE; + sound (self.tur_head, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_VEHICLEENGINE, ATTEN_NORM); + + if (!self.owner) return; makevectors(self.angles); @@ -517,56 +501,58 @@ void racer_exit(float eject) spot = vehicles_findgoodexit(spot); setorigin(self.owner , spot); self.owner.velocity = (v_up + v_forward * 0.25) * 750; + self.owner.oldvelocity = self.owner.velocity; } else { - spot = self.origin - v_forward * 200 + '0 0 64'; - spot = vehicles_findgoodexit(spot); + if(vlen(self.velocity) > 2 * autocvar_sv_maxairspeed) + { + self.owner.velocity = normalize(self.velocity) * autocvar_sv_maxairspeed * 2; + self.owner.velocity_z += 200; + spot = self.origin + v_forward * 32 + '0 0 32'; + spot = vehicles_findgoodexit(spot); + } + else + { + self.owner.velocity = self.velocity * 0.5; + self.owner.velocity_z += 10; + spot = self.origin - v_forward * 200 + '0 0 32'; + spot = vehicles_findgoodexit(spot); + } + self.owner.oldvelocity = self.owner.velocity; setorigin(self.owner , spot); } - + antilag_clear(self.owner); self.owner = world; } -void racer_spawn() +void racer_impact() { - self.think = racer_think; - self.nextthink = time; - self.vehicle_health = autocvar_g_vehicle_racer_health; - self.vehicle_shield = autocvar_g_vehicle_racer_shield; - - 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); + if(autocvar_g_vehicle_racer_bouncepain_x) + vehicles_impact(autocvar_g_vehicle_racer_bouncepain_x, autocvar_g_vehicle_racer_bouncepain_y, autocvar_g_vehicle_racer_bouncepain_z); } - void racer_blowup() { self.deadflag = DEAD_DEAD; self.vehicle_exit(VHEF_NORMAL); - RadiusDamage (self, self, autocvar_g_vehicle_racer_blowup_coredamage, + RadiusDamage (self, self.enemy, autocvar_g_vehicle_racer_blowup_coredamage, autocvar_g_vehicle_racer_blowup_edgedamage, autocvar_g_vehicle_racer_blowup_radius, world, autocvar_g_vehicle_racer_blowup_forceintensity, - DEATH_WAKIBLOWUP, world); + DEATH_VH_WAKI_DEATH, world); - self.nextthink = time + autocvar_g_vehicle_racer_respawntime; - self.think = racer_spawn; + self.alpha = -1; self.movetype = MOVETYPE_NONE; self.effects = EF_NODRAW; - self.colormod = '0 0 0'; self.avelocity = '0 0 0'; self.velocity = '0 0 0'; setorigin(self, self.pos1); - self.think = racer_spawn; - self.nextthink = time + autocvar_g_vehicle_racer_respawntime; + self.touch = func_null; + self.nextthink = 0; } void racer_deadtouch() @@ -580,7 +566,7 @@ void racer_deadtouch() void racer_die() { self.health = 0; - self.event_damage = SUB_Null; + self.event_damage = func_null; self.solid = SOLID_CORPSE; self.takedamage = DAMAGE_NO; self.deadflag = DEAD_DYING; @@ -588,8 +574,8 @@ void racer_die() self.wait = time; self.cnt = 1 + random() * 2; self.touch = racer_deadtouch; - - pointparticles(particleeffectnum("explosion_medium"), self.origin, '0 0 0', 1); + + pointparticles(particleeffectnum("explosion_medium"), self.origin, '0 0 0', 1); if(random() < 0.5) self.avelocity_z = 32; @@ -603,49 +589,55 @@ void racer_die() self.think = racer_blowup; self.nextthink = 2 + time + random() * 3; } - -void racer_dinit() +void racer_spawn(float _spawnflag) { - if not (vehicle_initialize( - "Wakizashi", - "models/vehicles/wakizashi.dpm", - "null", // we need this so tur_head is networked and usable for sounds - "models/vehicles/wakizashi_cockpit.dpm", - "", "", "tag_viewport", - HUD_WAKIZASHI, - 0.5 * RACER_MIN, 0.5 * RACER_MAX, - FALSE, - racer_spawn, autocvar_g_vehicle_racer_respawntime, - racer_frame, - racer_enter, racer_exit, - racer_die, racer_think, - TRUE)) + if(self.scale != 0.5) { - remove(self); - return; + if(autocvar_g_vehicle_racer_hovertype != 0) + racer_force_from_tag = vehicles_force_fromtag_maglev; + else + racer_force_from_tag = vehicles_force_fromtag_hover; + + // 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"); + + self.mass = 900; } - if(autocvar_g_vehicle_racer_hovertype != 0) - racer_force_from_tag = vehicles_force_fromtag_maglev; - else - racer_force_from_tag = vehicles_force_fromtag_hover; + self.think = racer_think; + self.nextthink = time; + self.vehicle_health = autocvar_g_vehicle_racer_health; + self.vehicle_shield = autocvar_g_vehicle_racer_shield; - // 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"); + self.movetype = MOVETYPE_TOSS; + self.solid = SOLID_SLIDEBOX; + self.delay = time; + self.scale = 0.5; - self.mass = 900; + setsize(self, RACER_MIN * 0.5, RACER_MAX * 0.5); + self.bouncefactor = autocvar_g_vehicle_racer_bouncefactor; + self.bouncestop = autocvar_g_vehicle_racer_bouncestop; + self.vehicle_impact = racer_impact; + self.damageforcescale = 0.5; + //self.destvec = autocvar_g_vehicle_racer_bouncepain; } void spawnfunc_vehicle_racer() { + if(!autocvar_g_vehicle_racer) + { + remove(self); + return; + } + self.vehicle_flags |= VHF_DMGSHAKE; self.vehicle_flags |= VHF_DMGROLL; precache_sound ("weapons/lasergun_fire.wav"); precache_sound ("weapons/rocket_fire.wav"); - + precache_sound ("vehicles/racer_idle.wav"); precache_sound ("vehicles/racer_move.wav"); precache_sound ("vehicles/racer_boost.wav"); @@ -654,7 +646,6 @@ void spawnfunc_vehicle_racer() 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) self.vehicle_flags |= VHF_ENERGYREGEN; @@ -668,7 +659,25 @@ void spawnfunc_vehicle_racer() if(autocvar_g_vehicle_racer_health_regen) self.vehicle_flags |= VHF_HEALTHREGEN; - self.think = racer_dinit; - self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); + if(!vehicle_initialize( + "Wakizashi", + "models/vehicles/wakizashi.dpm", + "null", // we need this so tur_head is networked and usable for sounds + "models/vehicles/wakizashi_cockpit.dpm", + "", "", "tag_viewport", + HUD_WAKIZASHI, + 0.5 * RACER_MIN, 0.5 * RACER_MAX, + FALSE, + racer_spawn, autocvar_g_vehicle_racer_respawntime, + racer_frame, + racer_enter, racer_exit, + racer_die, racer_think, + TRUE, + autocvar_g_vehicle_racer_health, + autocvar_g_vehicle_racer_shield)) + { + remove(self); + return; + } } #endif // SVQC