From: Samual <samual@xonotic.org>
Date: Fri, 17 Feb 2012 22:30:08 +0000 (-0500)
Subject: Working on health/armor balance more in XPM
X-Git-Tag: xonotic-v0.6.0~66^2~4^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=168d3eb263e50f2f50ad44dc9480f30e8b0d92af;p=xonotic%2Fxonotic-data.pk3dir.git

Working on health/armor balance more in XPM
---

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index b958a4242..0eea02485 100644
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -72,29 +72,29 @@ 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 200
-set g_pickup_armorsmall_anyway 1
+set g_pickup_armorsmall_max 100
+set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 100
-set g_pickup_armormedium_anyway 1
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 100
-set g_pickup_armorbig_anyway 1
+set g_pickup_armorbig_max 200
+set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 200
-set g_pickup_armorlarge_anyway 1
+set g_pickup_armorlarge_anyway 0
 set g_pickup_healthsmall 5
-set g_pickup_healthsmall_max 200
-set g_pickup_healthsmall_anyway 1
+set g_pickup_healthsmall_max 100
+set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 100
-set g_pickup_healthmedium_anyway 1
+set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 100
-set g_pickup_healthlarge_anyway 1
+set g_pickup_healthlarge_max 200
+set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
-set g_pickup_healthmega_anyway 1
+set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
 set g_pickup_respawntime_long 30
@@ -229,7 +229,6 @@ set g_balance_grapplehook_health 50
 set g_balance_grapplehook_damagedbycontents 1
 // }}}
 
-
 // {{{ weapon properties
 // {{{ laser
 set g_balance_laser_primary_damage 25