Merge remote-tracking branch 'origin/master' into samual/weapons

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

diff --git a/vehicles.cfg b/vehicles.cfg
index f225b69f070c2c2ca13ad8512b3ffd0a42731e4a..ea296146dbecbdaccbe2972f393961d3f14b6ec3 100644 (file)
--- a/vehicles.cfg
+++ b/vehicles.cfg
@@ -5,15 +5,22 @@ exec vehicle_raptor.cfg
 exec vehicle_spiderbot.cfg
 exec vehicle_bumblebee.cfg
 
-set g_vehicle_racer_respawntime     10
-set g_vehicle_spiderbot_respawntime 10
-set g_vehicle_raptor_respawntime    10
+set g_vehicle_racer 1
+set g_vehicle_spiderbot 1
+set g_vehicle_raptor 1
+set g_vehicle_bumblebee 1
 
 set g_vehicles_crush_dmg 70
 set g_vehicles_crush_force 50
 
 set cl_vehicles_hudscale 0.5
 
-set g_vehicles_delayspawn 0
+set g_vehicles_delayspawn 1
 set g_vehicles_delayspawn_jitter 10
-set g_vehicles_allow_flagcarry 1
+
+set g_vehicles_vortex_damagerate 0.5
+set g_vehicles_machinegun_damagerate 0.65
+set g_vehicles_rifle_damagerate 1
+set g_vehicles_vaporizer_damagerate 0.007
+set g_vehicles_tag_damagerate 2
+