From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 13 Mar 2016 11:31:36 +0000 (+1100)
Subject: vehicles: remove old out of sync configs
X-Git-Tag: xonotic-v0.8.2~1090
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=2e317743ca5ee5824f8c87fdd5f355512b80f625;p=xonotic%2Fxonotic-data.pk3dir.git

vehicles: remove old out of sync configs
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8ef0f0da2..b25b17ccd 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1389,7 +1389,6 @@ exec balance-xonotic.cfg
 exec effects-normal.cfg
 exec physicsX.cfg
 exec turrets.cfg
-exec vehicles.cfg
 exec crosshairs.cfg
 exec gamemodes.cfg
 exec mutators.cfg
diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index d48fb6333..59ba16a5f 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -79,7 +79,7 @@ float autocvar_cl_spawnzoom_speed = 1;
 float autocvar_cl_spawnzoom_factor = 2;
 bool autocvar_cl_stripcolorcodes;
 bool autocvar_cl_vehicles_alarm = true;
-bool autocvar_cl_vehicles_hud_tactical = 1;
+bool autocvar_cl_vehicles_hud_tactical = true;
 float autocvar_cl_vehicles_hudscale = 0.5;
 float autocvar_cl_vehicles_notify_time = 15;
 float autocvar_cl_vehicles_crosshair_size = 0.5;
diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh
index aee4bf6c6..289997e5d 100644
--- a/qcsrc/common/vehicles/sv_vehicles.qh
+++ b/qcsrc/common/vehicles/sv_vehicles.qh
@@ -5,17 +5,18 @@
 #include "../turrets/sv_turrets.qh"
 
 // vehicle cvars
-float autocvar_g_vehicles;
-float autocvar_g_vehicles_enter;
-float autocvar_g_vehicles_enter_radius;
-float autocvar_g_vehicles_steal;
-float autocvar_g_vehicles_steal_show_waypoint;
-float autocvar_g_vehicles_crush_dmg;
-float autocvar_g_vehicles_crush_force;
-float autocvar_g_vehicles_delayspawn;
-float autocvar_g_vehicles_delayspawn_jitter;
+bool autocvar_g_vehicles = true;
+AUTOCVAR(g_vehicles_enter, bool, false, "require pressing use key to enter a vehicle");
+float autocvar_g_vehicles_enter_radius = 250;
+AUTOCVAR(g_vehicles_steal, bool, true, "allow stealing enemy vehicles in teamplay modes");
+AUTOCVAR(g_vehicles_steal_show_waypoint, bool, true, "show a waypoint above the thief");
+float autocvar_g_vehicles_crush_dmg = 70;
+float autocvar_g_vehicles_crush_force = 50;
+bool autocvar_g_vehicles_delayspawn = true;
+float autocvar_g_vehicles_delayspawn_jitter = 10;
 float autocvar_g_vehicles_allow_bots;
-float autocvar_g_vehicles_teams;
+
+AUTOCVAR(g_vehicles_teams, bool, true, "allow team specific vehicles");
 float autocvar_g_vehicles_teleportable;
 float autocvar_g_vehicles_vortex_damagerate = 0.5;
 float autocvar_g_vehicles_machinegun_damagerate = 0.5;
diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc
index 323e485dc..a2e613a3a 100644
--- a/qcsrc/common/vehicles/vehicle/bumblebee.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc
@@ -34,67 +34,67 @@ const float BRG_END = 8;
 #include "bumblebee_weapons.qc"
 
 #ifdef SVQC
-float autocvar_g_vehicle_bumblebee_speed_forward;
-float autocvar_g_vehicle_bumblebee_speed_strafe;
-float autocvar_g_vehicle_bumblebee_speed_up;
-float autocvar_g_vehicle_bumblebee_speed_down;
-float autocvar_g_vehicle_bumblebee_turnspeed;
-float autocvar_g_vehicle_bumblebee_pitchspeed;
-float autocvar_g_vehicle_bumblebee_pitchlimit;
-float autocvar_g_vehicle_bumblebee_friction;
-
-float autocvar_g_vehicle_bumblebee_energy;
-float autocvar_g_vehicle_bumblebee_energy_regen;
-float autocvar_g_vehicle_bumblebee_energy_regen_pause;
-
-float autocvar_g_vehicle_bumblebee_health;
-float autocvar_g_vehicle_bumblebee_health_regen;
-float autocvar_g_vehicle_bumblebee_health_regen_pause;
-
-float autocvar_g_vehicle_bumblebee_shield;
-float autocvar_g_vehicle_bumblebee_shield_regen;
-float autocvar_g_vehicle_bumblebee_shield_regen_pause;
-
-float autocvar_g_vehicle_bumblebee_cannon_ammo;
-float autocvar_g_vehicle_bumblebee_cannon_ammo_regen;
-float autocvar_g_vehicle_bumblebee_cannon_ammo_regen_pause;
+float autocvar_g_vehicle_bumblebee_respawntime = 60;
 
-float autocvar_g_vehicle_bumblebee_cannon_lock = 0;
-
-float autocvar_g_vehicle_bumblebee_cannon_turnspeed;
-float autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down;
-float autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up;
-float autocvar_g_vehicle_bumblebee_cannon_turnlimit_in;
-float autocvar_g_vehicle_bumblebee_cannon_turnlimit_out;
+float autocvar_g_vehicle_bumblebee_speed_forward = 350;
+float autocvar_g_vehicle_bumblebee_speed_strafe = 350;
+float autocvar_g_vehicle_bumblebee_speed_up = 350;
+float autocvar_g_vehicle_bumblebee_speed_down = 350;
+float autocvar_g_vehicle_bumblebee_turnspeed = 120;
+float autocvar_g_vehicle_bumblebee_pitchspeed = 60;
+float autocvar_g_vehicle_bumblebee_pitchlimit = 60;
+float autocvar_g_vehicle_bumblebee_friction = 0.5;
 
+float autocvar_g_vehicle_bumblebee_energy = 500;
+float autocvar_g_vehicle_bumblebee_energy_regen = 50;
+float autocvar_g_vehicle_bumblebee_energy_regen_pause = 1;
 
-float autocvar_g_vehicle_bumblebee_raygun_turnspeed;
-float autocvar_g_vehicle_bumblebee_raygun_pitchlimit_down;
-float autocvar_g_vehicle_bumblebee_raygun_pitchlimit_up;
-float autocvar_g_vehicle_bumblebee_raygun_turnlimit_sides;
+float autocvar_g_vehicle_bumblebee_health = 1000;
+float autocvar_g_vehicle_bumblebee_health_regen = 65;
+float autocvar_g_vehicle_bumblebee_health_regen_pause = 10;
 
-float autocvar_g_vehicle_bumblebee_raygun_range;
-float autocvar_g_vehicle_bumblebee_raygun_dps;
-float autocvar_g_vehicle_bumblebee_raygun_aps;
-float autocvar_g_vehicle_bumblebee_raygun_fps;
+float autocvar_g_vehicle_bumblebee_shield = 400;
+float autocvar_g_vehicle_bumblebee_shield_regen = 150;
+float autocvar_g_vehicle_bumblebee_shield_regen_pause = 0.75;
 
-float autocvar_g_vehicle_bumblebee_raygun;
-float autocvar_g_vehicle_bumblebee_healgun_hps;
-float autocvar_g_vehicle_bumblebee_healgun_hmax;
-float autocvar_g_vehicle_bumblebee_healgun_aps;
-float autocvar_g_vehicle_bumblebee_healgun_amax;
-float autocvar_g_vehicle_bumblebee_healgun_sps;
-float autocvar_g_vehicle_bumblebee_healgun_locktime;
+float autocvar_g_vehicle_bumblebee_cannon_ammo = 100;
+float autocvar_g_vehicle_bumblebee_cannon_ammo_regen = 100;
+float autocvar_g_vehicle_bumblebee_cannon_ammo_regen_pause = 1;
 
-float autocvar_g_vehicle_bumblebee_respawntime;
-
-float autocvar_g_vehicle_bumblebee_blowup_radius;
-float autocvar_g_vehicle_bumblebee_blowup_coredamage;
-float autocvar_g_vehicle_bumblebee_blowup_edgedamage;
-float autocvar_g_vehicle_bumblebee_blowup_forceintensity;
-vector autocvar_g_vehicle_bumblebee_bouncepain;
+float autocvar_g_vehicle_bumblebee_cannon_lock = 0;
 
-bool autocvar_g_vehicle_bumblebee = 0;
+float autocvar_g_vehicle_bumblebee_cannon_turnspeed = 160;
+float autocvar_g_vehicle_bumblebee_cannon_pitchlimit_down = 60;
+float autocvar_g_vehicle_bumblebee_cannon_pitchlimit_up = 60;
+float autocvar_g_vehicle_bumblebee_cannon_turnlimit_in = 20;
+float autocvar_g_vehicle_bumblebee_cannon_turnlimit_out = 80;
+
+
+float autocvar_g_vehicle_bumblebee_raygun_turnspeed = 180;
+float autocvar_g_vehicle_bumblebee_raygun_pitchlimit_down = 20;
+float autocvar_g_vehicle_bumblebee_raygun_pitchlimit_up = 5;
+float autocvar_g_vehicle_bumblebee_raygun_turnlimit_sides = 35;
+
+bool autocvar_g_vehicle_bumblebee_raygun = false;
+float autocvar_g_vehicle_bumblebee_raygun_range = 2048;
+float autocvar_g_vehicle_bumblebee_raygun_dps = 250;
+float autocvar_g_vehicle_bumblebee_raygun_aps = 100;
+float autocvar_g_vehicle_bumblebee_raygun_fps = 100;
+
+float autocvar_g_vehicle_bumblebee_healgun_hps = 150;
+float autocvar_g_vehicle_bumblebee_healgun_hmax = 100;
+float autocvar_g_vehicle_bumblebee_healgun_aps = 75;
+float autocvar_g_vehicle_bumblebee_healgun_amax = 100;
+float autocvar_g_vehicle_bumblebee_healgun_sps = 100;
+float autocvar_g_vehicle_bumblebee_healgun_locktime = 2.5;
+
+float autocvar_g_vehicle_bumblebee_blowup_radius = 500;
+float autocvar_g_vehicle_bumblebee_blowup_coredamage = 500;
+float autocvar_g_vehicle_bumblebee_blowup_edgedamage = 100;
+float autocvar_g_vehicle_bumblebee_blowup_forceintensity = 600;
+vector autocvar_g_vehicle_bumblebee_bouncepain = '1 100 200';
+
+bool autocvar_g_vehicle_bumblebee = true;
 
 float bumblebee_gunner_frame()
 {SELFPARAM();
diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
index 1114c1102..db456825b 100644
--- a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
@@ -11,13 +11,13 @@ REGISTER_NET_LINKED(ENT_CLIENT_BUMBLE_RAYGUN)
 
 #ifdef SVQC
 
-float autocvar_g_vehicle_bumblebee_cannon_cost;
-float autocvar_g_vehicle_bumblebee_cannon_damage;
-float autocvar_g_vehicle_bumblebee_cannon_radius;
-float autocvar_g_vehicle_bumblebee_cannon_refire;
-float autocvar_g_vehicle_bumblebee_cannon_speed;
-float autocvar_g_vehicle_bumblebee_cannon_spread;
-float autocvar_g_vehicle_bumblebee_cannon_force;
+float autocvar_g_vehicle_bumblebee_cannon_cost = 2;
+float autocvar_g_vehicle_bumblebee_cannon_damage = 60;
+float autocvar_g_vehicle_bumblebee_cannon_radius = 225;
+float autocvar_g_vehicle_bumblebee_cannon_refire = 0.2;
+float autocvar_g_vehicle_bumblebee_cannon_speed = 20000;
+float autocvar_g_vehicle_bumblebee_cannon_spread = 0.02;
+float autocvar_g_vehicle_bumblebee_cannon_force = -35;
 
 bool bumble_raygun_send(entity this, entity to, int sf);
 
diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc
index b9a1a7174..414a2c8d6 100644
--- a/qcsrc/common/vehicles/vehicle/racer.qc
+++ b/qcsrc/common/vehicles/vehicle/racer.qc
@@ -31,67 +31,75 @@ REGISTER_VEHICLE(RACER, NEW(Racer));
 #ifdef SVQC
 #include <common/triggers/trigger/impulse.qh>
 
-bool autocvar_g_vehicle_racer;
+bool autocvar_g_vehicle_racer = true;
 
-float autocvar_g_vehicle_racer_speed_afterburn;
-float autocvar_g_vehicle_racer_afterburn_cost;
+float autocvar_g_vehicle_racer_speed_afterburn = 3000;
+// energy consumed per second
+float autocvar_g_vehicle_racer_afterburn_cost = 100;
 
-float autocvar_g_vehicle_racer_waterburn_cost;
-float autocvar_g_vehicle_racer_waterburn_speed;
+float autocvar_g_vehicle_racer_waterburn_cost = 5;
+float autocvar_g_vehicle_racer_waterburn_speed = 750;
 
-float autocvar_g_vehicle_racer_water_speed_forward;
-float autocvar_g_vehicle_racer_water_speed_strafe;
+float autocvar_g_vehicle_racer_water_speed_forward = 600;
+float autocvar_g_vehicle_racer_water_speed_strafe = 600;
 
 float autocvar_g_vehicle_racer_pitchlimit = 30;
 
 float autocvar_g_vehicle_racer_water_downforce = 0.03;
 float autocvar_g_vehicle_racer_water_upforcedamper = 15;
 
-float autocvar_g_vehicle_racer_anglestabilizer;
-float autocvar_g_vehicle_racer_downforce;
+float autocvar_g_vehicle_racer_anglestabilizer = 1.75;
+float autocvar_g_vehicle_racer_downforce = 0.01;
 
-float autocvar_g_vehicle_racer_speed_forward;
-float autocvar_g_vehicle_racer_speed_strafe;
-float autocvar_g_vehicle_racer_springlength;
-float autocvar_g_vehicle_racer_upforcedamper;
-float autocvar_g_vehicle_racer_friction;
+float autocvar_g_vehicle_racer_speed_forward = 650;
+float autocvar_g_vehicle_racer_speed_strafe = 650;
+float autocvar_g_vehicle_racer_springlength = 70;
+float autocvar_g_vehicle_racer_upforcedamper = 10;
+float autocvar_g_vehicle_racer_friction = 0.45;
 
 float autocvar_g_vehicle_racer_water_time = 5;
 
-float autocvar_g_vehicle_racer_hovertype;
-float autocvar_g_vehicle_racer_hoverpower;
+float autocvar_g_vehicle_racer_collision_multiplier = 0.05;
 
-float autocvar_g_vehicle_racer_turnroll;
-float autocvar_g_vehicle_racer_turnspeed;
-float autocvar_g_vehicle_racer_pitchspeed;
+// 0 = hover, != 0 = maglev
+int autocvar_g_vehicle_racer_hovertype = 0;
+// NOTE!! x 4 (4 engines)
+float autocvar_g_vehicle_racer_hoverpower = 8000;
 
-float autocvar_g_vehicle_racer_energy;
-float autocvar_g_vehicle_racer_energy_regen;
-float autocvar_g_vehicle_racer_energy_regen_pause;
+float autocvar_g_vehicle_racer_turnroll = 30;
+float autocvar_g_vehicle_racer_turnspeed = 220;
+float autocvar_g_vehicle_racer_pitchspeed = 125;
 
-float autocvar_g_vehicle_racer_health;
-float autocvar_g_vehicle_racer_health_regen;
-float autocvar_g_vehicle_racer_health_regen_pause;
+float autocvar_g_vehicle_racer_energy = 100;
+float autocvar_g_vehicle_racer_energy_regen = 50;
+float autocvar_g_vehicle_racer_energy_regen_pause = 1;
 
-float autocvar_g_vehicle_racer_shield;
-float autocvar_g_vehicle_racer_shield_regen;
-float autocvar_g_vehicle_racer_shield_regen_pause;
+float autocvar_g_vehicle_racer_health = 200;
+float autocvar_g_vehicle_racer_health_regen = 0;
+float autocvar_g_vehicle_racer_health_regen_pause = 0;
 
-float autocvar_g_vehicle_racer_rocket_locktarget;
-float autocvar_g_vehicle_racer_rocket_locking_time;
-float autocvar_g_vehicle_racer_rocket_locking_releasetime;
-float autocvar_g_vehicle_racer_rocket_locked_time;
+float autocvar_g_vehicle_racer_shield = 100;
+float autocvar_g_vehicle_racer_shield_regen = 30;
+float autocvar_g_vehicle_racer_shield_regen_pause = 1;
 
-float autocvar_g_vehicle_racer_respawntime;
+bool autocvar_g_vehicle_racer_rocket_locktarget = true;
+float autocvar_g_vehicle_racer_rocket_locking_time = 0.9;
+float autocvar_g_vehicle_racer_rocket_locking_releasetime = 0.5;
+float autocvar_g_vehicle_racer_rocket_locked_time = 4;
 
-float autocvar_g_vehicle_racer_blowup_radius;
-float autocvar_g_vehicle_racer_blowup_coredamage;
-float autocvar_g_vehicle_racer_blowup_edgedamage;
-float autocvar_g_vehicle_racer_blowup_forceintensity;
+float autocvar_g_vehicle_racer_respawntime = 35;
 
-float autocvar_g_vehicle_racer_bouncefactor;
-float autocvar_g_vehicle_racer_bouncestop;
-vector autocvar_g_vehicle_racer_bouncepain;
+float autocvar_g_vehicle_racer_blowup_radius = 250;
+float autocvar_g_vehicle_racer_blowup_coredamage = 250;
+float autocvar_g_vehicle_racer_blowup_edgedamage = 15;
+float autocvar_g_vehicle_racer_blowup_forceintensity = 250;
+
+// Factor of old velocity to keep after collision
+float autocvar_g_vehicle_racer_bouncefactor = 0.25;
+// if != 0, New veloctiy after bounce = 0 if new velocity < this
+float autocvar_g_vehicle_racer_bouncestop = 0;
+// "minspeed_for_pain speedchange_to_pain_factor max_damage"
+vector autocvar_g_vehicle_racer_bouncepain = '60 0.75 300';
 
 .float racer_watertime;
 
diff --git a/qcsrc/common/vehicles/vehicle/racer_weapon.qc b/qcsrc/common/vehicles/vehicle/racer_weapon.qc
index 675d8f17b..b8fbc11d1 100644
--- a/qcsrc/common/vehicles/vehicle/racer_weapon.qc
+++ b/qcsrc/common/vehicles/vehicle/racer_weapon.qc
@@ -13,7 +13,6 @@ REGISTER_WEAPON(RACER, NEW(RacerAttack));
 
 // TODO: move into implementation
 #ifdef SVQC
-float autocvar_g_vehicle_racer_rocket_refire;
 void racer_fire_rocket(entity player, vector org, vector dir, entity trg);
 #endif
 
@@ -23,23 +22,24 @@ void racer_fire_rocket(entity player, vector org, vector dir, entity trg);
 
 #ifdef SVQC
 
-float autocvar_g_vehicle_racer_cannon_cost;
-float autocvar_g_vehicle_racer_cannon_damage;
-float autocvar_g_vehicle_racer_cannon_radius;
-float autocvar_g_vehicle_racer_cannon_refire;
-float autocvar_g_vehicle_racer_cannon_speed;
-float autocvar_g_vehicle_racer_cannon_spread;
-float autocvar_g_vehicle_racer_cannon_force;
-
-float autocvar_g_vehicle_racer_rocket_accel;
-float autocvar_g_vehicle_racer_rocket_damage;
-float autocvar_g_vehicle_racer_rocket_radius;
-float autocvar_g_vehicle_racer_rocket_force;
-float autocvar_g_vehicle_racer_rocket_speed;
-float autocvar_g_vehicle_racer_rocket_turnrate;
-
-float autocvar_g_vehicle_racer_rocket_climbspeed;
-float autocvar_g_vehicle_racer_rocket_locked_maxangle;
+float autocvar_g_vehicle_racer_cannon_cost = 2;
+float autocvar_g_vehicle_racer_cannon_damage = 15;
+float autocvar_g_vehicle_racer_cannon_radius = 100;
+float autocvar_g_vehicle_racer_cannon_refire = 0.05;
+float autocvar_g_vehicle_racer_cannon_speed = 15000;
+float autocvar_g_vehicle_racer_cannon_spread = 0.0125;
+float autocvar_g_vehicle_racer_cannon_force = 50;
+
+float autocvar_g_vehicle_racer_rocket_accel = 1600;
+float autocvar_g_vehicle_racer_rocket_damage = 100;
+float autocvar_g_vehicle_racer_rocket_radius = 125;
+float autocvar_g_vehicle_racer_rocket_force = 350;
+float autocvar_g_vehicle_racer_rocket_speed = 900;
+float autocvar_g_vehicle_racer_rocket_turnrate = 0.2;
+float autocvar_g_vehicle_racer_rocket_refire = 3;
+
+float autocvar_g_vehicle_racer_rocket_climbspeed = 1600;
+float autocvar_g_vehicle_racer_rocket_locked_maxangle = 1.8;
 
 void racer_fire_rocket(entity player, vector org, vector dir, entity trg);
 METHOD(RacerAttack, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire))
diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc
index 8f8f3cf72..0ffcaa13b 100644
--- a/qcsrc/common/vehicles/vehicle/raptor.qc
+++ b/qcsrc/common/vehicles/vehicle/raptor.qc
@@ -31,48 +31,50 @@ REGISTER_VEHICLE(RAPTOR, NEW(Raptor));
 
 #ifdef SVQC
 
-bool autocvar_g_vehicle_raptor;
-
-float autocvar_g_vehicle_raptor_respawntime;
-float autocvar_g_vehicle_raptor_takeofftime;
-
-float autocvar_g_vehicle_raptor_movestyle;
-float autocvar_g_vehicle_raptor_turnspeed;
-float autocvar_g_vehicle_raptor_pitchspeed;
-float autocvar_g_vehicle_raptor_pitchlimit;
-
-float autocvar_g_vehicle_raptor_speed_forward;
-float autocvar_g_vehicle_raptor_speed_strafe;
-float autocvar_g_vehicle_raptor_speed_up;
-float autocvar_g_vehicle_raptor_speed_down;
-float autocvar_g_vehicle_raptor_friction;
-
-float autocvar_g_vehicle_raptor_cannon_turnspeed;
-float autocvar_g_vehicle_raptor_cannon_turnlimit;
-float autocvar_g_vehicle_raptor_cannon_pitchlimit_up;
-float autocvar_g_vehicle_raptor_cannon_pitchlimit_down;
-
-float autocvar_g_vehicle_raptor_cannon_locktarget;
-float autocvar_g_vehicle_raptor_cannon_locking_time;
-float autocvar_g_vehicle_raptor_cannon_locking_releasetime;
-float autocvar_g_vehicle_raptor_cannon_locked_time;
-float autocvar_g_vehicle_raptor_cannon_predicttarget;
-
-float autocvar_g_vehicle_raptor_energy;
-float autocvar_g_vehicle_raptor_energy_regen;
-float autocvar_g_vehicle_raptor_energy_regen_pause;
-
-float autocvar_g_vehicle_raptor_health;
-float autocvar_g_vehicle_raptor_health_regen;
-float autocvar_g_vehicle_raptor_health_regen_pause;
-
-float autocvar_g_vehicle_raptor_shield;
-float autocvar_g_vehicle_raptor_shield_regen;
-float autocvar_g_vehicle_raptor_shield_regen_pause;
-
-float autocvar_g_vehicle_raptor_bouncefactor;
-float autocvar_g_vehicle_raptor_bouncestop;
-vector autocvar_g_vehicle_raptor_bouncepain;
+bool autocvar_g_vehicle_raptor = true;
+
+float autocvar_g_vehicle_raptor_respawntime = 40;
+float autocvar_g_vehicle_raptor_takeofftime = 1.5;
+
+// 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
+int autocvar_g_vehicle_raptor_movestyle = 1;
+float autocvar_g_vehicle_raptor_turnspeed = 200;
+float autocvar_g_vehicle_raptor_pitchspeed = 50;
+float autocvar_g_vehicle_raptor_pitchlimit = 45;
+
+float autocvar_g_vehicle_raptor_speed_forward = 1700;
+float autocvar_g_vehicle_raptor_speed_strafe = 900;
+float autocvar_g_vehicle_raptor_speed_up = 1700;
+float autocvar_g_vehicle_raptor_speed_down = 1700;
+float autocvar_g_vehicle_raptor_friction = 2;
+
+float autocvar_g_vehicle_raptor_cannon_turnspeed = 120;
+float autocvar_g_vehicle_raptor_cannon_turnlimit = 20;
+float autocvar_g_vehicle_raptor_cannon_pitchlimit_up = 12;
+float autocvar_g_vehicle_raptor_cannon_pitchlimit_down = 32;
+
+float autocvar_g_vehicle_raptor_cannon_locktarget = 0;
+float autocvar_g_vehicle_raptor_cannon_locking_time = 0.2;
+float autocvar_g_vehicle_raptor_cannon_locking_releasetime = 0.45;
+float autocvar_g_vehicle_raptor_cannon_locked_time = 1;
+float autocvar_g_vehicle_raptor_cannon_predicttarget = 1;
+
+float autocvar_g_vehicle_raptor_energy = 100;
+float autocvar_g_vehicle_raptor_energy_regen = 25;
+float autocvar_g_vehicle_raptor_energy_regen_pause = 0.25;
+
+float autocvar_g_vehicle_raptor_health = 150;
+float autocvar_g_vehicle_raptor_health_regen = 0;
+float autocvar_g_vehicle_raptor_health_regen_pause = 0;
+
+float autocvar_g_vehicle_raptor_shield = 75;
+float autocvar_g_vehicle_raptor_shield_regen = 25;
+float autocvar_g_vehicle_raptor_shield_regen_pause = 1.5;
+
+float autocvar_g_vehicle_raptor_bouncefactor = 0.2;
+float autocvar_g_vehicle_raptor_bouncestop = 0;
+vector autocvar_g_vehicle_raptor_bouncepain = '1 4 1000';
 
 .entity bomb1;
 .entity bomb2;
diff --git a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc
index 175dbd099..819d8ba0f 100644
--- a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc
@@ -33,23 +33,23 @@ REGISTER_WEAPON(RAPTOR_FLARE, NEW(RaptorFlare));
 
 #ifdef SVQC
 
-float autocvar_g_vehicle_raptor_cannon_cost;
-float autocvar_g_vehicle_raptor_cannon_damage;
-float autocvar_g_vehicle_raptor_cannon_radius;
-float autocvar_g_vehicle_raptor_cannon_refire;
-float autocvar_g_vehicle_raptor_cannon_speed;
-float autocvar_g_vehicle_raptor_cannon_spread;
-float autocvar_g_vehicle_raptor_cannon_force;
-
-float autocvar_g_vehicle_raptor_bomblets;
-float autocvar_g_vehicle_raptor_bomblet_alt;
-float autocvar_g_vehicle_raptor_bomblet_time;
-float autocvar_g_vehicle_raptor_bomblet_damage;
-float autocvar_g_vehicle_raptor_bomblet_spread;
-float autocvar_g_vehicle_raptor_bomblet_edgedamage;
-float autocvar_g_vehicle_raptor_bomblet_radius;
-float autocvar_g_vehicle_raptor_bomblet_force;
-float autocvar_g_vehicle_raptor_bomblet_explode_delay;
+float autocvar_g_vehicle_raptor_cannon_cost = 1;
+float autocvar_g_vehicle_raptor_cannon_damage = 10;
+float autocvar_g_vehicle_raptor_cannon_radius = 60;
+float autocvar_g_vehicle_raptor_cannon_refire = 0.03;
+float autocvar_g_vehicle_raptor_cannon_speed = 24000;
+float autocvar_g_vehicle_raptor_cannon_spread = 0.01;
+float autocvar_g_vehicle_raptor_cannon_force = 25;
+
+float autocvar_g_vehicle_raptor_bomblets = 8;
+float autocvar_g_vehicle_raptor_bomblet_alt = 750;
+float autocvar_g_vehicle_raptor_bomblet_time = 0.5;
+float autocvar_g_vehicle_raptor_bomblet_damage = 55;
+float autocvar_g_vehicle_raptor_bomblet_spread = 0.4;
+float autocvar_g_vehicle_raptor_bomblet_edgedamage = 25;
+float autocvar_g_vehicle_raptor_bomblet_radius = 350;
+float autocvar_g_vehicle_raptor_bomblet_force = 150;
+float autocvar_g_vehicle_raptor_bomblet_explode_delay = 0.4;
 
 METHOD(RaptorCannon, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire)) {
     bool isPlayer = IS_PLAYER(actor);
@@ -85,7 +85,7 @@ METHOD(RaptorCannon, wr_checkammo1, bool(RacerAttack thiswep)) {
     return isPlayer || veh.vehicle_energy >= autocvar_g_vehicle_raptor_cannon_cost;
 }
 
-float autocvar_g_vehicle_raptor_bombs_refire;
+float autocvar_g_vehicle_raptor_bombs_refire = 5;
 
 void raptor_bombdrop();
 METHOD(RaptorBomb, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire)) {
@@ -100,10 +100,10 @@ METHOD(RaptorBomb, wr_think, void(entity thiswep, entity actor, .entity weaponen
     }
 }
 
-float autocvar_g_vehicle_raptor_flare_refire;
-float autocvar_g_vehicle_raptor_flare_lifetime;
-float autocvar_g_vehicle_raptor_flare_chase;
-float autocvar_g_vehicle_raptor_flare_range;
+float autocvar_g_vehicle_raptor_flare_refire = 5;
+float autocvar_g_vehicle_raptor_flare_lifetime = 10;
+float autocvar_g_vehicle_raptor_flare_chase = 0.9;
+float autocvar_g_vehicle_raptor_flare_range = 2000;
 
 void raptor_flare_think();
 void raptor_flare_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc
index 589f6ff9e..3a099f109 100644
--- a/qcsrc/common/vehicles/vehicle/spiderbot.qc
+++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc
@@ -36,37 +36,38 @@ const int SBRM_LAST = 3;
 #include "spiderbot_weapons.qc"
 
 #ifdef SVQC
-bool autocvar_g_vehicle_spiderbot;
+bool autocvar_g_vehicle_spiderbot = true;
 
-float autocvar_g_vehicle_spiderbot_respawntime;
+float autocvar_g_vehicle_spiderbot_respawntime = 45;
 
-float autocvar_g_vehicle_spiderbot_speed_stop;
-float autocvar_g_vehicle_spiderbot_speed_strafe;
-float autocvar_g_vehicle_spiderbot_speed_walk;
+float autocvar_g_vehicle_spiderbot_speed_stop = 50;
+float autocvar_g_vehicle_spiderbot_speed_strafe = 400;
+float autocvar_g_vehicle_spiderbot_speed_walk = 500;
 float autocvar_g_vehicle_spiderbot_speed_run = 700;
-float autocvar_g_vehicle_spiderbot_turnspeed;
-float autocvar_g_vehicle_spiderbot_turnspeed_strafe;
-float autocvar_g_vehicle_spiderbot_movement_inertia;
-
-float autocvar_g_vehicle_spiderbot_springlength;
-float autocvar_g_vehicle_spiderbot_springup;
-float autocvar_g_vehicle_spiderbot_springblend;
-float autocvar_g_vehicle_spiderbot_tiltlimit;
-
-float autocvar_g_vehicle_spiderbot_head_pitchlimit_down;
-float autocvar_g_vehicle_spiderbot_head_pitchlimit_up;
-float autocvar_g_vehicle_spiderbot_head_turnlimit;
-float autocvar_g_vehicle_spiderbot_head_turnspeed;
-
-int autocvar_g_vehicle_spiderbot_health;
-float autocvar_g_vehicle_spiderbot_health_regen;
-float autocvar_g_vehicle_spiderbot_health_regen_pause;
-
-int autocvar_g_vehicle_spiderbot_shield;
-float autocvar_g_vehicle_spiderbot_shield_regen;
-float autocvar_g_vehicle_spiderbot_shield_regen_pause;
-
-vector autocvar_g_vehicle_spiderbot_bouncepain;
+float autocvar_g_vehicle_spiderbot_turnspeed = 90;
+float autocvar_g_vehicle_spiderbot_turnspeed_strafe = 300;
+float autocvar_g_vehicle_spiderbot_movement_inertia = 0.15;
+
+float autocvar_g_vehicle_spiderbot_springlength = 150;
+float autocvar_g_vehicle_spiderbot_springup = 20;
+float autocvar_g_vehicle_spiderbot_springblend = 0.1;
+float autocvar_g_vehicle_spiderbot_tiltlimit = 90;
+
+float autocvar_g_vehicle_spiderbot_head_pitchlimit_down = -20;
+float autocvar_g_vehicle_spiderbot_head_pitchlimit_up = 30;
+float autocvar_g_vehicle_spiderbot_head_turnlimit = 90;
+float autocvar_g_vehicle_spiderbot_head_turnspeed = 110;
+
+int autocvar_g_vehicle_spiderbot_health = 800;
+float autocvar_g_vehicle_spiderbot_health_regen = 10;
+float autocvar_g_vehicle_spiderbot_health_regen_pause = 5;
+
+int autocvar_g_vehicle_spiderbot_shield = 200;
+float autocvar_g_vehicle_spiderbot_shield_regen = 25;
+float autocvar_g_vehicle_spiderbot_shield_regen_pause = 0.35;
+
+// 'minspeed_for_pain speedchange_to_pain_factor max_damage'
+vector autocvar_g_vehicle_spiderbot_bouncepain = '0 0 0';
 
 .float jump_delay;
 float spiderbot_frame()
diff --git a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
index 9dfc72c13..7266fc32e 100644
--- a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc
@@ -9,28 +9,30 @@
 
 #ifdef SVQC
 
-float autocvar_g_vehicle_spiderbot_minigun_damage;
-float autocvar_g_vehicle_spiderbot_minigun_refire;
-float autocvar_g_vehicle_spiderbot_minigun_spread;
-int autocvar_g_vehicle_spiderbot_minigun_ammo_cost;
-int autocvar_g_vehicle_spiderbot_minigun_ammo_max;
-int autocvar_g_vehicle_spiderbot_minigun_ammo_regen;
-float autocvar_g_vehicle_spiderbot_minigun_ammo_regen_pause;
-float autocvar_g_vehicle_spiderbot_minigun_force;
-float autocvar_g_vehicle_spiderbot_minigun_solidpenetration;
-
-float autocvar_g_vehicle_spiderbot_rocket_damage;
-float autocvar_g_vehicle_spiderbot_rocket_force;
-float autocvar_g_vehicle_spiderbot_rocket_radius;
-float autocvar_g_vehicle_spiderbot_rocket_speed;
-float autocvar_g_vehicle_spiderbot_rocket_spread;
-float autocvar_g_vehicle_spiderbot_rocket_refire;
-float autocvar_g_vehicle_spiderbot_rocket_refire2;
-float autocvar_g_vehicle_spiderbot_rocket_reload;
-float autocvar_g_vehicle_spiderbot_rocket_health;
-float autocvar_g_vehicle_spiderbot_rocket_noise;
-float autocvar_g_vehicle_spiderbot_rocket_turnrate;
-float autocvar_g_vehicle_spiderbot_rocket_lifetime;
+// 400 (x2) DPS
+float autocvar_g_vehicle_spiderbot_minigun_damage = 24;
+float autocvar_g_vehicle_spiderbot_minigun_refire = 0.06;
+float autocvar_g_vehicle_spiderbot_minigun_spread = 0.015;
+int autocvar_g_vehicle_spiderbot_minigun_ammo_cost = 1;
+int autocvar_g_vehicle_spiderbot_minigun_ammo_max = 100;
+int autocvar_g_vehicle_spiderbot_minigun_ammo_regen = 40;
+float autocvar_g_vehicle_spiderbot_minigun_ammo_regen_pause = 1;
+float autocvar_g_vehicle_spiderbot_minigun_force = 9;
+float autocvar_g_vehicle_spiderbot_minigun_solidpenetration = 32;
+
+float autocvar_g_vehicle_spiderbot_rocket_damage = 50;
+float autocvar_g_vehicle_spiderbot_rocket_force = 150;
+float autocvar_g_vehicle_spiderbot_rocket_radius = 250;
+float autocvar_g_vehicle_spiderbot_rocket_speed = 3500;
+float autocvar_g_vehicle_spiderbot_rocket_spread = 0.05;
+float autocvar_g_vehicle_spiderbot_rocket_refire = 0.1;
+// volley
+float autocvar_g_vehicle_spiderbot_rocket_refire2 = 0.025;
+float autocvar_g_vehicle_spiderbot_rocket_reload = 4;
+float autocvar_g_vehicle_spiderbot_rocket_health = 100;
+float autocvar_g_vehicle_spiderbot_rocket_noise = 0.2;
+float autocvar_g_vehicle_spiderbot_rocket_turnrate = 0.25;
+float autocvar_g_vehicle_spiderbot_rocket_lifetime = 20;
 
 void spiderbot_rocket_artillery()
 {SELFPARAM();
diff --git a/vehicle_bumblebee.cfg b/vehicle_bumblebee.cfg
deleted file mode 100644
index 705d2a988..000000000
--- a/vehicle_bumblebee.cfg
+++ /dev/null
@@ -1,64 +0,0 @@
-set g_vehicle_bumblebee_respawntime              60
-
-set g_vehicle_bumblebee_speed_forward            350
-set g_vehicle_bumblebee_speed_strafe             350
-set g_vehicle_bumblebee_speed_up                 350
-set g_vehicle_bumblebee_speed_down               350
-set g_vehicle_bumblebee_turnspeed                120
-set g_vehicle_bumblebee_pitchspeed               60
-set g_vehicle_bumblebee_pitchlimit               60
-set g_vehicle_bumblebee_friction                 0.5
-
-set g_vehicle_bumblebee_energy                   500
-set g_vehicle_bumblebee_energy_regen             50
-set g_vehicle_bumblebee_energy_regen_pause       1
-
-set g_vehicle_bumblebee_health                   1000
-set g_vehicle_bumblebee_health_regen             65
-set g_vehicle_bumblebee_health_regen_pause       10
-
-set g_vehicle_bumblebee_shield                   400
-set g_vehicle_bumblebee_shield_regen             150
-set g_vehicle_bumblebee_shield_regen_pause       0.75
-
-set g_vehicle_bumblebee_cannon_lock				0
-set g_vehicle_bumblebee_cannon_cost				2
-set g_vehicle_bumblebee_cannon_damage			60
-set g_vehicle_bumblebee_cannon_radius			225
-set g_vehicle_bumblebee_cannon_refire			0.2
-set g_vehicle_bumblebee_cannon_speed			20000
-set g_vehicle_bumblebee_cannon_spread			0.02
-set g_vehicle_bumblebee_cannon_force			-35
-set g_vehicle_bumblebee_cannon_turnspeed		160
-set g_vehicle_bumblebee_cannon_pitchlimit_down	60
-set g_vehicle_bumblebee_cannon_pitchlimit_up	60
-set g_vehicle_bumblebee_cannon_turnlimit_in		20
-set g_vehicle_bumblebee_cannon_turnlimit_out	80
-set g_vehicle_bumblebee_cannon_ammo				100
-set g_vehicle_bumblebee_cannon_ammo_regen		100
-set g_vehicle_bumblebee_cannon_ammo_regen_pause 	1
-
-set g_vehicle_bumblebee_raygun_turnspeed 180
-set g_vehicle_bumblebee_raygun_pitchlimit_down 20
-set g_vehicle_bumblebee_raygun_pitchlimit_up 5
-set g_vehicle_bumblebee_raygun_turnlimit_sides 35
-
-set g_vehicle_bumblebee_raygun 0
-set g_vehicle_bumblebee_raygun_range 2048
-set g_vehicle_bumblebee_raygun_dps 250
-set g_vehicle_bumblebee_raygun_aps 100
-set g_vehicle_bumblebee_raygun_fps 100
-
-set g_vehicle_bumblebee_healgun_hps 150
-set g_vehicle_bumblebee_healgun_hmax 100
-set g_vehicle_bumblebee_healgun_aps 75
-set g_vehicle_bumblebee_healgun_amax 100
-set g_vehicle_bumblebee_healgun_sps 100
-set g_vehicle_bumblebee_healgun_smax 100
-set g_vehicle_bumblebee_healgun_locktime 2.5
-
-set g_vehicle_bumblebee_blowup_radius            500
-set g_vehicle_bumblebee_blowup_coredamage        500
-set g_vehicle_bumblebee_blowup_edgedamage        100
-set g_vehicle_bumblebee_blowup_forceintensity    600
-set g_vehicle_bumblebee_bouncepain "1 100 200"
\ No newline at end of file
diff --git a/vehicle_racer.cfg b/vehicle_racer.cfg
deleted file mode 100644
index c43decb3e..000000000
--- a/vehicle_racer.cfg
+++ /dev/null
@@ -1,74 +0,0 @@
-set g_vehicle_racer_respawntime		    35
-
-set g_vehicle_racer_health              200
-set g_vehicle_racer_health_regen        0
-set g_vehicle_racer_health_regen_pause  0
-
-set g_vehicle_racer_shield              100
-set g_vehicle_racer_shield_regen        30
-set g_vehicle_racer_shield_regen_pause  1
-
-set g_vehicle_racer_energy              100
-set g_vehicle_racer_energy_regen        50
-set g_vehicle_racer_energy_regen_pause  1
-
-set g_vehicle_racer_speed_stop          2500
-set g_vehicle_racer_speed_forward       650
-set g_vehicle_racer_speed_strafe        650
-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
-
-set g_vehicle_racer_downforce            0.01
-set g_vehicle_racer_springlength         70
-set g_vehicle_racer_collision_multiplier 0.05
-set g_vehicle_racer_anglestabilizer      1.75
-
-set g_vehicle_racer_turnspeed          220
-set g_vehicle_racer_pitchspeed         125
-set g_vehicle_racer_maxpitch           25
-set g_vehicle_racer_turnroll           30
-
-set g_vehicle_racer_cannon_speed        15000
-set g_vehicle_racer_cannon_damage       15
-set g_vehicle_racer_cannon_radius       100
-set g_vehicle_racer_cannon_refire       0.05
-set g_vehicle_racer_cannon_cost         2
-set g_vehicle_racer_cannon_spread       0.0125
-set g_vehicle_racer_cannon_force        50
-
-set g_vehicle_racer_rocket_speed       900
-set g_vehicle_racer_rocket_accel       1600
-set g_vehicle_racer_rocket_turnrate    0.2
-set g_vehicle_racer_rocket_damage      100
-set g_vehicle_racer_rocket_force       350
-set g_vehicle_racer_rocket_radius      125
-set g_vehicle_racer_rocket_refire      3
-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.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
-
-set g_vehicle_racer_blowup_radius           250
-set g_vehicle_racer_blowup_coredamage       250
-set g_vehicle_racer_blowup_edgedamage       15
-set g_vehicle_racer_blowup_forceintensity   250
-
-set g_vehicle_racer_bouncefactor 0.25   // Factor of old velocity to keep after colission
-set g_vehicle_racer_bouncestop 0        // if != 0, New veloctiy after bounce = 0 if new velocity < this
-set g_vehicle_racer_bouncepain "60 0.75 300" // "minspeed_for_pain speedchange_to_pain_factor max_damage"
-
-set g_vehicle_racer_mass                    900
diff --git a/vehicle_raptor.cfg b/vehicle_raptor.cfg
deleted file mode 100644
index 86864eef1..000000000
--- a/vehicle_raptor.cfg
+++ /dev/null
@@ -1,77 +0,0 @@
-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.4
-
-set g_vehicle_raptor_takeofftime 1.5
-
-set g_vehicle_raptor_turnspeed  200
-set g_vehicle_raptor_pitchspeed 50
-set g_vehicle_raptor_pitchlimit 45
-
-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.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.4
-set g_vehicle_raptor_bombs_refire       5
-
-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          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   10
-set g_vehicle_raptor_cannon_radius   60
-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             100
-set g_vehicle_raptor_energy_regen       25
-set g_vehicle_raptor_energy_regen_pause 0.25
-
-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             75
-set g_vehicle_raptor_shield_regen       25
-set g_vehicle_raptor_shield_regen_pause 1.5
-
-set g_vehicle_raptor_blowup_radius           250
-set g_vehicle_raptor_blowup_coredamage       250
-set g_vehicle_raptor_blowup_edgedamage       15
-set g_vehicle_raptor_blowup_forceintensity   250
-
-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
diff --git a/vehicle_spiderbot.cfg b/vehicle_spiderbot.cfg
deleted file mode 100644
index 0172053c0..000000000
--- a/vehicle_spiderbot.cfg
+++ /dev/null
@@ -1,64 +0,0 @@
-set g_vehicle_spiderbot_respawntime			  45
-
-set g_vehicle_spiderbot_health                800
-set g_vehicle_spiderbot_health_regen       	  10
-set g_vehicle_spiderbot_health_regen_pause    5
-
-set g_vehicle_spiderbot_shield                200
-set g_vehicle_spiderbot_shield_block          1
-set g_vehicle_spiderbot_shield_regen          25
-set g_vehicle_spiderbot_shield_regen_pause    0.35
-
-set g_vehicle_spiderbot_energy              0
-set g_vehicle_spiderbot_energy_regen        0
-set g_vehicle_spiderbot_energy_regen_pause  0
-
-set g_vehicle_spiderbot_turnspeed            90
-set g_vehicle_spiderbot_turnspeed_strafe     300
-set g_vehicle_spiderbot_head_turnspeed       110
-set g_vehicle_spiderbot_head_turnlimit       90
-set g_vehicle_spiderbot_head_pitchlimit_up   30
-set g_vehicle_spiderbot_head_pitchlimit_down -20
-
-set g_vehicle_spiderbot_speed_stop         50
-set g_vehicle_spiderbot_speed_walk         500
-set g_vehicle_spiderbot_speed_strafe       400
-set g_vehicle_spiderbot_movement_inertia   0.15
-set g_vehicle_spiderbot_tiltlimit          90
-
-set g_vehicle_spiderbot_minigun_damage          24       // 400 (x2) DPS
-set g_vehicle_spiderbot_minigun_refire          0.06
-set g_vehicle_spiderbot_minigun_force           9
-set g_vehicle_spiderbot_minigun_spread          0.015
-set g_vehicle_spiderbot_minigun_solidpenetration 32
-set g_vehicle_spiderbot_minigun_ammo_cost       1
-set g_vehicle_spiderbot_minigun_ammo_max        100
-set g_vehicle_spiderbot_minigun_ammo_regen      40
-set g_vehicle_spiderbot_minigun_ammo_regen_pause 1
-
-set g_vehicle_spiderbot_springlength        150
-set g_vehicle_spiderbot_springup            20
-set g_vehicle_spiderbot_springblend         0.1
-
-set g_vehicle_spiderbot_rocket_health     100
-set g_vehicle_spiderbot_rocket_damage     50
-set g_vehicle_spiderbot_rocket_edgedamage 25
-set g_vehicle_spiderbot_rocket_force      150
-set g_vehicle_spiderbot_rocket_radius     250
-set g_vehicle_spiderbot_rocket_reload     4
-set g_vehicle_spiderbot_rocket_refire     0.1
-set g_vehicle_spiderbot_rocket_refire2    0.025  // volly
-set g_vehicle_spiderbot_rocket_speed      3500
-set g_vehicle_spiderbot_rocket_turnrate   0.25
-set g_vehicle_spiderbot_rocket_noise      0.2
-set g_vehicle_spiderbot_rocket_lifetime   20
-set g_vehicle_spiderbot_rocket_spread     0.05
-
-set g_vehicle_spiderbot_blowup_radius           250
-set g_vehicle_spiderbot_blowup_coredamage       250
-set g_vehicle_spiderbot_blowup_edgedamage       15
-set g_vehicle_spiderbot_blowup_forceintensity   250
-
-set g_vehicle_spiderbot_bouncefactor 0   // Factor of old velocity to keep after colission
-set g_vehicle_spiderbot_bouncestop 0        // if != 0, New veloctiy after bounce = 0 if new velocity < this
-set g_vehicle_spiderbot_bouncepain "0 0 0" // "minspeed_for_pain speedchange_to_pain_factor max_damage"
diff --git a/vehicles.cfg b/vehicles.cfg
deleted file mode 100644
index 0fefec6df..000000000
--- a/vehicles.cfg
+++ /dev/null
@@ -1,35 +0,0 @@
-set g_vehicles 1
-
-exec vehicle_racer.cfg
-exec vehicle_raptor.cfg
-exec vehicle_spiderbot.cfg
-exec vehicle_bumblebee.cfg
-
-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_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_vortex_damagerate 0.5
-set g_vehicles_machinegun_damagerate 0.65
-set g_vehicles_rifle_damagerate 1
-set g_vehicles_vaporizer_damagerate 0.8
-set g_vehicles_tag_damagerate 2
-