]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/vehicles/racer.qc
Attach flagcarries flag to vehicle, scale up and position flag when carried by vehicle
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / vehicles / racer.qc
index 7ab8ef119373b34a82bd7fb7202fdd57b3d0b50d..f62925f299b659efdc671b89a7bc28f607477335 100644 (file)
@@ -1,5 +1,6 @@
 #define RACER_MIN '-120 -120 -40'
 #define RACER_MAX '120 120 40'
+#define RACER_ENGINE "sound/vehicles/racer.wav"
 
 #ifdef SVQC
 void racer_exit(float eject);
@@ -262,13 +263,15 @@ float racer_frame()
 
     self = racer;
 
+    /*
     if(player.BUTTON_USE)
     {
         vehicles_exit(VHEF_NORMAL);
         self = player;
         return 0;
     }
-
+    */
+    
     if(racer.deadflag != DEAD_NO)
     {
         self = player;
@@ -280,40 +283,6 @@ float racer_frame()
 
     crosshair_trace(player);
 
-#if VEHICLES_VIEWROTATE_CROSSHAIR
-    float ftmp2;
-    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 * 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 * 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);
-
-    makevectors(racer.angles);
-    racer.angles_x *= -1;
-#else
     racer.angles_x *= -1;
 
     // Yaw
@@ -331,7 +300,7 @@ float racer_frame()
 
     makevectors(racer.angles);
     racer.angles_x *= -1;
-#endif
+
 
     ftmp = racer.velocity_z;
     df = racer.velocity * -autocvar_g_vehicle_racer_friction;
@@ -352,16 +321,46 @@ float racer_frame()
         else if(player.movement_y > 0)
             df += v_right * autocvar_g_vehicle_racer_speed_strafe;
     }
-
+    
+    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))
     {
         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.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;
 
@@ -412,7 +411,7 @@ float racer_frame()
     if(player.BUTTON_ATCK2)
     {
         self.misc_bulletcounter += 1;
-        racer.delay = time + 0.2;
+        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)
@@ -480,7 +479,7 @@ void racer_think()
     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; // + 0.05;
 }
 
 void racer_enter()
@@ -488,10 +487,15 @@ 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_exit(float eject)
 {
+    vector spot;
+    
     self.think      = racer_think;
     self.nextthink  = time;
     self.movetype   = MOVETYPE_TOSS;
@@ -502,14 +506,18 @@ void racer_exit(float eject)
        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;
 }
 
@@ -532,7 +540,7 @@ void racer_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);
+    pointparticles(particleeffectnum("explosion_big"), self.origin, '0 0 0', 1);
 
     self.deadflag    = DEAD_DEAD;
     self.vehicle_exit(VHEF_NORMAL);
@@ -560,6 +568,7 @@ void racer_blowup()
 
 void racer_deadtouch()
 {
+    dprint("Boink!\n");
     self.avelocity_x *= 0.7;
     self.cnt -= 1;
     if(self.cnt <= 0)
@@ -576,15 +585,15 @@ void racer_die()
     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);
+    
+    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.velocity   += '0 0 700';
@@ -594,13 +603,6 @@ void racer_die()
        self.nextthink = 2 + time + random() * 3;
 }
 
-#ifdef VEHICLES_CSQC
-void racer_send_exta(entity to)
-{
-
-}
-#endif
-
 void racer_dinit()
 {
     if not (vehicle_initialize(
@@ -616,7 +618,7 @@ void racer_dinit()
              racer_frame,
              racer_enter, racer_exit,
              racer_die,   racer_think,
-             FALSE))
+             TRUE))
     {
         remove(self);
         return;
@@ -642,6 +644,10 @@ void spawnfunc_vehicle_racer()
     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");
@@ -662,29 +668,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
-
-#ifdef CSQC
-void racer_draw()
-{
-
-}
-
-void racer_draw2d()
-{
-
-}
-
-void racer_read_extra()
-{
-
-}
-
-void vehicle_racer_assemble()
-{
-
-}
-#endif //CSQC