Nicer merging.

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

diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
index 8af2573930955396f9050fa130e7f50d58b1d0ff..d91b79b6ceebdd6858051c24c837b21208378732 100644 (file)
--- a/vehicle_raptor.cfg
+++ b/vehicle_raptor.cfg
@@ -1,60 +1,72 @@
-set g_vehicle_raptor_respawntime 30
+set g_vehicle_raptor_respawntime 40
 
 // 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
 set g_vehicle_raptor_movestyle 1
 
-set g_vehicle_raptor_turnroll 0.1
+set g_vehicle_raptor_turnroll 0.4
 
-set g_vehicle_raptor_turnspeed 70
-set g_vehicle_raptor_pitchspeed 30
-set g_vehicle_raptor_pitchlimit 35
+set g_vehicle_raptor_takeofftime 1.5
 
-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_turnspeed  200
+set g_vehicle_raptor_pitchspeed 50
+set g_vehicle_raptor_pitchlimit 45
 
-set g_vehicle_raptor_bomblets           10
+set g_vehicle_raptor_speed_forward 1700
+set g_vehicle_raptor_speed_strafe  900
+set g_vehicle_raptor_speed_up      1700
+set g_vehicle_raptor_speed_down    1700
+set g_vehicle_raptor_friction      2
+
+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_edgedamage 20
-set g_vehicle_raptor_bomblet_radius     310
+set g_vehicle_raptor_bomblet_spread     0.4
+set g_vehicle_raptor_bomblet_damage     55
+set g_vehicle_raptor_bomblet_edgedamage 25
+set g_vehicle_raptor_bomblet_radius     350
 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
+set g_vehicle_raptor_cannon_turnspeed 120
 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.6
-set g_vehicle_raptor_cannon_locking_releasetime 1.5
-set g_vehicle_raptor_cannon_locked_time         3.5
+set g_vehicle_raptor_cannon_locktarget          0
+set g_vehicle_raptor_cannon_locking_time        0.2
+set g_vehicle_raptor_cannon_locking_releasetime 0.45
+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   25
+set g_vehicle_raptor_cannon_damage   10
 set g_vehicle_raptor_cannon_radius   60
-set g_vehicle_raptor_cannon_refire   0.1
-set g_vehicle_raptor_cannon_speed    12000
+set g_vehicle_raptor_cannon_refire   0.03
+set g_vehicle_raptor_cannon_speed    24000
 set g_vehicle_raptor_cannon_spread   0.01
+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 2000
 
-set g_vehicle_raptor_energy             40
-set g_vehicle_raptor_energy_regen       20
-set g_vehicle_raptor_energy_regen_pause 0.75
+set g_vehicle_raptor_energy             100
+set g_vehicle_raptor_energy_regen       25
+set g_vehicle_raptor_energy_regen_pause 0.25
 
-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             75
 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 4 1000"
 
 set g_vehicle_raptor_mass              2200