Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/vehicle_racer.cfg b/vehicle_racer.cfg
index 5c3e06aff1cc9f4db3b590407cecd65beec6db58..c43decb3ec2a8ec2ba884e50575de14b54229a63 100644 (file)
--- a/vehicle_racer.cfg
+++ b/vehicle_racer.cfg
@@ -19,6 +19,11 @@ set g_vehicle_racer_speed_afterburn     3000
 set g_vehicle_racer_friction            0.45
 set g_vehicle_racer_afterburn_cost      100       // energy consumed per second
 
+set g_vehicle_racer_waterburn_speed 750
+set g_vehicle_racer_waterburn_cost 5
+set g_vehicle_racer_water_speed_forward 600
+set g_vehicle_racer_water_speed_strafe 600
+
 set g_vehicle_racer_hovertype           0       // 0 = hover, != 0 = maglev
 set g_vehicle_racer_hoverpower          8000    // NOTE!! x 4 (4 engines)
 set g_vehicle_racer_upforcedamper       10
@@ -52,7 +57,7 @@ set g_vehicle_racer_rocket_cost        0
 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_time         0.9
 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