Add an option to allow re-fire right after releasing the button, rather than waiting...

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index c185c5ec72f9a5a393ed0836ab91ac2281e91b1a..bb7ab5f6780738b28e140ba39d829e2725e84206 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-overkill.cfg b/bal-wep-overkill.cfg
index 9f54315588067a8730f05d5f1f75c475b74e4a7f..626ada04eab958e36e003f4ec0f0b8fbe04f2ff9 100644 (file)
--- a/bal-wep-overkill.cfg
+++ b/bal-wep-overkill.cfg
@@ -764,6 +764,7 @@ set g_balance_arc_burst_healing_aps 100
 set g_balance_arc_burst_healing_hps 100
 set g_balance_arc_burst_heat 4
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_switchdelay_drop 0.3

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index e20a8700d49bcaee48064cffe62db86ab7458268..5545c6502cf6bdd38e11c80c7ea0cc852b87241c 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -281,6 +281,7 @@ set g_balance_arc_burst_damage 500
 set g_balance_arc_burst_healing_aps 100
 set g_balance_arc_burst_healing_hps 100
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index f2685074653a18c30edd152ca4f065279bf22d7d..cf7a05f6b5b0787fc13555bdc7ce2b8b601d1acf 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 9ebab4898961904f4c269ff7d5d6aaff7c6d8390..07005ccc3f2e8fba8c3eaf6a6ce7f3f5f77b2a1e 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg
index 9ebab4898961904f4c269ff7d5d6aaff7c6d8390..07005ccc3f2e8fba8c3eaf6a6ce7f3f5f77b2a1e 100644 (file)
--- a/bal-wep-xpm.cfg
+++ b/bal-wep-xpm.cfg
@@ -741,6 +741,7 @@ set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
 set g_balance_arc_beam_healing_hps 50
 set g_balance_arc_cooldown 2.5
+set g_balance_arc_cooldown_release 1
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
 set g_balance_arc_beam_heat 1

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index 6f503d4243bf6ea436eb214f7bcb25b0637a1c6d..531be194a56af3792c0b816d41e7d9d766cca4b4 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -57,6 +57,7 @@ CLASS(Arc, Weapon)
         P(class, prefix, burst_healing_hps, float, NONE) \
         P(class, prefix, burst_heat, float, NONE) /* heat increase per second (secondary) */ \
         P(class, prefix, cooldown, float, NONE) /* heat decrease per second when resting */ \
+        P(class, prefix, cooldown_release, float, NONE) /* delay weapon re-use when releasing button */ \
         P(class, prefix, overheat_max, float, NONE) /* maximum heat before jamming */ \
         P(class, prefix, overheat_min, float, NONE) /* minimum heat to wait for cooldown */ \
         P(class, prefix, switchdelay_drop, float, NONE) \
@@ -350,7 +351,8 @@ void W_Arc_Beam_Think()
 
                        if ( cooldown_speed )
                        {
-                               self.owner.arc_overheat = time + self.beam_heat / cooldown_speed;
+                               if ( WEP_CVAR(arc, cooldown_release) || (WEP_CVAR(arc, overheat_max) > 0 && self.beam_heat >= WEP_CVAR(arc, overheat_max)) )
+                                       self.owner.arc_overheat = time + self.beam_heat / cooldown_speed;
                                self.owner.arc_cooldown = cooldown_speed;
                        }