X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fraptor.qc;h=070a0492a3e4e5c79fe795bf3c06b072faf375a9;hb=d5100c3746a5ccb782a159374cab274a524b7448;hp=f1b7e861212bc891740dbc15fad2a093e54465d2;hpb=6e63a9d07ccfc1f6730dfe8860ac4cafa868e3e3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index f1b7e8612..070a0492a 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -1,6 +1,7 @@ +#ifdef SVQC #define RAPTOR_MIN '-80 -80 0' #define RAPTOR_MAX '80 80 70' - +//#define RAPTOR_ENGINE "sound/vehicles/raptor.wav" float autocvar_g_vehicle_raptor_respawntime; float autocvar_g_vehicle_raptor_movestyle; @@ -63,8 +64,6 @@ float raptor_takeoff(); .entity bomb1; .entity bomb2; -//#define RAPTOR_RETARDCAMERA - float raptor_altitude(float amax) { tracebox(self.origin, self.mins, self.maxs, self.origin - ('0 0 1' * amax), TRUE, self); @@ -74,12 +73,10 @@ float raptor_altitude(float amax) void raptor_bomblet_boom() { - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("raptor_bomb_impact"), self.origin, trace_plane_normal * 1000, 1); RadiusDamage (self, self.realowner, autocvar_g_vehicle_raptor_bomblet_damage, autocvar_g_vehicle_raptor_bomblet_edgedamage, autocvar_g_vehicle_raptor_bomblet_radius, world, - autocvar_g_vehicle_raptor_bomblet_force, DEATH_SBROCKET, world); + autocvar_g_vehicle_raptor_bomblet_force, DEATH_RAPTOR_BOMB, world); remove(self); } @@ -98,28 +95,25 @@ void raptor_bomb_burst() if(self.cnt > time) if(autocvar_g_vehicle_raptor_bomblet_alt) { - UpdateCSQCProjectile(self); self.nextthink = time; traceline(self.origin, self.origin + (normalize(self.velocity) * autocvar_g_vehicle_raptor_bomblet_alt), MOVE_NORMAL, self); - if(trace_fraction == 1.0) - return; - - if(vlen(self.origin - self.owner.origin) < autocvar_g_vehicle_raptor_bomblet_radius) + if((trace_fraction == 1.0) || (vlen(self.origin - self.owner.origin) < autocvar_g_vehicle_raptor_bomblet_radius)) + { + UpdateCSQCProjectile(self); return; + } } entity bomblet; float i; - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("rocket_explode"), self.origin, self.velocity, 1); + Damage_DamageInfo(self.origin, 0, 0, 0, '0 0 0', DEATH_RAPTOR_BOMB_SPLIT, self); for(i = 0; i < autocvar_g_vehicle_raptor_bomblets; ++i) { bomblet = spawn(); setorigin(bomblet, self.origin); - //bomblet.solid = SOLID_TRIGGER; bomblet.movetype = MOVETYPE_TOSS; bomblet.touch = raptor_bomblet_touch; bomblet.think = raptor_bomblet_boom; @@ -127,6 +121,7 @@ void raptor_bomb_burst() bomblet.owner = self.owner; bomblet.realowner = self.realowner; bomblet.velocity = normalize(normalize(self.velocity) + (randomvec() * autocvar_g_vehicle_raptor_bomblet_spread)) * vlen(self.velocity); + PROJECTILE_MAKETRIGGER(bomblet); CSQCProjectile(bomblet, TRUE, PROJECTILE_RAPTORBOMBLET, TRUE); } @@ -143,9 +138,6 @@ void raptor_bombdrop() { entity bomb_1, bomb_2; - //self.bomb1.alpha = 0; - //self.bomb2.alpha = 0; - bomb_1 = spawn(); bomb_2 = spawn(); @@ -180,12 +172,12 @@ void raptor_bombdrop() void raptor_fire_cannon(entity gun, string tagname) { entity bolt; - vector b_org; + vector b_org; b_org = gettaginfo(gun, gettagindex(gun, tagname)); - bolt = vehicles_projectile("raptor_cannon_impact", "weapons/laserimpact.wav", "raptor_cannon_muzzleflash", "weapons/lasergun_fire.wav", + bolt = vehicles_projectile("raptor_cannon_muzzleflash", "weapons/lasergun_fire.wav", b_org, normalize(v_forward + randomvec() * autocvar_g_vehicle_raptor_cannon_spread) * autocvar_g_vehicle_raptor_cannon_speed, autocvar_g_vehicle_raptor_cannon_damage, autocvar_g_vehicle_raptor_cannon_radius, autocvar_g_vehicle_raptor_cannon_force, 0, - DEATH_WAKIGUN, PROJECTILE_RAPTORCANNON, 0); + DEATH_RAPTOR_CANNON, PROJECTILE_RAPTORCANNON, 0, TRUE, TRUE); } void raptor_think() @@ -195,22 +187,26 @@ void raptor_think() void raptor_enter() { self.owner.PlayerPhysplug = raptor_takeoff; - self.movetype = MOVETYPE_FLY; - self.solid = SOLID_BBOX; + self.movetype = MOVETYPE_BOUNCEMISSILE; + self.solid = SOLID_SLIDEBOX; self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_raptor_health); self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_raptor_shield); self.velocity_z = 1; // Nudge upwards to takeoff sequense can work. self.tur_head.exteriormodeltoclient = self.owner; -#ifdef RAPTOR_RETARDCAMERA - setorigin(self.vehicle_viewport, self.origin); -#endif + self.delay = time + autocvar_g_vehicle_raptor_bombs_refire; + self.lip = time; + + if(self.owner.flagcarried) + setorigin(self.owner.flagcarried, '-20 0 96'); + } void raptor_land() { - float hgt; + float hgt; + hgt = raptor_altitude(512); self.velocity = (self.velocity * 0.9) + ('0 0 -1800' * (hgt / 256) * sys_frametime); self.angles_x *= 0.95; @@ -234,8 +230,9 @@ void raptor_land() void raptor_exit(float eject) { + vector spot; self.tur_head.exteriormodeltoclient = world; - + if(self.deadflag == DEAD_NO) { self.think = raptor_land; @@ -248,22 +245,34 @@ void raptor_exit(float eject) makevectors(self.angles); if(eject) { - setorigin(self.owner,self.origin + v_forward * 100 + '0 0 64'); + 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 * 200 + '0 0 64'); - + { + spot = self.origin - v_forward * 200 + '0 0 64'; + spot = vehicles_findgoodexit(spot); + setorigin(self.owner , spot); + } + self.owner = world; } float raptor_takeoff() { entity player, raptor; - + player = self; raptor = self.vehicle; self = raptor; + + if(self.sound_nexttime < time) + { + self.sound_nexttime = time + 7.955812; //soundlength("vehicles/raptor_fly.wav"); + sound (self, CHAN_TRIGGER, "vehicles/raptor_speed.wav", VOL_VEHICLEENGINE, ATTN_NORM); + } // Takeoff sequense if(raptor.frame < 25) @@ -279,6 +288,25 @@ float raptor_takeoff() else player.PlayerPhysplug = raptor_frame; + if(self.vehicle_flags & VHF_SHIELDREGEN) + vehicles_regen(dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, frametime); + + if(self.vehicle_flags & VHF_HEALTHREGEN) + vehicles_regen(dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, frametime); + + if(self.vehicle_flags & VHF_ENERGYREGEN) + vehicles_regen(cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, frametime); + + + raptor.bomb1.alpha = raptor.bomb2.alpha = (time - raptor.lip) / (raptor.delay - raptor.lip); + player.vehicle_reload2 = bound(0, raptor.bomb1.alpha * 100, 100); + + VEHICLE_UPDATE_PLAYER(health, raptor); + VEHICLE_UPDATE_PLAYER(energy, raptor); + if(self.vehicle_flags & VHF_HASSHIELD) + VEHICLE_UPDATE_PLAYER(shield, raptor); + + player.BUTTON_ATCK = player.BUTTON_ATCK2 = player.BUTTON_CROUCH = 0; self = player; return 1; } @@ -287,53 +315,50 @@ float raptor_frame() { entity player, raptor; float ftmp, ftmp2; - vector df; + vector df, ra; + + if(intermission_running) + return; player = self; raptor = self.vehicle; self = raptor; - - if(player.BUTTON_USE && raptor.deadflag == DEAD_NO) + + vehicles_painframe(); + /* + ftmp = vlen(self.velocity); + if(ftmp > autocvar_g_vehicle_raptor_speed_forward) + ftmp = 1; + else + ftmp = ftmp / autocvar_g_vehicle_raptor_speed_forward; + */ + + if(self.sound_nexttime < time) + { + self.sound_nexttime = time + 7.955812; + //sound (self.tur_head, CHAN_TRIGGER, "vehicles/raptor_fly.wav", 1 - ftmp, ATTN_NORM ); + sound (self, CHAN_TRIGGER, "vehicles/raptor_speed.wav", 1, ATTN_NORM); + self.wait = ftmp; + } + /* + else if(fabs(ftmp - self.wait) > 0.2) { - self = raptor; - vehicles_exit(VHEF_NORMAL); - self = player; - return 0; + sound (self.tur_head, CHAN_TRIGGER, "", 1 - ftmp, ATTN_NORM ); + sound (self, CHAN_TRIGGER, "", ftmp, ATTN_NORM); + self.wait = ftmp; } + */ + if(raptor.deadflag != DEAD_NO) { self = player; player.BUTTON_ATCK = player.BUTTON_ATCK2 = 0; return 1; } - - - crosshair_trace(player); -#if VEHICLES_VIEWROTATE_CROSSHAIR - 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; - - // Rotate Body - ftmp = autocvar_g_vehicle_raptor_turnspeed * sys_frametime; - ftmp = bound(-ftmp, shortangle_f(df_y - raptor.angles_y, raptor.angles_y), ftmp); - // Turn - //raptor.angles_y = anglemods(raptor.angles_y + ftmp); - raptor.avelocity_y = anglemods(raptor.angles_y + ftmp); - - // Pitch Body - ftmp = autocvar_g_vehicle_raptor_pitchspeed * sys_frametime; - ftmp = bound(-ftmp, shortangle_f(df_x - raptor.angles_x, raptor.angles_x), ftmp); - - //raptor.angles_x = bound(-autocvar_g_vehicle_raptor_pitchlimit, anglemods(raptor.angles_x + ftmp), autocvar_g_vehicle_raptor_pitchlimit); - raptor.avelocity_x = bound(-autocvar_g_vehicle_raptor_pitchlimit, anglemods(raptor.angles_x + ftmp), autocvar_g_vehicle_raptor_pitchlimit); -#else vector vang; vang = raptor.angles; df = vectoangles(normalize(trace_endpos - self.origin + '0 0 32')); @@ -361,27 +386,12 @@ float raptor_frame() raptor.angles_y = anglemods(raptor.angles_y); raptor.angles_z = anglemods(raptor.angles_z); -#endif if(autocvar_g_vehicle_raptor_movestyle == 1) makevectors('0 1 0' * raptor.angles_y); else makevectors(player.v_angle); -#ifdef RAPTOR_RETARDCAMERA - float spd, back, up; - spd = vlen(self.velocity) + 0.01; - back = spd / autocvar_g_vehicle_raptor_speed_forward; - up = 1 - back; - back = back; - back = back * 1250; - back += 150; - up = up * 200; - up = up + 100; - - setorigin(self.vehicle_viewport, self.origin + (v_up * up) + (v_forward * -back)); -#endif - df = raptor.velocity * -autocvar_g_vehicle_raptor_friction; if(player.movement_x != 0) @@ -414,8 +424,9 @@ float raptor_frame() df += v_up * autocvar_g_vehicle_raptor_speed_up; raptor.velocity += df * frametime; + //player.velocity = raptor.velocity; player.velocity = player.movement = raptor.velocity; - setorigin(player,raptor.origin + '0 0 32'); + setorigin(player, raptor.origin + '0 0 32'); vector vf, ad; // Target lock & predict @@ -455,16 +466,24 @@ float raptor_frame() } } + ra = raptor.angles; + ra_z = 0; // Aim the gunz ftmp2 = autocvar_g_vehicle_raptor_cannon_turnspeed * frametime; ftmp = -ftmp2; // Gun1 df = gettaginfo(raptor.gun1, gettagindex(raptor.gun1, "fire1")); - //ad = df; - //vf = v_forward; - df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle - df = shortangle_vxy(df - (raptor.angles + raptor.gun1.angles), raptor.angles + raptor.gun1.angles); // Find aim offset + ad = df; + vf = v_forward; + //if(self.lock_strength == 1) + //{ + df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle + df = shortangle_vxy(df - (ra + raptor.gun1.angles), ra + raptor.gun1.angles); // Find aim offset + //} + //else + // df = '0 0 0'; + // Bind to aimspeed df_x = bound(ftmp, df_x, ftmp2); df_y = bound(ftmp, df_y, ftmp2); @@ -472,14 +491,18 @@ float raptor_frame() raptor.gun1.angles_x = bound(-autocvar_g_vehicle_raptor_cannon_pitchlimit_down, df_x + raptor.gun1.angles_x, autocvar_g_vehicle_raptor_cannon_pitchlimit_up); raptor.gun1.angles_y = bound(-autocvar_g_vehicle_raptor_cannon_turnlimit, df_y + raptor.gun1.angles_y, autocvar_g_vehicle_raptor_cannon_turnlimit); - //df = vectoangles(normalize(trace_endpos - df)); - - //Gun 2 + // Gun2 df = gettaginfo(raptor.gun2, gettagindex(raptor.gun2, "fire1")); - //ad += df; - //vf += v_forward; - df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle - df = shortangle_vxy(df - (raptor.angles + raptor.gun2.angles), raptor.angles + raptor.gun2.angles); // Find aim offset + ad += df; + vf += v_forward; + //if(self.lock_strength == 1) + //{ + df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle + df = shortangle_vxy(df - (ra + raptor.gun2.angles), ra + raptor.gun2.angles); // Find aim offset + //} + //else + // df = '0 0 0'; + // Bind to aimspeed df_x = bound(ftmp, df_x, ftmp2); df_y = bound(ftmp, df_y, ftmp2); @@ -493,7 +516,7 @@ float raptor_frame() traceline(ad, ad + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, raptor); UpdateAuxiliaryXhair(player, trace_endpos, '0 1 0', 0); */ - + if(player.BUTTON_ATCK) if(raptor.attack_finished_single <= time) if(raptor.vehicle_energy > autocvar_g_vehicle_raptor_cannon_cost) @@ -532,16 +555,14 @@ float raptor_frame() raptor.lip = time; } - player.vehicle_reload1 = (time - raptor.lip) / (raptor.delay - raptor.lip); - raptor.bomb1.alpha = raptor.bomb2.alpha = player.vehicle_reload1; + raptor.bomb1.alpha = raptor.bomb2.alpha = (time - raptor.lip) / (raptor.delay - raptor.lip); + player.vehicle_reload2 = bound(0, raptor.bomb1.alpha * 100, 100); VEHICLE_UPDATE_PLAYER(health, raptor); VEHICLE_UPDATE_PLAYER(energy, raptor); if(self.vehicle_flags & VHF_HASSHIELD) VEHICLE_UPDATE_PLAYER(shield, raptor); - - player.BUTTON_ATCK = player.BUTTON_ATCK2 = player.BUTTON_CROUCH = 0; return 1; } @@ -549,7 +570,7 @@ float raptor_frame() void raptor_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); @@ -564,6 +585,20 @@ void raptor_blowup() setorigin(self, self.pos1); self.touch = SUB_Null; + self.nextthink = 0; +} + +void raptor_diethink() +{ + //self.avelocity += '0 0.5 1' * (random() * 5); + //self.avelocity -= '0 0.5 1' * (random() * 5); + + if(random() < 0.1) + { + sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); + pointparticles(particleeffectnum("explosion_small"), randomvec() * 80 + (self.origin + '0 0 100'), '0 0 0', 1); + } + self.nextthink = time + 0.1; } void raptor_die() @@ -575,15 +610,15 @@ void raptor_die() self.takedamage = DAMAGE_NO; self.deadflag = DEAD_DYING; self.movetype = MOVETYPE_BOUNCE; + self.think = raptor_diethink; + self.nextthink = time; + + pointparticles(particleeffectnum("explosion_medium"), findbetterlocation (self.origin, 16), '0 0 0', 1); - pointparticles(particleeffectnum("rocket_explode"), findbetterlocation (self.origin, 16), '0 0 0', 1); - - self.velocity_z += 128; + self.velocity_z += 600; - if(random() < 0.5) - self.avelocity_z = 45 + random() * 270; - else - self.avelocity_z = -45 + random() * -270; + self.avelocity = '0 0.5 1' * (random() * 400); + self.avelocity -= '0 0.5 1' * (random() * 400); self.colormod = '-0.5 -0.5 -0.5'; self.touch = raptor_blowup; @@ -595,7 +630,7 @@ void raptor_spawn() self.vehicle_health = autocvar_g_vehicle_raptor_health; self.vehicle_shield = autocvar_g_vehicle_raptor_shield; self.movetype = MOVETYPE_TOSS; - self.solid = SOLID_BBOX; + self.solid = SOLID_SLIDEBOX; self.vehicle_energy = 1; self.bomb1.gun1.avelocity_y = 90; @@ -605,6 +640,15 @@ void raptor_spawn() self.delay = time; } +// If we dont do this ever now and then, the raptors rotors +// stop working, presumably due to angle overflow. cute. +void raptor_rotor_anglefix() +{ + self.gun1.angles_y = anglemods(self.gun1.angles_y); + self.gun2.angles_y = anglemods(self.gun2.angles_y); + self.nextthink = time + 15; +} + void raptor_dinit() { entity spinner; @@ -622,7 +666,8 @@ void raptor_dinit() raptor_spawn, autocvar_g_vehicle_raptor_respawntime, raptor_frame, raptor_enter, raptor_exit, - raptor_die, raptor_think)) + raptor_die, raptor_think, + FALSE)) { remove(self); return; @@ -637,10 +682,6 @@ void raptor_dinit() self.bomb2 = spawn(); self.gun1 = spawn(); self.gun2 = spawn(); - -#ifdef RAPTOR_RETARDCAMERA - setattachment(self.vehicle_viewport, world, ""); -#endif setmodel(self.bomb1,"models/vehicles/clusterbomb_folded.md3"); setmodel(self.bomb2,"models/vehicles/clusterbomb_folded.md3"); @@ -688,6 +729,10 @@ void raptor_dinit() spinner.avelocity = '0 -90 0'; self.bomb1.gun2 = spinner; + // Sigh. + self.bomb1.think = raptor_rotor_anglefix; + self.bomb1.nextthink = time; + self.mass = 1 ; } @@ -695,6 +740,9 @@ void spawnfunc_vehicle_raptor() { vehicles_configcheck("vehicle_raptor.cfg", autocvar_g_vehicle_raptor_health); + self.vehicle_flags |= VHF_DMGSHAKE; + self.vehicle_flags |= VHF_DMGROLL; + if(autocvar_g_vehicle_raptor_shield) self.vehicle_flags |= VHF_HASSHIELD; @@ -714,7 +762,12 @@ void spawnfunc_vehicle_raptor() precache_model ("models/vehicles/clusterbomb.md3"); precache_model ("models/vehicles/clusterbomb_folded.md3"); precache_model ("models/vehicles/raptor_body.dpm"); - + + precache_sound ("vehicles/raptor_fly.wav"); + precache_sound ("vehicles/raptor_speed.wav"); + precache_sound (""); + self.think = raptor_dinit; - self.nextthink = time + 1; + self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } +#endif // SVQC