From: TimePath Date: Tue, 10 Feb 2015 02:29:24 +0000 (+1100) Subject: Set a minimum inferno burn time of 0.5 X-Git-Tag: xonotic-v0.8.1~18^2~28 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e51121e83941729ae9b33e40c25616f22f47bbf6;p=xonotic%2Fxonotic-data.pk3dir.git Set a minimum inferno burn time of 0.5 --- diff --git a/mutators.cfg b/mutators.cfg index e99dafa86..9e842b072 100644 --- 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 77a6b1fe7..d93d5a68e 100644 --- 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 73d60335e..9ab079ce9 100644 --- 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