]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/vehicles/raptor.qc
Merge remote branch 'origin/master' into tzork/vehicles-2
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / vehicles / raptor.qc
index c700050ca5f98017a4642cad46f0517c438138fb..6d12066183e8fb2db84e6bd70ee1338e36e33ad8 100644 (file)
@@ -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)
@@ -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();
 
@@ -205,9 +197,6 @@ 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
 }
 
 void raptor_land()
@@ -278,7 +267,7 @@ float raptor_takeoff()
     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, CHAN_TRIGGER, "vehicles/raptor_speed.wav", VOL_VEHICLEENGINE, ATTN_NORM);
     }   
 
     // Takeoff sequense
@@ -327,20 +316,30 @@ float raptor_frame()
     player = self;
     raptor = self.vehicle;
     self   = raptor;
-    
+        
+    /*
     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, 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)
+    {
+        sound (self.tur_head, CHAN_TRIGGER, "", 1 - ftmp,   ATTN_NORM );
+        sound (self, CHAN_TRIGGER, "", ftmp, ATTN_NORM);        
         self.wait = ftmp;
-    }    
+    }
+    */
     
     if(player.BUTTON_USE && raptor.deadflag == DEAD_NO)
     {
@@ -358,28 +357,7 @@ 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'));
@@ -407,27 +385,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)
@@ -460,9 +423,9 @@ 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 = raptor.velocity;
+    player.velocity = player.movement  = raptor.velocity;
+    setorigin(player, raptor.origin + '0 0 32');
 
     vector vf, ad;
     // Target lock & predict
@@ -510,10 +473,16 @@ float raptor_frame()
 
     // 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 - (ra + raptor.gun1.angles), ra + 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);
@@ -521,14 +490,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 - (ra + raptor.gun2.angles), ra + 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);
@@ -542,7 +515,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)
@@ -709,10 +682,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");
@@ -770,8 +739,6 @@ void spawnfunc_vehicle_raptor()
 {
     vehicles_configcheck("vehicle_raptor.cfg", autocvar_g_vehicle_raptor_health);
     
-    
-
     if(autocvar_g_vehicle_raptor_shield)
         self.vehicle_flags |= VHF_HASSHIELD;
 
@@ -791,32 +758,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
-
-#ifdef CSQC
-void raptor_draw()
-{
-
-}
-
-void raptor_draw2d()
-{
-
-}
-
-void raptor_read_extra()
-{
-
-}
-
-void vehicle_raptor_assemble()
-{
-
-}
-#endif //CSQC