Skip to content

Commit 75e48bf

Browse files
committed
Remove rd_drone_flinch_resets_attack. Fixes #852. Fixes #870.
1 parent 9dba80e commit 75e48bf

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

src/game/server/swarm/asw_drone_advanced.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ ConVar asw_new_drone("asw_new_drone", "1", FCVAR_CHEAT, "Set to 1 to use the new
8484
ConVar rd_drone_uber_knockdown( "rd_drone_uber_knockdown", "0", FCVAR_CHEAT, "Set to 1 to make uber drones knock down marines like shieldbugs do" );
8585
ConVar rd_drone_uber_knockdown_force( "rd_drone_uber_knockdown_force", "10", FCVAR_CHEAT, "Magnitude of knockdown force for uber drone's melee attack, only works if rd_drone_uber_knockdown 1" );
8686
ConVar rd_drone_uber_knockdown_lift( "rd_drone_uber_knockdown_lift", "10", FCVAR_CHEAT, "Upwards force for uber drone's melee attack, only works if rd_drone_uber_knockdown 1" );
87-
ConVar rd_drone_flinch_resets_attack( "rd_drone_flinch_resets_attack", "0", FCVAR_CHEAT, "Set to 1 to revert the fix for drones being able to attack immediately after a flinch interrupts an attack animation" );
8887
ConVar rd_pistols_uber_drone_additional_damage_health_percent("rd_pistols_uber_drone_additional_damage_health_percent", "12", FCVAR_CHEAT, "Special pistol bullets provide additional damage over heavy drones");
8988
ConVar rd_pistols_drone_dualshot_health_bound("rd_pistols_drone_dualshot_health_bound", "105", FCVAR_CHEAT, "Drones below this health guaranteed to die in two (or one) pistol shots");
9089
extern ConVar asw_debug_alien_damage;
@@ -961,10 +960,6 @@ void CASW_Drone_Advanced::MeleeAttack( float distance, float damage, QAngle &vie
961960

962961
m_bHasAttacked = true;
963962

964-
// Prevent drone from attacking again before this animation would have finished.
965-
if ( !rd_drone_flinch_resets_attack.GetBool() )
966-
SetNextAttack( gpGlobals->curtime + SequenceDuration() / GetPlaybackRate() - GetCycle() );
967-
968963
// Always hurt bullseyes for now
969964
if ( ( GetEnemy() != NULL ) && ( GetEnemy()->Classify() == CLASS_BULLSEYE ) )
970965
{

0 commit comments

Comments
 (0)