From: FruitieX <rasse@rasse-laptop.(none)>
Date: Sun, 17 Oct 2010 23:14:07 +0000 (+0300)
Subject: start out with 0.25 charge
X-Git-Tag: xonotic-v0.1.0preview~287^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e842db4fb43c7c0e23b0d0d38a7058a29f63189;p=xonotic%2Fxonotic-data.pk3dir.git

start out with 0.25 charge
---

diff --git a/balance25.cfg b/balance25.cfg
index ecaab3f3d..158f67684 100644
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -442,6 +442,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 0
 set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index a2c00ce37..11d85e433 100644
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -453,6 +453,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 9999999
 set g_balance_nex_secondary_damagefalloff_forcehalflife 9999999
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg
index 284f85c65..654ec6cc1 100644
--- a/balanceNexSVN.cfg
+++ b/balanceNexSVN.cfg
@@ -441,6 +441,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 1500
 set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index aef05391f..9a49f3da9 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -442,6 +442,7 @@ set g_balance_nex_secondary_damagefalloff_halflife 1500
 set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 
 set g_balance_nex_charge 0
+set g_balance_nex_charge_start 0
 set g_balance_nex_charge_rate 0.1
 set g_balance_nex_charge_shot_multiplier 0.5
 set g_balance_nex_charge_velocity_rate 0.2
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 68997d40d..2072b3817 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -442,8 +442,9 @@ set g_balance_nex_secondary_damagefalloff_halflife 0
 set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_charge 1
+set g_balance_nex_charge_start 0.25
 set g_balance_nex_charge_rate 0.025
-set g_balance_nex_charge_shot_multiplier 0.75
+set g_balance_nex_charge_shot_multiplier 0.675
 set g_balance_nex_charge_velocity_rate 0.175
 set g_balance_nex_charge_minspeed 400
 set g_balance_nex_charge_maxspeed 1000
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 03d574f62..df6c8d4b2 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -889,7 +889,8 @@ void PutClientInServer (void)
 			self.effects = 0;
 		self.air_finished = time + 12;
 		self.dmg = 2;
-		self.nex_charge = 0;
+		if(cvar("g_balance_nex_charge"))
+			self.nex_charge = cvar("g_balance_nex_charge_start");
 
 		if(inWarmupStage)
 		{