Set a minimum inferno burn time of 0.5

diff --git a/mutators.cfg b/mutators.cfg
index e99dafa864087804c552ef9074a9dd06b8be2df7..9e842b072bb47d7be428ad20f8370575c5dd84ef 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -320,5 +320,6 @@ set g_buffs_invisible_alpha 0.4 "player invisibility multiplier while holding in
 set g_buffs_inferno 1 "inferno buff: targets damaged by player carrying inferno buff will also receive burning damage"
 set g_buffs_inferno_damagemultiplier 0.25 "multiplier of damage dealt during burn"
 set g_buffs_inferno_burntime_factor 2 "burn time logarithm base. 0 < x < 1: increasing, x > 1: increasing"
+set g_buffs_inferno_burntime_min_time 0.5 "minimum seconds of burn time"
 set g_buffs_inferno_burntime_target_damage 150 "damage required for g_buffs_inferno_burntime_target_time seconds of burn"
 set g_buffs_inferno_burntime_target_time 5 "seconds of burn given g_buffs_inferno_burntime_target_damage damage"

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 77a6b1fe7722d955ca525a1f814a6934b45b4a29..d93d5a68eee2c9863b26eca66292f13ac4daa020 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -883,6 +883,7 @@ float autocvar_g_buffs_invisible_alpha;
 float autocvar_g_buffs_flight_gravity;
 float autocvar_g_buffs_jump_height;
 float autocvar_g_buffs_inferno_burntime_factor;
+float autocvar_g_buffs_inferno_burntime_min_time;
 float autocvar_g_buffs_inferno_burntime_target_damage;
 float autocvar_g_buffs_inferno_burntime_target_time;
 float autocvar_g_buffs_inferno_damagemultiplier;

diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc
index 73d60335ea1a6e35feba6753e5cbe0e2c6fff441..9ab079ce905d1027ae027842a66cff85003d1eb5 100644 (file)
--- a/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@ -438,7 +438,8 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerDamage_Calculate)
        if(frag_target != frag_attacker) {
                float time = buff_Inferno_CalculateTime(
                        frag_damage,
-                       0, 0,
+                       0,
+                       autocvar_g_buffs_inferno_burntime_min_time,
                        autocvar_g_buffs_inferno_burntime_target_damage,
                        autocvar_g_buffs_inferno_burntime_target_time,
                        autocvar_g_buffs_inferno_burntime_factor