Integrate acmor cvars back in the config file (except for the pickup ones, as we...

diff --git a/data/balance.cfg b/data/balance.cfg
index 00852c024dcef03b3f9149d9cdb146e216ac8736..98de20eafcb3b89415ccf50977d7aa38219f71d8 100644 (file)
--- a/data/balance.cfg
+++ b/data/balance.cfg
@@ -1,10 +1,6 @@
 // {{{ deprecated armor system\r
-// the armor system is NOT supported in Vore Tournament by default!\r
+// armor pickups are NOT supported in Vore Tournament by default!\r
 // the code however still exists, and these cvars are required for compatibility\r
-// the armor code is still there and can be used in mods, although it's recommended not to\r
-set g_balance_armor_start 0\r
-set g_warmup_start_armor 100 "starting values when being in warmup-stage"\r
-set g_lms_start_armor 100\r
 set g_pickup_armorsmall 10\r
 set g_pickup_armorsmall_max 100\r
 set g_pickup_armormedium 25\r
@@ -13,16 +9,6 @@ set g_pickup_armorbig 50
 set g_pickup_armorbig_max 100\r
 set g_pickup_armorlarge 100\r
 set g_pickup_armorlarge_max 100\r
-set g_balance_armor_regen 0\r
-set g_balance_armor_regenlinear 0\r
-set g_balance_armor_rot 0\r
-set g_balance_armor_rotlinear 0\r
-set g_balance_pause_armor_rot 1\r
-set g_balance_pause_armor_rot_spawn 1\r
-set g_balance_armor_regenstable 100\r
-set g_balance_armor_rotstable 100\r
-set g_balance_armor_limit 999\r
-set g_balance_armor_blockpercent 0.6\r
 // }}}\r
 \r
 // {{{ weapon replacement\r
@@ -38,10 +24,13 @@ set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (f
 // {{{ starting gear\r
 set g_start_weapon_grabber -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"\r
 set g_balance_health_start 100\r
+set g_balance_armor_start 0\r
 set g_start_ammo_fuel 100\r
 set g_warmup_start_health 200 "starting values when being in warmup-stage"\r
+set g_warmup_start_armor 100 "starting values when being in warmup-stage"\r
 set g_warmup_start_ammo_fuel 150 "starting values when being in warmup-stage"\r
 set g_lms_start_health 200\r
+set g_lms_start_armor 100\r
 set g_lms_start_ammo_fuel 150\r
 // }}}\r
 \r
@@ -74,15 +63,25 @@ set g_pickup_respawntimejitter_ammo 0
 // {{{ regen/rot\r
 set g_balance_health_regen 0\r
 set g_balance_health_regenlinear 5\r
+set g_balance_armor_regen 0\r
+set g_balance_armor_regenlinear 0\r
 set g_balance_pause_health_regen 5\r
 set g_balance_pause_health_regen_spawn 0\r
 set g_balance_health_rot 0\r
 set g_balance_health_rotlinear 5\r
+set g_balance_armor_rot 0\r
+set g_balance_armor_rotlinear 0\r
 set g_balance_pause_health_rot 3\r
 set g_balance_pause_health_rot_spawn 1\r
+set g_balance_pause_armor_rot 3\r
+set g_balance_pause_armor_rot_spawn 5\r
 set g_balance_health_regenstable 25\r
 set g_balance_health_rotstable 150\r
 set g_balance_health_limit 200\r
+set g_balance_armor_regenstable 100\r
+set g_balance_armor_rotstable 100\r
+set g_balance_armor_limit 100\r
+set g_balance_armor_blockpercent 0.6\r
 set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"\r
 set g_balance_fuel_regenlinear 0\r
 set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter\r