]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/vehicles/unit/racer.qc
Merge new vehicle stuff from combined updates
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / unit / racer.qc
index 042e77e15e64519a1e98ffaae4bc4b56e1c8f2aa..fbcb5397025e53b8639c21f3eade0dee6fd0d0e1 100644 (file)
@@ -12,18 +12,23 @@ REGISTER_VEHICLE(
 /* fullname   */ _("Racer")
 );
 #else
-
-#define RSM_FIRST 1
-#define RSM_BOMB 1
-#define RSM_FLARE 2
-#define RSM_LAST 2
-
 #ifdef SVQC
-float autocvar_g_vehicle_racer;
+bool autocvar_g_vehicle_racer;
 
 float autocvar_g_vehicle_racer_speed_afterburn;
 float autocvar_g_vehicle_racer_afterburn_cost;
 
+float autocvar_g_vehicle_racer_waterburn_cost;
+float autocvar_g_vehicle_racer_waterburn_speed;
+
+float autocvar_g_vehicle_racer_water_speed_forward;
+float autocvar_g_vehicle_racer_water_speed_strafe;
+
+float autocvar_g_vehicle_racer_pitchlimit = 30;
+
+float autocvar_g_vehicle_racer_water_downforce = 0.03;
+float autocvar_g_vehicle_racer_water_upforcedamper = 15;
+
 float autocvar_g_vehicle_racer_anglestabilizer;
 float autocvar_g_vehicle_racer_downforce;
 
@@ -33,6 +38,8 @@ float autocvar_g_vehicle_racer_springlength;
 float autocvar_g_vehicle_racer_upforcedamper;
 float autocvar_g_vehicle_racer_friction;
 
+float autocvar_g_vehicle_racer_water_time = 5;
+
 float autocvar_g_vehicle_racer_hovertype;
 float autocvar_g_vehicle_racer_hoverpower;
 
@@ -86,6 +93,8 @@ float autocvar_g_vehicle_racer_bouncefactor;
 float autocvar_g_vehicle_racer_bouncestop;
 vector autocvar_g_vehicle_racer_bouncepain;
 
+.float racer_watertime;
+
 var vector racer_force_from_tag(string tag_name, float spring_length, float max_power);
 
 void racer_align4point(float _delta)
@@ -109,11 +118,25 @@ void racer_align4point(float _delta)
        bl_push   = force_fromtag_normpower;
        //vehicles_sweap_collision(force_fromtag_origin, self.velocity, _delta, v_add, autocvar_g_vehicle_racer_collision_multiplier);
 
-   self.velocity += push_vector * _delta;
+       self.velocity += push_vector * _delta;
+
+       float uforce = autocvar_g_vehicle_racer_upforcedamper;
+       
+       int cont = pointcontents(self.origin - '0 0 64');
+       if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
+       {
+               uforce = autocvar_g_vehicle_racer_water_upforcedamper;
+
+               if(self.owner.BUTTON_CROUCH && time < self.air_finished)
+                       self.velocity_z += 30;
+               else
+                       self.velocity_z += 200;
+       }
+       
 
        // Anti ocilation
        if(self.velocity_z > 0)
-               self.velocity_z *= 1 - autocvar_g_vehicle_racer_upforcedamper * _delta;
+               self.velocity_z *= 1 - uforce * _delta;
 
        push_vector_x =  (fl_push - bl_push);
        push_vector_x += (fr_push - br_push);
@@ -141,7 +164,7 @@ void racer_fire_cannon(string tagname)
        bolt = vehicles_projectile("wakizashi_gun_muzzleflash", "weapons/lasergun_fire.wav",
                                                   v, normalize(v_forward + randomvec() * autocvar_g_vehicle_racer_cannon_spread) * autocvar_g_vehicle_racer_cannon_speed,
                                                   autocvar_g_vehicle_racer_cannon_damage, autocvar_g_vehicle_racer_cannon_radius, autocvar_g_vehicle_racer_cannon_force,  0,
-                                                  DEATH_VH_WAKI_GUN, PROJECTILE_WAKICANNON, 0, TRUE, TRUE, self.owner);
+                                                  DEATH_VH_WAKI_GUN, PROJECTILE_WAKICANNON, 0, true, true, self.owner);
 
        // Fix z-aim (for chase mode)
        v = normalize(trace_endpos - bolt.origin);
@@ -192,6 +215,10 @@ void racer_rocket_groundhugger()
                self.velocity = olddir * newvel;
                self.velocity_z -= 1600 * sys_frametime; // 2x grav looks better for this one
        }
+       
+       int cont = pointcontents(self.origin - '0 0 32');
+       if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
+               self.velocity_z += 200;
 
        UpdateCSQCProjectile(self);
        return;
@@ -255,7 +282,7 @@ void racer_fire_rocket(string tagname, entity trg)
        entity rocket = rocket = vehicles_projectile("wakizashi_rocket_launch", "weapons/rocket_fire.wav",
                                                   v, v_forward * autocvar_g_vehicle_racer_rocket_speed,
                                                   autocvar_g_vehicle_racer_rocket_damage, autocvar_g_vehicle_racer_rocket_radius, autocvar_g_vehicle_racer_rocket_force, 3,
-                                                  DEATH_VH_WAKI_ROCKET, PROJECTILE_WAKIROCKET, 20, FALSE, FALSE, self.owner);
+                                                  DEATH_VH_WAKI_ROCKET, PROJECTILE_WAKIROCKET, 20, false, false, self.owner);
 
        rocket.lip                        = autocvar_g_vehicle_racer_rocket_accel * sys_frametime;
        rocket.wait                      = autocvar_g_vehicle_racer_rocket_turnrate;
@@ -276,16 +303,21 @@ float racer_frame()
        float ftmp;
 
        if(intermission_running)
+       {
+               self.vehicle.velocity = '0 0 0';
+               self.vehicle.avelocity = '0 0 0';
                return 1;
+       }
 
        player  = self;
        racer   = self.vehicle;
        self    = racer;
 
-       player.BUTTON_ZOOM = player.BUTTON_CROUCH = 0;
-
        vehicles_painframe();
 
+       if(pointcontents(racer.origin) != CONTENT_WATER)
+               racer.air_finished = time + autocvar_g_vehicle_racer_water_time;
+
        if(racer.deadflag != DEAD_NO)
        {
                self = player;
@@ -295,6 +327,8 @@ float racer_frame()
 
        racer_align4point(frametime);
 
+       player.BUTTON_ZOOM = player.BUTTON_CROUCH = 0;
+
        crosshair_trace(player);
 
        racer.angles_x *= -1;
@@ -310,7 +344,7 @@ float racer_frame()
        // Pitch
        ftmp = autocvar_g_vehicle_racer_pitchspeed  * frametime;
        ftmp = bound(-ftmp, shortangle_f(player.v_angle_x - racer.angles_x, racer.angles_x), ftmp);
-       racer.angles_x = bound(-30, anglemods(racer.angles_x + ftmp), 30);
+       racer.angles_x = bound(-autocvar_g_vehicle_racer_pitchlimit, anglemods(racer.angles_x + ftmp), autocvar_g_vehicle_racer_pitchlimit);
 
        makevectors(racer.angles);
        racer.angles_x *= -1;
@@ -319,13 +353,19 @@ float racer_frame()
        df = racer.velocity * -autocvar_g_vehicle_racer_friction;
        //racer.velocity_z = ftmp;
 
+       int cont = pointcontents(racer.origin);
        if(vlen(player.movement) != 0)
        {
-               if(player.movement_x)
-                       df += v_forward * ((player.movement_x > 0) ? autocvar_g_vehicle_racer_speed_forward : -autocvar_g_vehicle_racer_speed_forward);
-
-               if(player.movement_y)
-                       df += v_right * ((player.movement_y > 0) ? autocvar_g_vehicle_racer_speed_strafe : -autocvar_g_vehicle_racer_speed_strafe);
+               if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
+               {
+                       if(player.movement_x) { df += v_forward * ((player.movement_x > 0) ? autocvar_g_vehicle_racer_water_speed_forward : -autocvar_g_vehicle_racer_water_speed_forward); }
+                       if(player.movement_y) { df += v_right * ((player.movement_y > 0) ? autocvar_g_vehicle_racer_water_speed_strafe : -autocvar_g_vehicle_racer_water_speed_strafe); }
+               }
+               else
+               {
+                       if(player.movement_x) { df += v_forward * ((player.movement_x > 0) ? autocvar_g_vehicle_racer_speed_forward : -autocvar_g_vehicle_racer_speed_forward); }
+                       if(player.movement_y) { df += v_right * ((player.movement_y > 0) ? autocvar_g_vehicle_racer_speed_strafe : -autocvar_g_vehicle_racer_speed_strafe); }
+               }
 
                if(self.sound_nexttime < time || self.sounds != 1)
                {
@@ -351,8 +391,17 @@ float racer_frame()
                        pointparticles(particleeffectnum("wakizashi_booster_smoke"), self.origin - v_forward * 32, v_forward  * vlen(self.velocity), 1);
 
                racer.wait = time;
-               racer.vehicle_energy -= autocvar_g_vehicle_racer_afterburn_cost * frametime;
-               df += (v_forward * autocvar_g_vehicle_racer_speed_afterburn);
+
+               if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
+               {
+                       racer.vehicle_energy -= autocvar_g_vehicle_racer_waterburn_cost * frametime;
+                       df += (v_forward * autocvar_g_vehicle_racer_waterburn_speed);
+               }
+               else
+               {
+                       racer.vehicle_energy -= autocvar_g_vehicle_racer_afterburn_cost * frametime;
+                       df += (v_forward * autocvar_g_vehicle_racer_speed_afterburn);
+               }
 
                if(racer.invincible_finished < time)
                {
@@ -375,9 +424,17 @@ float racer_frame()
                sound (racer.tur_head, CH_TRIGGER_SINGLE, "misc/null.wav", VOL_VEHICLEENGINE, ATTEN_NORM);
        }
 
-       df -= v_up * (vlen(racer.velocity) * autocvar_g_vehicle_racer_downforce);
+       if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
+               racer.racer_watertime = time;
+
+       float dforce = autocvar_g_vehicle_racer_downforce;
+       if(time - racer.racer_watertime <= 3)
+               dforce = autocvar_g_vehicle_racer_water_downforce;
+
+       df -= v_up * (vlen(racer.velocity) * dforce);
        player.movement = racer.velocity += df * frametime;
 
+       if(!forbidWeaponUse(player))
        if(player.BUTTON_ATCK)
        if(time > racer.attack_finished_single)
        if(racer.vehicle_energy >= autocvar_g_vehicle_racer_cannon_cost)
@@ -416,6 +473,7 @@ float racer_frame()
                }
        }
 
+       if(!forbidWeaponUse(player))
        if(time > racer.delay)
        if(player.BUTTON_ATCK2)
        {
@@ -438,13 +496,13 @@ float racer_frame()
        player.vehicle_reload1 = bound(0, 100 * ((time - racer.lip) / (racer.delay - racer.lip)), 100);
 
        if(racer.vehicle_flags  & VHF_SHIELDREGEN)
-               vehicles_regen(racer.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, TRUE);
+               vehicles_regen(racer.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, frametime, true);
 
        if(racer.vehicle_flags  & VHF_HEALTHREGEN)
-               vehicles_regen(racer.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, FALSE);
+               vehicles_regen(racer.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, frametime, false);
 
        if(racer.vehicle_flags  & VHF_ENERGYREGEN)
-               vehicles_regen(racer.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, FALSE);
+               vehicles_regen(racer.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, frametime, false);
 
 
        VEHICLE_UPDATE_PLAYER(player, health, racer);
@@ -470,17 +528,28 @@ void racer_think()
        self.lastpushtime = time;
        if(!pushdeltatime) return;
 
-       tracebox(self.origin, self.mins, self.maxs, self.origin - ('0 0 1' * autocvar_g_vehicle_racer_springlength), MOVE_NORMAL, self);
+       tracebox(self.origin, self.mins, self.maxs, self.origin - ('0 0 1' * autocvar_g_vehicle_racer_springlength), MOVE_NOMONSTERS, self);
 
        vector df = self.velocity * -autocvar_g_vehicle_racer_friction;
        df_z += (1 - trace_fraction) * autocvar_g_vehicle_racer_hoverpower + sin(time * 2) * (autocvar_g_vehicle_racer_springlength * 2);
 
+       float forced = autocvar_g_vehicle_racer_upforcedamper;
+
+       int cont = pointcontents(self.origin - '0 0 64');
+       if(cont == CONTENT_WATER || cont == CONTENT_LAVA || cont == CONTENT_SLIME)
+       {
+               forced = autocvar_g_vehicle_racer_water_upforcedamper;
+               self.velocity_z += 200;
+       }
+
        self.velocity += df * pushdeltatime;
        if(self.velocity_z > 0)
-               self.velocity_z *= 1 - autocvar_g_vehicle_racer_upforcedamper * pushdeltatime;
+               self.velocity_z *= 1 - forced * pushdeltatime;
 
        self.angles_x *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * pushdeltatime);
        self.angles_z *= 1 - (autocvar_g_vehicle_racer_anglestabilizer * pushdeltatime);
+       
+       CSQCMODEL_AUTOUPDATE();
 }
 
 void racer_exit(float eject)
@@ -534,7 +603,7 @@ void racer_blowup()
 
        RadiusDamage (self, self.enemy, autocvar_g_vehicle_racer_blowup_coredamage,
                                        autocvar_g_vehicle_racer_blowup_edgedamage,
-                                       autocvar_g_vehicle_racer_blowup_radius, world,
+                                       autocvar_g_vehicle_racer_blowup_radius, world, world,
                                        autocvar_g_vehicle_racer_blowup_forceintensity,
                                        DEATH_VH_WAKI_DEATH, world);
 
@@ -550,6 +619,16 @@ void racer_blowup()
        setorigin(self, self.pos1);
 }
 
+void racer_blowup_think()
+{
+       self.nextthink = time;
+       
+       if(time >= self.delay)
+               racer_blowup();
+       
+       CSQCMODEL_AUTOUPDATE();
+}
+
 void racer_deadtouch()
 {
        self.avelocity_x *= 0.7;
@@ -561,7 +640,7 @@ void racer_deadtouch()
 void spawnfunc_vehicle_racer()
 {
        if(!autocvar_g_vehicle_racer) { remove(self); return; }
-       if(!vehicle_initialize(VEH_RACER, TRUE)) { remove(self); return; }
+       if(!vehicle_initialize(VEH_RACER, false)) { remove(self); return; }
 }
 
 float v_racer(float req)
@@ -572,7 +651,7 @@ float v_racer(float req)
                {
                        if(autocvar_g_vehicle_racer_bouncepain)
                                vehicles_impact(autocvar_g_vehicle_racer_bouncepain_x, autocvar_g_vehicle_racer_bouncepain_y, autocvar_g_vehicle_racer_bouncepain_z);
-                       return TRUE;
+                       return true;
                }
                case VR_ENTER:
                {
@@ -583,12 +662,11 @@ float v_racer(float req)
                        if(self.owner.flagcarried)
                           setorigin(self.owner.flagcarried, '-190 0 96');
                           
-                       return TRUE;
+                       return true;
                }
                case VR_THINK:
                {
-
-                       return TRUE;
+                       return true;
                }
                case VR_DEATH:
                {
@@ -599,6 +677,7 @@ float v_racer(float req)
                        self.deadflag           = DEAD_DYING;
                        self.movetype           = MOVETYPE_BOUNCE;
                        self.wait                       = time;
+                       self.delay                      = 2 + time + random() * 3;
                        self.cnt                        = 1 + random() * 2;
                        self.touch                      = racer_deadtouch;
 
@@ -613,10 +692,10 @@ float v_racer(float req)
                        self.velocity += '0 0 700';
                        self.colormod = '-0.5 -0.5 -0.5';
 
-                       self.think = racer_blowup;
-                       self.nextthink = 2 + time + random() * 3;
+                       self.think = racer_blowup_think;
+                       self.nextthink = time;
        
-                       return TRUE;
+                       return true;
                }
                case VR_SPAWN:
                {
@@ -640,7 +719,7 @@ float v_racer(float req)
                        self.vehicle_health = autocvar_g_vehicle_racer_health;
                        self.vehicle_shield = autocvar_g_vehicle_racer_shield;
 
-                       self.movetype      = MOVETYPE_TOSS;
+                       self.movetype     = MOVETYPE_TOSS;
                        self.solid                = SOLID_SLIDEBOX;
                        self.delay                = time;
                        self.scale                = 0.5;
@@ -653,7 +732,7 @@ float v_racer(float req)
                        self.vehicle_health = autocvar_g_vehicle_racer_health;
                        self.vehicle_shield = autocvar_g_vehicle_racer_shield;
                        
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
@@ -676,7 +755,7 @@ float v_racer(float req)
                        self.vehicle_shield = autocvar_g_vehicle_racer_shield;
                        self.max_health = self.vehicle_health;
                                
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
@@ -690,11 +769,11 @@ float v_racer(float req)
                        precache_model ("models/vhshield.md3");
                        precache_model ("models/vehicles/wakizashi.dpm");
                        precache_model ("models/vehicles/wakizashi_cockpit.dpm");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -713,7 +792,7 @@ float v_racer(float req)
                case VR_HUD:
                {
                        if(autocvar_r_letterbox)
-                               return TRUE;
+                               return true;
 
                        vector picsize, hudloc = '0 0 0', pic2size, picloc;
 
@@ -839,24 +918,21 @@ float v_racer(float req)
 
                                drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), waki_xhair, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
                        }
-                       return TRUE;
+                       return true;
                }
                case VR_SETUP:
                {
                        AuxiliaryXhair[0].axh_image = "gfx/vehicles/axh-bracket.tga";
                        AuxiliaryXhair[0].axh_scale = 0.25;
-                       return TRUE;
+                       return true;
                }
                case VR_PRECACHE:
                {
-                       precache_model ("models/vhshield.md3");
-                       precache_model ("models/vehicles/wakizashi.dpm");
-                       precache_model ("models/vehicles/wakizashi_cockpit.dpm");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC