From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 26 Feb 2011 23:09:19 +0000 (+0200)
Subject: Integrate acmor cvars back in the config file (except for the pickup ones, as we... 
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=e6cf8172184eed38fd17f0ff9848ed5d15cd5288

Integrate acmor cvars back in the config file (except for the pickup ones, as we won't have that).
---

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