Merge branch 'master' into Mario/vehicles

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

diff --git a/vehicles.cfg b/vehicles.cfg
index d28aa4cad6f258d4b058aa7b468e5ebc7fc63e61..b5f0178ffce13f978f5dbfbd39eb306f2cb31c57 100644 (file)
--- a/vehicles.cfg
+++ b/vehicles.cfg
@@ -13,14 +13,23 @@ 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
+set g_vehicles_steal 1 "allow stealing enemy vehicles in teamplay modes"
+set g_vehicles_steal_show_waypoint 1 "show a waypoint above the thief"
+
+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.007
 set g_vehicles_tag_damagerate 2