]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/vehicles/racer.qc
Better death effects
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / vehicles / racer.qc
index 1efc4fe7b4c4e2bc42c27a1923019e53dad57022..2d74316af5028ee3ed29d75c66578b25bd288539 100644 (file)
@@ -1,7 +1,8 @@
 #define RACER_MIN '-120 -120 -40'
 #define RACER_MAX '120 120 40'
-#define RACER_TICRATE 0.05
+#define RACER_ENGINE "sound/vehicles/racer.wav"
 
+#ifdef SVQC
 void racer_exit(float eject);
 void racer_enter();
 
@@ -60,7 +61,6 @@ float autocvar_g_vehicle_racer_rocket_locked_time;
 float autocvar_g_vehicle_racer_rocket_locked_maxangle;
 
 float autocvar_g_vehicle_racer_respawntime;
-float autocvar_g_vehicle_racer_collision_multiplier;
 
 float autocvar_g_vehicle_racer_blowup_radius;
 float autocvar_g_vehicle_racer_blowup_coredamage;
@@ -262,6 +262,18 @@ float racer_frame()
     player.BUTTON_ZOOM = player.BUTTON_CROUCH = 0;
 
     self = racer;
+    
+#ifdef VEHICLES_CSQC
+    racer.SendFlags |= VSF_MOVEMENT;
+
+    // Send a origin update every 10'th serevr frame.
+    racer.framecounter += 1;
+    if(racer.framecounter >= 600)
+    {
+        racer.SendFlags |= VSF_ORIGIN;
+        racer.framecounter = 0;
+    }
+#endif
 
     if(player.BUTTON_USE)
     {
@@ -337,7 +349,7 @@ float racer_frame()
     ftmp = racer.velocity_z;
     df = racer.velocity * -autocvar_g_vehicle_racer_friction;
     racer.velocity_z = ftmp;
-    
+
     if(player.movement_x != 0)
     {
         if(player.movement_x > 0)
@@ -353,16 +365,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_VOICE, "vehicles/racer_move.wav", VOL_BASE, 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_VOICE, "vehicles/racer_idle.wav", VOL_BASE, 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_PLAYER, "vehicles/racer_boost.wav", VOL_BASE, ATTN_NORM);
+        }        
+    }
+    else
+    {
+        self.strength_finished = 0;
+        sound (self, CHAN_PLAYER, "misc/null.wav", VOL_BASE, ATTN_NORM);
     }
+        
 
     racer.velocity  += df * frametime;
 
@@ -389,7 +431,7 @@ 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;
+        //self.owner.vehicle_energy = racer.vehicle_energy / autocvar_g_vehicle_racer_energy;
     }
 
     if(autocvar_g_vehicle_racer_rocket_locktarget)
@@ -427,7 +469,7 @@ float racer_frame()
             racer.lip = time;
         }
     }
-    player.vehicle_reload1 = (time - racer.lip) / (racer.delay - racer.lip);
+    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);
@@ -440,6 +482,7 @@ float racer_frame()
 
 
     VEHICLE_UPDATE_PLAYER(health, racer);
+    VEHICLE_UPDATE_PLAYER(energy, racer);
 
     if(self.vehicle_flags & VHF_HASSHIELD)
         VEHICLE_UPDATE_PLAYER(shield, racer);
@@ -466,7 +509,17 @@ void racer_think()
     */
 
     racer_align4point(); //time - self.nextthink);
+#ifdef VEHICLES_CSQC
+    self.SendFlags |= VSF_MOVEMENT;
 
+    // Send a origin update every 10'th serevr frame.
+    self.framecounter += 1;
+    if(self.framecounter >= 10)
+    {
+        self.SendFlags |= VSF_ORIGIN;
+        self.framecounter = 0;
+    }
+#endif
     /*
     //if(self.velocity_z > 0)
     //    self.velocity_z *= 0.95;
@@ -480,7 +533,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 +541,16 @@ 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);
+#ifdef VEHICLES_CSQC
+    if(self.SendEntity)
+        self.SendFlags |= VSF_SETUP;
+#endif
 }
 
 void racer_exit(float eject)
 {
+    vector spot;
+    
     self.think      = racer_think;
     self.nextthink  = time;
     self.movetype   = MOVETYPE_TOSS;
@@ -502,14 +561,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 +595,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 +623,7 @@ void racer_blowup()
 
 void racer_deadtouch()
 {
+    dprint("Boink!\n");
     self.avelocity_x *= 0.7;
     self.cnt -= 1;
     if(self.cnt <= 0)
@@ -576,15 +640,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,6 +658,13 @@ 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(
@@ -608,12 +679,15 @@ void racer_dinit()
              racer_spawn, autocvar_g_vehicle_racer_respawntime,
              racer_frame,
              racer_enter, racer_exit,
-             racer_die,   racer_think))
+             racer_die,   racer_think,
+             TRUE))
     {
         remove(self);
         return;
     }
-
+#ifdef VEHICLES_CSQC
+    self.vehile_send_exta = racer_send_exta;
+#endif
     if(autocvar_g_vehicle_racer_hovertype != 0)
         racer_force_from_tag = vehicles_force_fromtag_maglev;
     else
@@ -634,6 +708,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");
@@ -656,3 +734,75 @@ void spawnfunc_vehicle_racer()
     self.think = racer_dinit;
     self.nextthink = time + 1;
 }
+
+#endif // SVQC
+
+#ifdef CSQC
+#ifdef VEHICLES_CSQC
+void racer_draw()
+{
+    /*float dt;
+
+    dt = time - self.lastupdate;
+    self.lastupdate = time;
+    if(dt < 0)
+        return;
+    */
+    //self.origin += dt * self.velocity;
+    //self.origin_z -= dt * getstatf(STAT_MOVEVARS_GRAVITY);
+    //setorigin(self, self.origin);
+
+    if(vehicle_hudmodel.owner  == self)
+    {
+        setorigin(vehicle_hudmodel, self.origin);
+        vehicle_hudmodel.angles = self.angles;
+    }
+
+
+}
+
+void racer_draw2d()
+{
+
+}
+
+void racer_read_extra()
+{
+
+}
+
+entity racer_hud;
+entity racer_vp;
+void racer_hud_draw()
+{
+
+}
+
+void vehicle_racer_assemble()
+{
+    setmodel(self, "models/vehicles/wakizashi.dpm");
+    self.scale = 0.5;
+    self.movetype = MOVETYPE_BOUNCE;
+
+    //self.entremove = VehicleRacerRemove;
+    setsize(self,  '-60 -60 -20', '60 60 20');
+    self.draw = racer_draw;
+    self.drawmask = MASK_NORMAL;
+    self.solid = SOLID_BBOX;
+    self.lastupdate = time;
+    self.vehile_read_exta = racer_read_extra;
+
+    if(racer_hud == world)
+    {
+        dprint("SpawnHUUUOOOUUUDDD\n");
+        racer_hud = spawn();
+        setmodel(racer_hud, "models/vehicles/wakizashi_cockpit.dpm");
+        racer_hud.drawmask = MASK_NORMAL;
+        racer_hud.renderflags = RF_VIEWMODEL;
+        racer_hud.scale = 0.5;
+    }
+    vehicle_hudmodel = racer_hud; // FIXME!!
+    racer_hud.draw   = racer_hud_draw;
+}
+#endif
+#endif //CSQC