X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fraptor.qc;h=201c186c37947d65ad983efd0b4c67c1f0484120;hb=b5a593d8425521092f05949c4143d86a25d49f4c;hp=c7c384f19d2416d8a3d66c224f408bd788c2a419;hpb=5d52c072c813531ae457775700a505a28e58304d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index c7c384f19..201c186c3 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -1,7 +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; @@ -64,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); @@ -109,9 +107,6 @@ void raptor_bomb_burst() entity bomblet; float i; - //sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - //pointparticles(particleeffectnum("raptor_bomb_spread"), 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) @@ -134,18 +129,10 @@ void raptor_bomb_burst() remove(self); } -void raptor_bomb_touch() -{ - raptor_bomb_burst(); -} - void raptor_bombdrop() { entity bomb_1, bomb_2; - //self.bomb1.alpha = 0; - //self.bomb2.alpha = 0; - bomb_1 = spawn(); bomb_2 = spawn(); @@ -154,7 +141,7 @@ void raptor_bombdrop() bomb_1.movetype = bomb_2.movetype = MOVETYPE_BOUNCE; bomb_1.velocity = bomb_2.velocity = self.velocity; - bomb_1.touch = bomb_2.touch = raptor_bomb_touch; + bomb_1.touch = bomb_2.touch = raptor_bomb_burst; bomb_1.think = bomb_2.think = raptor_bomb_burst; bomb_1.cnt = bomb_2.cnt = time + 10; @@ -173,17 +160,13 @@ void raptor_bombdrop() CSQCProjectile(bomb_1, TRUE, PROJECTILE_RAPTORBOMB, TRUE); CSQCProjectile(bomb_2, TRUE, PROJECTILE_RAPTORBOMB, TRUE); - } void raptor_fire_cannon(entity gun, string tagname) { - entity bolt; - vector b_org; - b_org = gettaginfo(gun, gettagindex(gun, tagname)); - 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, + vehicles_projectile("raptor_cannon_muzzleflash", "weapons/lasergun_fire.wav", + gettaginfo(gun, gettagindex(gun, tagname)), 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_RAPTOR_CANNON, PROJECTILE_RAPTORCANNON, 0, TRUE, TRUE); } @@ -205,15 +188,16 @@ void raptor_enter() self.delay = time + autocvar_g_vehicle_raptor_bombs_refire; self.lip = time; -#ifdef RAPTOR_RETARDCAMERA - setorigin(self.vehicle_viewport, self.origin); -#endif + 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; @@ -237,6 +221,7 @@ void raptor_land() void raptor_exit(float eject) { + vector spot; self.tur_head.exteriormodeltoclient = world; if(self.deadflag == DEAD_NO) @@ -251,12 +236,18 @@ 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; } @@ -267,11 +258,10 @@ float raptor_takeoff() 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_VOICE, "vehicles/raptor_fly.wav", VOL_BASE, ATTN_NORM); + sound (self, CH_TRIGGER_SINGLE, "vehicles/raptor_speed.wav", VOL_VEHICLEENGINE, ATTN_NORM); } // Takeoff sequense @@ -315,34 +305,39 @@ float raptor_frame() { entity player, raptor; float ftmp, ftmp2; - vector df, ra; + vector df; + + if(intermission_running) + return 1; player = self; raptor = self.vehicle; self = raptor; - + 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(fabs(ftmp - self.wait) > 0.2 || self.sound_nexttime < time) + */ + + if(self.sound_nexttime < time) { - self.sound_nexttime = time + 7.955812; //soundlength("vehicles/raptor_fly.wav"); - sound (self, CHAN_VOICE, "vehicles/raptor_fly.wav", 1 - ftmp, ATTN_NORM ); - sound (self, CHAN_PLAYER, "vehicles/raptor_speed.wav", ftmp, ATTN_NORM); + self.sound_nexttime = time + 7.955812; + //sound (self.tur_head, CH_TRIGGER_SINGLE, "vehicles/raptor_fly.wav", 1 - ftmp, ATTN_NORM ); + sound (self, CH_TRIGGER_SINGLE, "vehicles/raptor_speed.wav", 1, ATTN_NORM); self.wait = ftmp; - } - - if(player.BUTTON_USE && raptor.deadflag == DEAD_NO) + } + /* + else if(fabs(ftmp - self.wait) > 0.2) { - self = raptor; - vehicles_exit(VHEF_NORMAL); - self = player; - return 0; + sound (self.tur_head, CH_TRIGGER_SINGLE, "", 1 - ftmp, ATTN_NORM ); + sound (self, CH_TRIGGER_SINGLE, "", ftmp, ATTN_NORM); + self.wait = ftmp; } - + */ + if(raptor.deadflag != DEAD_NO) { self = player; @@ -351,28 +346,6 @@ float raptor_frame() } 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')); @@ -400,27 +373,11 @@ 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) @@ -453,9 +410,8 @@ float raptor_frame() df += v_up * autocvar_g_vehicle_raptor_speed_up; raptor.velocity += df * frametime; - //player.velocity = player.movement = raptor.velocity; - player.velocity = raptor.velocity; - //setorigin(player,raptor.origin + '0 0 32'); + player.velocity = player.movement = raptor.velocity; + setorigin(player, raptor.origin + '0 0 32'); vector vf, ad; // Target lock & predict @@ -481,7 +437,6 @@ float raptor_frame() ad = vf + raptor.lock_target.velocity * impact_time; } trace_endpos = ad; - //UpdateAuxiliaryXhair(player, trace_endpos, '1 1 1', 0); } if(self.lock_target) @@ -495,8 +450,6 @@ float raptor_frame() } } - ra = raptor.angles; - ra_z = 0; // Aim the gunz ftmp2 = autocvar_g_vehicle_raptor_cannon_turnspeed * frametime; ftmp = -ftmp2; @@ -505,8 +458,10 @@ float raptor_frame() 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 - (ra + raptor.gun1.angles), ra + raptor.gun1.angles); // Find aim offset + df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle + df = AnglesTransform_ToAngles(AnglesTransform_LeftDivide(AnglesTransform_FromAngles(raptor.angles), AnglesTransform_FromAngles(df))) - raptor.gun1.angles; + df = shortangle_vxy(df, raptor.gun1.angles); + // Bind to aimspeed df_x = bound(ftmp, df_x, ftmp2); df_y = bound(ftmp, df_y, ftmp2); @@ -514,14 +469,14 @@ 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 - (ra + raptor.gun2.angles), ra + raptor.gun2.angles); // Find aim offset + df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle + df = AnglesTransform_ToAngles(AnglesTransform_LeftDivide(AnglesTransform_FromAngles(raptor.angles), AnglesTransform_FromAngles(df))) - raptor.gun2.angles; + df = shortangle_vxy(df, raptor.gun2.angles); + // Bind to aimspeed df_x = bound(ftmp, df_x, ftmp2); df_y = bound(ftmp, df_y, ftmp2); @@ -535,7 +490,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) @@ -588,9 +543,6 @@ 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); - self.deadflag = DEAD_DEAD; self.vehicle_exit(VHEF_NORMAL); RadiusDamage (self, self, 250, 15, 250, world, 250, DEATH_WAKIBLOWUP, world); @@ -604,26 +556,36 @@ void raptor_blowup() setorigin(self, self.pos1); self.touch = SUB_Null; + self.nextthink = 0; +} + +void raptor_diethink() +{ + if(random() < 0.1) + { + sound (self, CH_SHOTS, "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() { 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.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 += 600; - self.velocity_z += 128; - - 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; @@ -688,10 +650,6 @@ void raptor_dinit() 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"); setmodel(self.gun1, "models/vehicles/raptor_gun.dpm"); @@ -748,9 +706,10 @@ void raptor_dinit() 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; @@ -767,35 +726,18 @@ void spawnfunc_vehicle_raptor() precache_model ("models/vehicles/raptor_gun.dpm"); precache_model ("models/vehicles/spinner.dpm"); precache_model ("models/vehicles/raptor_cockpit.dpm"); - precache_model ("models/vehicles/clusterbomb.md3"); + //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"); self.think = raptor_dinit; - self.nextthink = time + 1; + + if(g_assault) + self.nextthink = time + 0.5; + else + self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); } #endif // SVQC - -#ifdef CSQC -void raptor_draw() -{ - -} - -void raptor_draw2d() -{ - -} - -void raptor_read_extra() -{ - -} - -void vehicle_raptor_assemble() -{ - -} -#endif //CSQC