Merge remote branch 'origin/terencehill/physics_panel_updates'

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

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index 0eea02485b26a8604463b3393aeb9118d0080180..2da131c96cbf13ea93f6b300ecb0b3b2ee2267bc 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -1,3 +1,5 @@
+g_mod_balance XPM
+
 // {{{ starting gear
 set g_start_weapon_laser -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_start_weapon_shotgun -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -72,25 +74,25 @@ set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
 set g_pickup_fuel_max 100
 set g_pickup_armorsmall 5
-set g_pickup_armorsmall_max 100
+set g_pickup_armorsmall_max 200
 set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 100
 set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 200
+set g_pickup_armorbig_max 100
 set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 200
 set g_pickup_armorlarge_anyway 0
 set g_pickup_healthsmall 5
-set g_pickup_healthsmall_max 100
+set g_pickup_healthsmall_max 200
 set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 100
 set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_max 100
 set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
@@ -116,7 +118,7 @@ set g_balance_health_regen 0.08
 set g_balance_health_regenlinear 0.5
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0.04
+set g_balance_health_rot 0.03
 set g_balance_health_rotlinear 0.75
 set g_balance_pause_health_rot 1
 set g_balance_pause_health_rot_spawn 5
@@ -125,7 +127,7 @@ set g_balance_health_rotstable 100
 set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0.04
+set g_balance_armor_rot 0.03
 set g_balance_armor_rotlinear 0.75
 set g_balance_pause_armor_rot 1
 set g_balance_pause_armor_rot_spawn 5
@@ -829,4 +831,4 @@ set g_balance_seeker_missile_spread 0
 set g_balance_seeker_missile_turnrate 0.15
 set g_balance_seeker_reload_ammo 0 //default: 15
 set g_balance_seeker_reload_time 2
-// End new seeker
\ No newline at end of file
+// End new seeker