New lock mode for raptor, rebalance

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index c77c4485fff23cf867e58b615d84702b2df4d2e7..53d2f49921d2bfd64b07f7e28281cdc634a7dd72 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -465,7 +465,57 @@ float raptor_frame()
 
     vector vf, ad;
     // Target lock & predict
-    if(autocvar_g_vehicle_raptor_cannon_locktarget)
+    if(autocvar_g_vehicle_raptor_cannon_locktarget == 2)
+    {
+        if(raptor.gun1.lock_time < time || raptor.gun1.enemy.deadflag)
+            raptor.gun1.enemy = world;
+    
+        if(trace_ent)
+        if(trace_ent.movetype)
+        if(trace_ent.takedamage)
+        if(!trace_ent.deadflag)
+        {
+            if(teamplay)
+            {
+                if(trace_ent.team != player.team)
+                {
+                    raptor.gun1.enemy = trace_ent;
+                    raptor.gun1.lock_time = time + 5;
+                }
+            }
+            else
+            {            
+                raptor.gun1.enemy = trace_ent;
+                raptor.gun1.lock_time = time + 0.5;
+            }
+        }
+            
+        if(raptor.gun1.enemy)
+        {
+            float i, distance, impact_time;
+
+            vf = real_origin(raptor.gun1.enemy);
+            UpdateAuxiliaryXhair(player, vf, '1 0 0', 1);
+            vector _vel = raptor.gun1.enemy.velocity;
+            if(raptor.gun1.enemy.movetype == MOVETYPE_WALK)
+                _vel_z *= 0.1;
+            
+            if(autocvar_g_vehicle_raptor_cannon_predicttarget)
+            {
+                ad = vf;
+                for(i = 0; i < 4; ++i)
+                {
+                    distance = vlen(ad - player.origin);
+                    impact_time = distance / autocvar_g_vehicle_raptor_cannon_speed;
+                    ad = vf + _vel * impact_time;
+                }
+                trace_endpos = ad;                        
+            }
+            else
+                trace_endpos = vf;                        
+        }
+    }
+    else if(autocvar_g_vehicle_raptor_cannon_locktarget == 1)
     {
 
         vehicles_locktarget((1 / autocvar_g_vehicle_raptor_cannon_locking_time) * frametime,

diff --git a/vehicle_racer.cfg b/vehicle_racer.cfg
index b4a1d5b766f4e05e668e0f5b9e8c7863c805907f..c9b0f7f602f9f05855a3fdcd69f5b479c21ee69d 100644 (file)
--- a/vehicle_racer.cfg
+++ b/vehicle_racer.cfg
@@ -13,9 +13,9 @@ set g_vehicle_racer_energy_regen        50
 set g_vehicle_racer_energy_regen_pause  1
 
 set g_vehicle_racer_speed_stop          2500
-set g_vehicle_racer_speed_forward       700
-set g_vehicle_racer_speed_strafe        700
-set g_vehicle_racer_speed_afterburn     1000
+set g_vehicle_racer_speed_forward       600
+set g_vehicle_racer_speed_strafe        600
+set g_vehicle_racer_speed_afterburn     1200
 set g_vehicle_racer_friction            0.35
 set g_vehicle_racer_afterburn_cost      25      // energy consumed per second
 
@@ -33,28 +33,28 @@ set g_vehicle_racer_pitchspeed         125
 set g_vehicle_racer_maxpitch           25
 set g_vehicle_racer_turnroll           30
 
-set g_vehicle_racer_cannon_speed        9000
-set g_vehicle_racer_cannon_damage       30
+set g_vehicle_racer_cannon_speed        15000
+set g_vehicle_racer_cannon_damage       15
 set g_vehicle_racer_cannon_radius       100
-set g_vehicle_racer_cannon_refire       0.15
-set g_vehicle_racer_cannon_cost         10
+set g_vehicle_racer_cannon_refire       0.05
+set g_vehicle_racer_cannon_cost         5
 set g_vehicle_racer_cannon_spread       0.0125
 set g_vehicle_racer_cannon_force        50
 
-set g_vehicle_racer_rocket_speed       1000
-set g_vehicle_racer_rocket_accel       1500
-set g_vehicle_racer_rocket_turnrate    0.2
-set g_vehicle_racer_rocket_damage      165
+set g_vehicle_racer_rocket_speed       900
+set g_vehicle_racer_rocket_accel       1600
+set g_vehicle_racer_rocket_turnrate    0.15
+set g_vehicle_racer_rocket_damage      100
 set g_vehicle_racer_rocket_force       350
 set g_vehicle_racer_rocket_radius      125
-set g_vehicle_racer_rocket_refire      6
+set g_vehicle_racer_rocket_refire      3
 set g_vehicle_racer_rocket_cost        0
-set g_vehicle_racer_rocket_climbspeed  1500
+set g_vehicle_racer_rocket_climbspeed  1600
 
 set g_vehicle_racer_rocket_locktarget           1
 set g_vehicle_racer_rocket_locking_time         0.35
-set g_vehicle_racer_rocket_locking_releasetime  1.5
-set g_vehicle_racer_rocket_locked_time          6
+set g_vehicle_racer_rocket_locking_releasetime  0.5
+set g_vehicle_racer_rocket_locked_time          4
 set g_vehicle_racer_rocket_locked_maxangle      1.8
 
 set g_vehicle_racer_blowup_radius           250

diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index ff0008afe1a0cd87bbad64b60c9709c187e0f1f6..dfa33f509fe4a525fb84926b98f92b4d16abe375 100644 (file)
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -12,11 +12,11 @@ set g_vehicle_raptor_turnspeed  200
 set g_vehicle_raptor_pitchspeed 50
 set g_vehicle_raptor_pitchlimit 45
 
-set g_vehicle_raptor_speed_forward 760
-set g_vehicle_raptor_speed_strafe  500
-set g_vehicle_raptor_speed_up      700
-set g_vehicle_raptor_speed_down    900
-set g_vehicle_raptor_friction      0.6
+set g_vehicle_raptor_speed_forward 2000
+set g_vehicle_raptor_speed_strafe  1000
+set g_vehicle_raptor_speed_up      2000
+set g_vehicle_raptor_speed_down    2000
+set g_vehicle_raptor_friction      2
 
 set g_vehicle_raptor_bomblets           8
 set g_vehicle_raptor_bomblet_alt        750
@@ -29,21 +29,21 @@ set g_vehicle_raptor_bomblet_force      150
 set g_vehicle_raptor_bomblet_explode_delay 0.4
 set g_vehicle_raptor_bombs_refire       5
 
-set g_vehicle_raptor_cannon_turnspeed 40
+set g_vehicle_raptor_cannon_turnspeed 60
 set g_vehicle_raptor_cannon_turnlimit 20
 set g_vehicle_raptor_cannon_pitchlimit_up   12
 set g_vehicle_raptor_cannon_pitchlimit_down 32
 
-set g_vehicle_raptor_cannon_locktarget          1
-set g_vehicle_raptor_cannon_locking_time        0.4
-set g_vehicle_raptor_cannon_locking_releasetime 1.6
-set g_vehicle_raptor_cannon_locked_time         5
+set g_vehicle_raptor_cannon_locktarget          2
+set g_vehicle_raptor_cannon_locking_time        0.2
+set g_vehicle_raptor_cannon_locking_releasetime 0.3
+set g_vehicle_raptor_cannon_locked_time         1
 set g_vehicle_raptor_cannon_predicttarget       1
 
 set g_vehicle_raptor_cannon_cost     1
 set g_vehicle_raptor_cannon_damage   10
 set g_vehicle_raptor_cannon_radius   60
-set g_vehicle_raptor_cannon_refire   0.05
+set g_vehicle_raptor_cannon_refire   0.03
 set g_vehicle_raptor_cannon_speed    12000
 set g_vehicle_raptor_cannon_spread   0.01
 set g_vehicle_raptor_cannon_force    25
@@ -51,22 +51,22 @@ set g_vehicle_raptor_cannon_force    25
 set g_vehicle_raptor_flare_refire 5
 set g_vehicle_raptor_flare_lifetime 10
 set g_vehicle_raptor_flare_chase 0.9
-set g_vehicle_raptor_flare_range 1750
+set g_vehicle_raptor_flare_range 2000
 
-set g_vehicle_raptor_energy             50
-set g_vehicle_raptor_energy_regen       20
-set g_vehicle_raptor_energy_regen_pause 1
+set g_vehicle_raptor_energy             100
+set g_vehicle_raptor_energy_regen       25
+set g_vehicle_raptor_energy_regen_pause 0.1
 
-set g_vehicle_raptor_health             200
+set g_vehicle_raptor_health             150
 set g_vehicle_raptor_health_regen       0
 set g_vehicle_raptor_health_regen_pause 0
 
-set g_vehicle_raptor_shield             100
+set g_vehicle_raptor_shield             75
 set g_vehicle_raptor_shield_regen       25
 set g_vehicle_raptor_shield_regen_pause 1.5
 
 set g_vehicle_raptor_bouncefactor 0.2
 set g_vehicle_raptor_bouncestop 0
-set g_vehicle_raptor_bouncepain "1 1 500"
+set g_vehicle_raptor_bouncepain "1 4 1000"
 
 set g_vehicle_raptor_mass              2200

diff --git a/vehicle_spiderbot.cfg b/vehicle_spiderbot.cfg
index a7c0e5228f86a49017d9691baf81d16e775dd491..57b27185887b1dbdd2c05158ade7605770edaf02 100644 (file)
--- a/vehicle_spiderbot.cfg
+++ b/vehicle_spiderbot.cfg
@@ -1,10 +1,10 @@
 set g_vehicle_spiderbot_respawntime                      45
 
-set g_vehicle_spiderbot_health                500
-set g_vehicle_spiderbot_health_regen             15
+set g_vehicle_spiderbot_health                800
+set g_vehicle_spiderbot_health_regen             10
 set g_vehicle_spiderbot_health_regen_pause    5
 
-set g_vehicle_spiderbot_shield                300
+set g_vehicle_spiderbot_shield                200
 set g_vehicle_spiderbot_shield_block          1
 set g_vehicle_spiderbot_shield_regen          25
 set g_vehicle_spiderbot_shield_regen_pause    0.35
@@ -21,15 +21,15 @@ set g_vehicle_spiderbot_head_pitchlimit_up   30
 set g_vehicle_spiderbot_head_pitchlimit_down -20
 
 set g_vehicle_spiderbot_speed_stop         50
-set g_vehicle_spiderbot_speed_walk         400
-set g_vehicle_spiderbot_speed_strafe       300
+set g_vehicle_spiderbot_speed_walk         500
+set g_vehicle_spiderbot_speed_strafe       400
 set g_vehicle_spiderbot_movement_inertia   0.15
 set g_vehicle_spiderbot_tiltlimit          90
 
 set g_vehicle_spiderbot_minigun_damage          12       // 400 (x2) DPS 
 set g_vehicle_spiderbot_minigun_refire          0.03
 set g_vehicle_spiderbot_minigun_force           9
-set g_vehicle_spiderbot_minigun_spread          0.025
+set g_vehicle_spiderbot_minigun_spread          0.015
 set g_vehicle_spiderbot_minigun_speed           45000  // ~ 32QU
 set g_vehicle_spiderbot_minigun_bulletconstant  110
 set g_vehicle_spiderbot_minigun_ammo_cost       1
@@ -55,11 +55,6 @@ set g_vehicle_spiderbot_rocket_noise      0.2
 set g_vehicle_spiderbot_rocket_lifetime   20
 set g_vehicle_spiderbot_rocket_spread     0.05
 
-set g_vehicle_spiderbot_crush_dmg         75
-set g_vehicle_spiderbot_crush_force       50
-
-set g_vehicle_spiderbot_mass              5000
-
 set g_vehicle_spiderbot_bouncefactor 0   // Factor of old velocity to keep after colission
 set g_vehicle_spiderbot_bouncestop 0        // if != 0, New veloctiy after bounce = 0 if new velocity < this
 set g_vehicle_spiderbot_bouncepain "0 0 0" // "minspeed_for_pain speedchange_to_pain_factor max_damage"