non-hcff flamer: ignite after the same delay as hcff flamer, but deal…

… greatly reduced damage for the first 3 seconds
ReactiveDrop · Jul 18, 2024 · 82a7961 · 82a7961
1 parent 65652c1
commit 82a7961
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/game/server/swarm/asw_burning.cpp b/src/game/server/swarm/asw_burning.cpp
@@ -11,7 +11,7 @@ ConVar rd_burning_humanoid_damage( "rd_burning_humanoid_damage", "30", FCVAR_CHE
 ConVar rd_burning_alien_damage( "rd_burning_alien_damage", "15", FCVAR_CHEAT, "damage per second caused by afterburn to non-humanoid targets" ); // was 5 multiplied by asw_fire_alien_damage_scale (3), collapsed into just a simple 15 with no scaling
 ConVar rd_burning_biomass_damage( "rd_burning_biomass_damage", "5", FCVAR_CHEAT, "damage per second caused by afterburn to biomass" ); // was asw_goo_burning_damage (2) divided by 0.4, collapsed into just a simple 5 per second rather than 2 per 0.4 second tick
 ConVar rd_burning_rampup( "rd_burning_rampup", "1", FCVAR_CHEAT, "bias for damage ramp-up for non-friendly fire afterburn (0.5 = linear)", true, 0, true, 1 );
-ConVar rd_burning_rampup_ff( "rd_burning_rampup_ff", "0.5", FCVAR_CHEAT, "bias for damage ramp-up for friendly fire afterburn (0.5 = linear)", true, 0, true, 1 );
+ConVar rd_burning_rampup_ff( "rd_burning_rampup_ff", "0.25", FCVAR_CHEAT, "bias for damage ramp-up for friendly fire afterburn (0.5 = linear)", true, 0, true, 1 );
 ConVar rd_burning_rampup_hcff( "rd_burning_rampup_hcff", "1", FCVAR_CHEAT, "bias for damage ramp-up for hardcore friendly fire afterburn (0.5 = linear)", true, 0, true, 1 );
 ConVar rd_burning_rampup_time( "rd_burning_rampup_time", "0", FCVAR_CHEAT, "number of seconds for ramp-up for non-friendly fire afterburn", true, 0, false, 0 );
 ConVar rd_burning_rampup_time_ff( "rd_burning_rampup_time_ff", "3", FCVAR_CHEAT, "number of seconds for ramp-up for friendly fire afterburn", true, 0, false, 0 );

diff --git a/src/game/server/swarm/asw_marine.cpp b/src/game/server/swarm/asw_marine.cpp
@@ -461,7 +461,7 @@ ConVar asw_marine_burn_time_easy( "asw_marine_burn_time_easy", "6", FCVAR_CHEAT,
 ConVar asw_marine_burn_time_normal( "asw_marine_burn_time_normal", "8", FCVAR_CHEAT, "Amount of time marine burns for when ignited on normal difficulty" );
 ConVar asw_marine_burn_time_hard( "asw_marine_burn_time_hard", "12", FCVAR_CHEAT, "Amount of time marine burns for when ignited on hard difficulty" );
 ConVar asw_marine_burn_time_insane( "asw_marine_burn_time_insane", "15", FCVAR_CHEAT, "Amount of time marine burns for when ignited on insane difficulty" );
-ConVar asw_marine_time_until_ignite( "asw_marine_time_until_ignite", "0.7", FCVAR_CHEAT, "Amount of time before a marine ignites from taking repeated burn damage" );
+ConVar asw_marine_time_until_ignite( "asw_marine_time_until_ignite", "0.2", FCVAR_CHEAT, "Amount of time before a marine ignites from taking repeated burn damage" );
 ConVar asw_marine_time_until_ignite_hcff( "asw_marine_time_until_ignite_hcff", "0.2", FCVAR_CHEAT, "Amount of time before a marine ignites from taking repeated burn damage (hardcore ff)" );
 ConVar asw_mad_firing_break( "asw_mad_firing_break", "4", FCVAR_CHEAT, "Point at which the mad firing counter triggers the mad firing speech" );
 ConVar asw_mad_firing_decay( "asw_mad_firing_decay", "0.15", FCVAR_CHEAT, "Tick down rate of the mad firing counter" );