From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 17 Oct 2010 14:29:39 +0000 (+0200)
Subject: g_pickup_<ammotype>_weapon: the amount of that ammo type you get for picking up a... 
X-Git-Tag: xonotic-v0.1.0preview~297
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c508eb36a3c1ef9354e0b0fc10d2b69c8ec2b9c;p=xonotic%2Fxonotic-data.pk3dir.git

g_pickup_<ammotype>_weapon: the amount of that ammo type you get for picking up a WEAPON
---

diff --git a/balance25.cfg b/balance25.cfg
index 90751d279..4c335497b 100644
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -56,14 +56,19 @@ set g_balance_nix_ammoincr_fuel 2
 set g_pickup_ammo_anyway 0
 set g_pickup_weapons_anyway 0
 set g_pickup_shells 15
+set g_pickup_shells_weapon 15
 set g_pickup_shells_max 999
 set g_pickup_nails 80
+set g_pickup_nails_weapon 80
 set g_pickup_nails_max 999
 set g_pickup_rockets 15
+set g_pickup_rockets_weapon 15
 set g_pickup_rockets_max 999
 set g_pickup_cells 25
+set g_pickup_cells_weapon 25
 set g_pickup_cells_max 999
 set g_pickup_fuel 25
+set g_pickup_fuel_weapon 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 5
diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 36d5435e1..b92e4426c 100644
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -67,14 +67,19 @@ set g_balance_nix_ammoincr_fuel 2
 set g_pickup_ammo_anyway 0
 set g_pickup_weapons_anyway 1
 set g_pickup_shells 20
+set g_pickup_shells_weapon 20
 set g_pickup_shells_max 45
 set g_pickup_nails 120
+set g_pickup_nails_weapon 120
 set g_pickup_nails_max 300
 set g_pickup_rockets 25
+set g_pickup_rockets_weapon 25
 set g_pickup_rockets_max 150
 set g_pickup_cells 25
+set g_pickup_cells_weapon 25
 set g_pickup_cells_max 200
 set g_pickup_fuel 25
+set g_pickup_fuel_weapon 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 10
diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index 966d58cbf..ebe0a48d1 100644
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -56,14 +56,19 @@ set g_balance_nix_ammoincr_fuel 2
 set g_pickup_ammo_anyway 0
 set g_pickup_weapons_anyway 0
 set g_pickup_shells 15
+set g_pickup_shells_weapon 15
 set g_pickup_shells_max 999
 set g_pickup_nails 80
+set g_pickup_nails_weapon 80
 set g_pickup_nails_max 999
 set g_pickup_rockets 15
+set g_pickup_rockets_weapon 15
 set g_pickup_rockets_max 999
 set g_pickup_cells 25
+set g_pickup_cells_weapon 25
 set g_pickup_cells_max 999
 set g_pickup_fuel 25
+set g_pickup_fuel_weapon 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 5
diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 966f0b2dd..a9190486d 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -56,14 +56,19 @@ set g_balance_nix_ammoincr_fuel 2
 set g_pickup_ammo_anyway 1
 set g_pickup_weapons_anyway 1
 set g_pickup_shells 30
+set g_pickup_shells_weapon 30
 set g_pickup_shells_max 120
 set g_pickup_nails 80
+set g_pickup_nails_weapon 80
 set g_pickup_nails_max 400
 set g_pickup_rockets 30
+set g_pickup_rockets_weapon 30
 set g_pickup_rockets_max 120
 set g_pickup_cells 50
+set g_pickup_cells_weapon 50
 set g_pickup_cells_max 200
 set g_pickup_fuel 25
+set g_pickup_fuel_weapon 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 10
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 08ee53140..49d195a75 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -56,14 +56,19 @@ set g_balance_nix_ammoincr_fuel 2
 set g_pickup_ammo_anyway 1
 set g_pickup_weapons_anyway 1
 set g_pickup_shells 20
+set g_pickup_shells_weapon 20
 set g_pickup_shells_max 45
 set g_pickup_nails 120
+set g_pickup_nails_weapon 120
 set g_pickup_nails_max 300
 set g_pickup_rockets 25
+set g_pickup_rockets_weapon 25
 set g_pickup_rockets_max 150
 set g_pickup_cells 25
+set g_pickup_cells_weapon 25
 set g_pickup_cells_max 200
 set g_pickup_fuel 25
+set g_pickup_fuel_weapon 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 100
 set g_pickup_armorsmall 5
diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index beed37321..07cc60223 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1052,7 +1052,7 @@ void weapon_defaultspawnfunc(float wpn)
 			{
 				ammofield = Item_CounterField(j);
 				if(!self.ammofield)
-					self.ammofield = cvar(strcat("g_pickup_", Item_CounterFieldName(j)));
+					self.ammofield = cvar(strcat("g_pickup_", Item_CounterFieldName(j)), "_weapon");
 			}
 		}
 	}