Actually lets change around the calculation for the hagar per-shot spread a bit,...

diff --git a/balance25.cfg b/balance25.cfg
index acb9ad8256d9d33314c49fd38f6e768ef840f14a..64ad2b9603d012a8c2dadf83bb7f11e3c3b57e80 100644 (file)
--- 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 35bedb5a56da411ffd50a007583ccc78e2a2532b..64935cf29a794334bc91ede9d6f302bf7994a7a5 100644 (file)
--- 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 59f7c25f07a8a9dfaee5f26b5f738ee943baba51..3908f5c80b8943c95aa92d0af2597a640923a988 100644 (file)
--- 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 21ec6f378293bb9972898ff2a6671a3d869ae326..596930ce20ab106bfaeb1d6e28481a650311a77e 100644 (file)
--- 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 01c3192ea07bc714b6f9403d44ae737d20bc3967..00c33085a67dc8e71f9e3055f4a900c19e91a6cc 100644 (file)
--- 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 779aca49d66571a12ab22ce878230025ffde29ae..e9d34ce17e8564ab7b9d683ab3e331a297992adf 100644 (file)
--- 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 717ec544b1d63ebfeb76e7f1f6ff7ecc8dbb60fa..d0d3043c82b8b079e2d475eb2a59ebb21734e8e7 100644 (file)
--- 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';