Switch raptor crosshair. Tune settings (racer faster, raptor slower, spider toughter...

diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc
index ef896d652bb50abd894a53f0e032c2575640160c..76891b0b29a09d0f862328d1c35a157f743c7aac 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qc
+++ b/qcsrc/client/vehicles/vehicles.qc
@@ -125,7 +125,7 @@ void Net_VehicleSetup()
             break;
 
         case HUD_RAPTOR:
-            AuxiliaryXhair[0].axh_image   = "gfx/vehicles/axh-cross.tga";
+            AuxiliaryXhair[0].axh_image   = "gfx/vehicles/axh-special2.tga";
             AuxiliaryXhair[0].axh_scale   = 0.5;
             //AuxiliaryXhair[0].alpha       = 0.5;
 
@@ -327,7 +327,7 @@ void CSQC_SPIDER_HUD()
 #define raptor_gun  "gfx/vehicles/raptor_guns.tga"
 #define raptor_bomb "gfx/vehicles/raptor_bombs.tga"
 #define raptor_drop "gfx/vehicles/axh-dropcross.tga"
-#define raptor_xhair "gfx/vehicles/axh-cross.tga"
+#define raptor_xhair "gfx/vehicles/axh-ring.tga"
 void CSQC_RAPTOR_HUD()
 {
        if(autocvar_r_letterbox)

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 4abeecf21596d367bfcb881d22c0f085d55a425d..7fefdeb366f334b4140ef92d7f703301e1dfabe8 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -409,7 +409,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)

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index bc2e961605ef6815281408431e32faf5b33e6719..6d12066183e8fb2db84e6bd70ee1338e36e33ad8 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -423,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
@@ -473,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);
@@ -484,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);
@@ -505,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)

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 5aee87946713f421fb32a7f5185a4fd1136223a0..b9888f59919d545d25c36c26d3d1197925a5a2f6 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -234,6 +234,10 @@ vector vehicles_force_fromtag_maglev(string tag_name, float spring_length, float
 // Generic vehile projectile system
 void vehicles_projectile_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
+    // Ignore damage from oterh projectiles from my owner (dont mess up volly's)
+    if(inflictor.owner = self.owner)
+        return; 
+    
     self.health -= damage;
     self.velocity += force;
     if(self.health < 1)

diff --git a/vehicle_racer.cfg b/vehicle_racer.cfg
index 9d6fec3d4553b007ed5585903352dd8c9b8f6c48..4d7bcdf4312665cebca9facbce5e57fad9edb730 100644 (file)
--- a/vehicle_racer.cfg
+++ b/vehicle_racer.cfg
@@ -13,20 +13,20 @@ set g_vehicle_racer_energy_regen        40
 set g_vehicle_racer_energy_regen_pause  1
 
 set g_vehicle_racer_speed_stop          2000
-set g_vehicle_racer_speed_forward       1000
-set g_vehicle_racer_speed_strafe        750
+set g_vehicle_racer_speed_forward       800
+set g_vehicle_racer_speed_strafe        500
 set g_vehicle_racer_speed_afterburn     2000
-set g_vehicle_racer_friction            0.7
+set g_vehicle_racer_friction            0.4
 set g_vehicle_racer_afterburn_cost      60      // energy consumed per second
 
 set g_vehicle_racer_hovertype           0       // 0 = hover, != 0 = maglev
-set g_vehicle_racer_hoverpower          3600    // NOTE!! x 4 (4 engines)
-set g_vehicle_racer_upforcedamper       4
+set g_vehicle_racer_hoverpower          5000    // NOTE!! x 4 (4 engines)
+set g_vehicle_racer_upforcedamper       10
 
 set g_vehicle_racer_downforce            0.01
-set g_vehicle_racer_springlength         60
+set g_vehicle_racer_springlength         65
 set g_vehicle_racer_collision_multiplier 0.05
-set g_vehicle_racer_anglestabilizer      2
+set g_vehicle_racer_anglestabilizer      1.75
 
 set g_vehicle_racer_turnspeed          200
 set g_vehicle_racer_pitchspeed         100
@@ -37,24 +37,24 @@ set g_vehicle_racer_cannon_speed        9000
 set g_vehicle_racer_cannon_damage       20
 set g_vehicle_racer_cannon_radius       100
 set g_vehicle_racer_cannon_refire       0.1
-set g_vehicle_racer_cannon_cost         2
+set g_vehicle_racer_cannon_cost         4
 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       1400
-set g_vehicle_racer_rocket_turnrate    0.15
-set g_vehicle_racer_rocket_damage      175
+set g_vehicle_racer_rocket_turnrate    0.17
+set g_vehicle_racer_rocket_damage      160
 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_cost        0
 
 set g_vehicle_racer_rocket_locktarget           1
-set g_vehicle_racer_rocket_locking_time         0.45
-set g_vehicle_racer_rocket_locking_releasetime  1.5
+set g_vehicle_racer_rocket_locking_time         0.4
+set g_vehicle_racer_rocket_locking_releasetime  1.6
 set g_vehicle_racer_rocket_locked_time          5
-set g_vehicle_racer_rocket_locked_maxangle      1.44
+set g_vehicle_racer_rocket_locked_maxangle      1.46
 
 set g_vehicle_racer_blowup_radius           250
 set g_vehicle_racer_blowup_coredamage       250

diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index 07e511c568bb7eae157bc4c09beed553cfda64c2..b3a0b51ccad75cb86f22c79dd43187f900fec5b3 100644 (file)
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -6,25 +6,25 @@ set g_vehicle_raptor_movestyle 1
 
 set g_vehicle_raptor_turnroll 0.1
 
-set g_vehicle_raptor_turnspeed  90
-set g_vehicle_raptor_pitchspeed 45
+set g_vehicle_raptor_turnspeed  80
+set g_vehicle_raptor_pitchspeed 40
 set g_vehicle_raptor_pitchlimit 35
 
-set g_vehicle_raptor_speed_forward 1000
-set g_vehicle_raptor_speed_strafe  750
-set g_vehicle_raptor_speed_up      600
-set g_vehicle_raptor_speed_down    900
-set g_vehicle_raptor_friction      0.8
+set g_vehicle_raptor_speed_forward 900
+set g_vehicle_raptor_speed_strafe  700
+set g_vehicle_raptor_speed_up      500
+set g_vehicle_raptor_speed_down    800
+set g_vehicle_raptor_friction      0.7
 
-set g_vehicle_raptor_bomblets           10
+set g_vehicle_raptor_bomblets           8
 set g_vehicle_raptor_bomblet_alt        750
 set g_vehicle_raptor_bomblet_time       0.5
-set g_vehicle_raptor_bomblet_spread     0.45
-set g_vehicle_raptor_bomblet_damage     40
+set g_vehicle_raptor_bomblet_spread     0.4
+set g_vehicle_raptor_bomblet_damage     50
 set g_vehicle_raptor_bomblet_edgedamage 20
 set g_vehicle_raptor_bomblet_radius     310
 set g_vehicle_raptor_bomblet_force      150
-set g_vehicle_raptor_bomblet_explode_delay 0.35
+set g_vehicle_raptor_bomblet_explode_delay 0.4
 set g_vehicle_raptor_bombs_refire       5
 
 set g_vehicle_raptor_cannon_turnspeed 90
@@ -33,8 +33,8 @@ 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.5
-set g_vehicle_raptor_cannon_locking_releasetime 1.5
+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_predicttarget       1
 
@@ -54,7 +54,7 @@ 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             120
 set g_vehicle_raptor_shield_regen       25
 set g_vehicle_raptor_shield_regen_pause 1.5
 

diff --git a/vehicle_spiderbot.cfg b/vehicle_spiderbot.cfg
index 09d9fe964e5acfce459e6aa609f59b475b2be7fe..10a09454c65577f19a249219a7144bf25324ce67 100644 (file)
--- a/vehicle_spiderbot.cfg
+++ b/vehicle_spiderbot.cfg
@@ -1,13 +1,13 @@
-set g_vehicle_spiderbot_respawntime                      30
+set g_vehicle_spiderbot_respawntime                      45
 
-set g_vehicle_spiderbot_health                875
-set g_vehicle_spiderbot_health_regen             10
+set g_vehicle_spiderbot_health                850
+set g_vehicle_spiderbot_health_regen             15
 set g_vehicle_spiderbot_health_regen_pause    10
 
-set g_vehicle_spiderbot_shield                125
+set g_vehicle_spiderbot_shield                150
 set g_vehicle_spiderbot_shield_block          1
 set g_vehicle_spiderbot_shield_regen          25
-set g_vehicle_spiderbot_shield_regen_pause    0.25
+set g_vehicle_spiderbot_shield_regen_pause    0.2
 
 set g_vehicle_spiderbot_energy              0
 set g_vehicle_spiderbot_energy_regen        0
@@ -25,7 +25,7 @@ set g_vehicle_spiderbot_speed_walk         400
 set g_vehicle_spiderbot_speed_strafe       300
 set g_vehicle_spiderbot_movement_inertia   0.25
 
-set g_vehicle_spiderbot_minigun_damage         15
+set g_vehicle_spiderbot_minigun_damage         16
 set g_vehicle_spiderbot_minigun_spread         0.015
 set g_vehicle_spiderbot_minigun_speed          50000
 set g_vehicle_spiderbot_minigun_refire         0.05
@@ -39,13 +39,13 @@ set g_vehicle_spiderbot_springup             5
 set g_vehicle_spiderbot_springblend         0.15
 
 set g_vehicle_spiderbot_rocket_health     100
-set g_vehicle_spiderbot_rocket_damage     50
+set g_vehicle_spiderbot_rocket_damage     75
 set g_vehicle_spiderbot_rocket_edgedamage 15
 set g_vehicle_spiderbot_rocket_force      150
 set g_vehicle_spiderbot_rocket_radius     150
-set g_vehicle_spiderbot_rocket_reload     3
-set g_vehicle_spiderbot_rocket_refire     0.25
-set g_vehicle_spiderbot_rocket_speed      1500
+set g_vehicle_spiderbot_rocket_reload     4
+set g_vehicle_spiderbot_rocket_refire     0.2
+set g_vehicle_spiderbot_rocket_speed      1750
 set g_vehicle_spiderbot_rocket_turnrate   0.2
 set g_vehicle_spiderbot_rocket_noise      0.3
 set g_vehicle_spiderbot_rocket_lifetime   30