Implement damage scaling based on accumulated spread

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 306fb9a02e1719bcc4a617f137779d8cf96bafea..6a2462d33534da2164a367b58bb07c358fd72c1d 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -84,6 +84,8 @@ set g_balance_machinegun_spread_add 0.012
 set g_balance_machinegun_spread_decay 0.048
 set g_balance_machinegun_spread_max 0.05
 set g_balance_machinegun_spread_min 0.02
+set g_balance_machinegun_spread_cold_damagemultiplier 1
+set g_balance_machinegun_spread_heat_damagemultiplier 1
 set g_balance_machinegun_sustained_ammo 1
 set g_balance_machinegun_sustained_damage 10
 set g_balance_machinegun_sustained_force 3

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index aa241622e8aebf47d1d993524dcfba1e4eddd689..bfd58cf1769c09ee0e7069aa86ee3a171b8974b1 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -84,6 +84,8 @@ set g_balance_machinegun_spread_add 0.02
 set g_balance_machinegun_spread_decay 0
 set g_balance_machinegun_spread_max 0.6
 set g_balance_machinegun_spread_min 0.02
+set g_balance_machinegun_spread_cold_damagemultiplier 1
+set g_balance_machinegun_spread_heat_damagemultiplier 1
 set g_balance_machinegun_sustained_ammo 1
 set g_balance_machinegun_sustained_damage 15
 set g_balance_machinegun_sustained_force 27

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index 1320937e735cef7d8bf775208c314ad35eb02204..dd555810a2f35eb65a07cc666995696d5bb2f882 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -84,6 +84,8 @@ set g_balance_machinegun_spread_add 0.012
 set g_balance_machinegun_spread_decay 0.048
 set g_balance_machinegun_spread_max 0.05
 set g_balance_machinegun_spread_min 0.02
+set g_balance_machinegun_spread_cold_damagemultiplier 1
+set g_balance_machinegun_spread_heat_damagemultiplier 1
 set g_balance_machinegun_sustained_ammo 1
 set g_balance_machinegun_sustained_damage 10
 set g_balance_machinegun_sustained_force 5

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index 36bd4b407e6bec4f78eb47ed07f3bce64411b4f1..0c33b8e0c39f4bb59bad4e6209316064cb3cfa3c 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -84,6 +84,8 @@ set g_balance_machinegun_spread_add 0
 set g_balance_machinegun_spread_decay 0
 set g_balance_machinegun_spread_max 0
 set g_balance_machinegun_spread_min 0
+set g_balance_machinegun_spread_cold_damagemultiplier 1
+set g_balance_machinegun_spread_heat_damagemultiplier 1
 set g_balance_machinegun_sustained_ammo 1
 set g_balance_machinegun_sustained_damage 10
 set g_balance_machinegun_sustained_force 3

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 803ae377d692a90a28400422c225a99d8dc8fae2..e24b172e8436914fec7e855fc89663871998b158 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -84,6 +84,8 @@ set g_balance_machinegun_spread_add 0.012
 set g_balance_machinegun_spread_decay 0.048
 set g_balance_machinegun_spread_max 0.05
 set g_balance_machinegun_spread_min 0.02
+set g_balance_machinegun_spread_cold_damagemultiplier 1
+set g_balance_machinegun_spread_heat_damagemultiplier 1
 set g_balance_machinegun_sustained_ammo 1
 set g_balance_machinegun_sustained_damage 10
 set g_balance_machinegun_sustained_force 3

diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc
index c22b545ca89d60dc49349b7746bfe4b799c5d2f8..dd699f8050b876a1ca64174c252375213d37c904 100644 (file)
--- a/qcsrc/common/weapons/weapon/machinegun.qc
+++ b/qcsrc/common/weapons/weapon/machinegun.qc
@@ -7,6 +7,7 @@
 
 //float spreadSpectrumMin; // localized to Auto and Burst
 //float spreadSpectrumMax; // localized to Auto and Burst
+//float spreadSpectrumDistance; // localized to MachineGun_Heat()
 //bool inversedSpread; // localized to Auto
 
 
@@ -34,6 +35,36 @@ void MachineGun_Update_Spread(entity actor, .entity weaponentity, float spreadSp
        actor.(weaponentity).spreadUpdateTime = time;
 }
 
+ERASEABLE
+float MachineGun_Heat(float spread_accum, float spreadSpectrumMin, float spreadSpectrumMax)
+{
+       // function for reducing mg's damage with no spread and adding damage with
+       // heated up barrel or vice versa depending on the values of exposed cvars
+       float heatMultiplierApplicationPercent = 1;
+       float coldMultiplierApplicationPercent = 1;
+
+       float spreadSpectrumDistance = spreadSpectrumMax - spreadSpectrumMin;
+
+       if (spreadSpectrumDistance > 0) //avoid division by 0, can never be < 0 either due to how it is set when defined
+       {
+               heatMultiplierApplicationPercent = spread_accum / spreadSpectrumDistance;
+               coldMultiplierApplicationPercent = 1 - heatMultiplierApplicationPercent;
+       }
+
+       // example where low end has halved damage and high end has tripled damage:
+       // with 50% spread accumulation: heat = (0.5 * 0.5) + (0.5 * 3) = 0.25 + 1.5 = 1.75 damage multiplier
+       // with 90% spread accumulation: heat = (0.1 * 0.5) + (0.9 * 3) = 0.05 + 2.7 = 2.75 damage multiplier
+       float heat = (coldMultiplierApplicationPercent * WEP_CVAR(WEP_MACHINEGUN, spread_cold_damagemultiplier))
+                  + (heatMultiplierApplicationPercent * WEP_CVAR(WEP_MACHINEGUN, spread_heat_damagemultiplier));
+
+       // avoid damage doubling from (1 * 1) + (1 * 1) = 2
+       // this also averages the 2 multipliers when spreadSpectrumDistance == 0
+       // so 0.5 cold to 4 heat would average out to 2.25 with no spectrum distance for spread
+       if (spreadSpectrumDistance == 0) heat = heat / 2;
+
+       return heat;
+}
+
 void W_MachineGun_Attack(Weapon thiswep, int deathtype, entity actor, .entity weaponentity)
 {
        W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, ((actor.(weaponentity).misc_bulletcounter == 1) ? WEP_CVAR(WEP_MACHINEGUN, first_damage) : WEP_CVAR(WEP_MACHINEGUN, sustained_damage)), deathtype);
@@ -160,6 +191,8 @@ void W_MachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weaponentity
 
        float spread_accum = actor.(weaponentity).machinegun_spread_accumulation;
 
+       float heat = MachineGun_Heat(spread_accum, spreadSpectrumMin, spreadSpectrumMax);
+
        float spread_accuracy;
        if (!inversedSpread)
                spread_accuracy = spreadSpectrumMin + spread_accum;
@@ -169,7 +202,7 @@ void W_MachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weaponentity
        fireBullet_falloff(actor, weaponentity, w_shotorg, w_shotdir,
                           spread_accuracy,
                           WEP_CVAR(WEP_MACHINEGUN, solidpenetration),
-                          WEP_CVAR(WEP_MACHINEGUN, sustained_damage),
+                          WEP_CVAR(WEP_MACHINEGUN, sustained_damage) * heat,
                           WEP_CVAR(WEP_MACHINEGUN, damagefalloff_halflife),
                           WEP_CVAR(WEP_MACHINEGUN, damagefalloff_mindist),
                           WEP_CVAR(WEP_MACHINEGUN, damagefalloff_maxdist),
@@ -226,10 +259,12 @@ void W_MachineGun_Attack_Burst(Weapon thiswep, entity actor, .entity weaponentit
 
        float spread_accum = actor.(weaponentity).machinegun_spread_accumulation;
 
+       float heat = MachineGun_Heat(spread_accum, spreadSpectrumMin, spreadSpectrumMax);
+
        fireBullet_falloff(actor, weaponentity, w_shotorg, w_shotdir,
                           WEP_CVAR(WEP_MACHINEGUN, burst_spread),
                           WEP_CVAR(WEP_MACHINEGUN, solidpenetration),
-                          WEP_CVAR(WEP_MACHINEGUN, sustained_damage),
+                          WEP_CVAR(WEP_MACHINEGUN, sustained_damage) * heat,
                           WEP_CVAR(WEP_MACHINEGUN, damagefalloff_halflife),
                           WEP_CVAR(WEP_MACHINEGUN, damagefalloff_mindist),
                           WEP_CVAR(WEP_MACHINEGUN, damagefalloff_maxdist),

diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh
index 30ed9b2b182d25267bd048231b75478027e29b4c..4ca18b3690ef697acb15bf722319403e3678e2f7 100644 (file)
--- a/qcsrc/common/weapons/weapon/machinegun.qh
+++ b/qcsrc/common/weapons/weapon/machinegun.qh
@@ -46,6 +46,8 @@ CLASS(MachineGun, Weapon)
                P(class, prefix, spread_decay, float, NONE) \
                P(class, prefix, spread_max, float, NONE) \
                P(class, prefix, spread_min, float, NONE) \
+               P(class, prefix, spread_cold_damagemultiplier, float, NONE) \
+               P(class, prefix, spread_heat_damagemultiplier, float, NONE) \
                P(class, prefix, sustained_ammo, float, NONE) \
                P(class, prefix, sustained_damage, float, NONE) \
                P(class, prefix, sustained_force, float, NONE) \