From: FruitieX <fruitiex@gmail.com>
Date: Fri, 26 Nov 2010 23:18:00 +0000 (+0200)
Subject: take over health system from tZork's balance (25hp up to 100, 50hp up to 150, rest... 
X-Git-Tag: xonotic-v0.1.0preview~99^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d60540b14343ce51a97ef669bf1e0c513ece43c;p=xonotic%2Fxonotic-data.pk3dir.git

take over health system from tZork's balance (25hp up to 100, 50hp up to 150, rest up to 250). Armor little more special: 25a up to 50, 50a up to 50, rest up to 150
---

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index a6a2e66d9..7c1f9c79b 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -72,22 +72,22 @@ set g_pickup_fuel_weapon 15
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 100
 set g_pickup_armorsmall 5
-set g_pickup_armorsmall_max 250
+set g_pickup_armorsmall_max 150
 set g_pickup_armorsmall_anyway 1
 set g_pickup_armormedium 25
-set g_pickup_armormedium_max 250
-set g_pickup_armormedium_anyway 1
+set g_pickup_armormedium_max 50
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 250
-set g_pickup_armorbig_anyway 1
+set g_pickup_armorbig_max 50
+set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
-set g_pickup_armorlarge_max 250
+set g_pickup_armorlarge_max 150
 set g_pickup_armorlarge_anyway 1
 set g_pickup_healthsmall 5
 set g_pickup_healthsmall_max 250
 set g_pickup_healthsmall_anyway 1
 set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 150
+set g_pickup_healthmedium_max 100
 set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
 set g_pickup_healthlarge_max 150