Merge remote branch 'origin/master' into tzork/gm_nexball

[xonotic/xonotic-data.pk3dir.git] / vehicle_raptor.cfg

diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index adfd0a06cc02c1b8d8739cd3f3796dfe39d31361..2a46dd28250be16fad45df4f06cb233780357db2 100644 (file)
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -1,4 +1,4 @@
-set g_vehicle_raptor_respawntime 30
+set g_vehicle_raptor_respawntime 35
 
 // 0: go where player aims, +forward etc relative to aim angles
 // 1: ignore aim for up/down movement. +forward always moved forward, +jump always moves up
@@ -6,25 +6,25 @@ set g_vehicle_raptor_movestyle 1
 
 set g_vehicle_raptor_turnroll 0.1
 
-set g_vehicle_raptor_turnspeed 70
-set g_vehicle_raptor_pitchspeed 30
+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.7
+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           12
+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.4
-set g_vehicle_raptor_bomblet_damage     35
-set g_vehicle_raptor_bomblet_edgedamage 15
-set g_vehicle_raptor_bomblet_radius     300
+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.25
+set g_vehicle_raptor_bomblet_explode_delay 0.4
 set g_vehicle_raptor_bombs_refire       5
 
 set g_vehicle_raptor_cannon_turnspeed 90
@@ -32,29 +32,34 @@ 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.5
-set g_vehicle_raptor_cannon_locking_releasetime 1
-set g_vehicle_raptor_cannon_locked_time 2
-set g_vehicle_raptor_cannon_predicttarget 1
+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_predicttarget       1
 
 set g_vehicle_raptor_cannon_cost     1
 set g_vehicle_raptor_cannon_damage   25
-set g_vehicle_raptor_cannon_radius   50
-set g_vehicle_raptor_cannon_refire   0.075
-set g_vehicle_raptor_cannon_speed    12500
-set g_vehicle_raptor_cannon_spread   0.0125
+set g_vehicle_raptor_cannon_radius   60
+set g_vehicle_raptor_cannon_refire   0.05
+set g_vehicle_raptor_cannon_speed    12000
+set g_vehicle_raptor_cannon_spread   0.01
+set g_vehicle_raptor_cannon_force    50
 
 set g_vehicle_raptor_energy             30
 set g_vehicle_raptor_energy_regen       15
-set g_vehicle_raptor_energy_regen_pause 0.75
+set g_vehicle_raptor_energy_regen_pause 0.8
 
-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             150
+set g_vehicle_raptor_shield             120
 set g_vehicle_raptor_shield_regen       25
-set g_vehicle_raptor_shield_regen_pause 2
+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.5 500"
 
 set g_vehicle_raptor_mass              2200