From: Samual <samual@xonotic.org>
Date: Wed, 21 Sep 2011 18:36:34 +0000 (-0400)
Subject: Actually lets change around the calculation for the hagar per-shot spread a bit,... 
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a8a56240aeae72a446aed79c2435a6e6653c808;p=xonotic%2Fxonotic-data.pk3dir.git

Actually lets change around the calculation for the hagar per-shot spread a bit, now also has "bias" cvar to control how much spread there is based on how many shots are loaded.
---

diff --git a/balance25.cfg b/balance25.cfg
index acb9ad825..64ad2b960 100644
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -543,6 +543,7 @@ set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
 set g_balance_hagar_secondary_load_speed 0.6
 set g_balance_hagar_secondary_load_spread 0.075
+set g_balance_hagar_secondary_load_spread_bias 0.5
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 35bedb5a5..64935cf29 100644
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -543,6 +543,7 @@ set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
 set g_balance_hagar_secondary_load_speed 0.6
 set g_balance_hagar_secondary_load_spread 0.075
+set g_balance_hagar_secondary_load_spread_bias 0.5
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 59f7c25f0..3908f5c80 100644
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -543,6 +543,7 @@ set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
 set g_balance_hagar_secondary_load_speed 0.6
 set g_balance_hagar_secondary_load_spread 0.075
+set g_balance_hagar_secondary_load_spread_bias 0.5
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 21ec6f378..596930ce2 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -543,6 +543,7 @@ set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 1
 set g_balance_hagar_secondary_load_speed 0.5
 set g_balance_hagar_secondary_load_spread 0.075
+set g_balance_hagar_secondary_load_spread_bias 0.5
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 1
 set g_balance_hagar_secondary_load_releasedeath 0
@@ -551,7 +552,7 @@ set g_balance_hagar_secondary_damage 40
 set g_balance_hagar_secondary_edgedamage 20
 set g_balance_hagar_secondary_force 50
 set g_balance_hagar_secondary_radius 80
-set g_balance_hagar_secondary_spread 0.05
+set g_balance_hagar_secondary_spread 0.06
 set g_balance_hagar_secondary_speed 2000
 set g_balance_hagar_secondary_lifetime_min 10
 set g_balance_hagar_secondary_lifetime_rand 0
diff --git a/balancetZork.cfg b/balancetZork.cfg
index 01c3192ea..00c33085a 100644
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -542,6 +542,7 @@ set g_balance_hagar_secondary 1
 set g_balance_hagar_secondary_load 0
 set g_balance_hagar_secondary_load_speed 0.6
 set g_balance_hagar_secondary_load_spread 0.075
+set g_balance_hagar_secondary_load_spread_bias 0.5
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 0
 set g_balance_hagar_secondary_load_releasedeath 1
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 779aca49d..e9d34ce17 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -326,6 +326,7 @@ float autocvar_g_balance_hagar_secondary;
 float autocvar_g_balance_hagar_secondary_load;
 float autocvar_g_balance_hagar_secondary_load_speed;
 float autocvar_g_balance_hagar_secondary_load_spread;
+float autocvar_g_balance_hagar_secondary_load_spread_bias;
 float autocvar_g_balance_hagar_secondary_load_max;
 float autocvar_g_balance_hagar_secondary_load_hold;
 float autocvar_g_balance_hagar_secondary_load_releasedeath;
diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 717ec544b..d0d3043c8 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -154,9 +154,12 @@ void W_Hagar_Attack2_Load_Release (void)
 		setsize(missile, '0 0 0', '0 0 0');
 		missile.movetype = MOVETYPE_FLY;
 		
-		// handle the calculation for the shot pattern and its spread
-		spread_pershot = (autocvar_g_balance_hagar_secondary_spread * ((counter + 1) / shots));
+		// per-shot spread calculation: the more shots there are, the less spread is applied (based on the bias cvar)
+		spread_pershot = ((shots - 1) / (autocvar_g_balance_hagar_secondary_load_max - 1)); 
+		spread_pershot = (1 - (spread_pershot * autocvar_g_balance_hagar_secondary_load_spread_bias));
+		spread_pershot = (autocvar_g_balance_hagar_secondary_spread * spread_pershot);
 		
+		// pattern spread calculation
 		s = '0 0 0';
 		if (counter == 0)
 			s = '0 0 0';