Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/vehicles.cfg b/vehicles.cfg
index 022b7a59ac4b795c937f5817a3b8fa6d5921a1e2..0fefec6dfb687ab94ae4517dcb45cf6efef73f72 100644 (file)
--- a/vehicles.cfg
+++ b/vehicles.cfg
@@ -13,7 +13,9 @@ set g_vehicle_bumblebee 1
 set g_vehicles_crush_dmg 70
 set g_vehicles_crush_force 50
 
+set cl_vehicles_hud_tactical 1
 set cl_vehicles_hudscale 0.5
+set cl_vehicles_crosshair_size 0.5
 
 set g_vehicles_enter 0 "require pressing use key to enter a vehicle"
 set g_vehicles_enter_radius 250
@@ -25,9 +27,9 @@ set g_vehicles_teams 1 "allow team specific vehicles"
 set g_vehicles_delayspawn 1
 set g_vehicles_delayspawn_jitter 10
 
-set g_vehicles_nex_damagerate 0.5
-set g_vehicles_uzi_damagerate 0.65
+set g_vehicles_vortex_damagerate 0.5
+set g_vehicles_machinegun_damagerate 0.65
 set g_vehicles_rifle_damagerate 1
-set g_vehicles_minstanex_damagerate 0.007
+set g_vehicles_vaporizer_damagerate 0.8
 set g_vehicles_tag_damagerate 2