Fix crab synths dying in one hit from "sneak attacks"

entropy-zero · Oct 23, 2023 · 9d17c76 · 9d17c76
1 parent 9d722e4
commit 9d17c76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/sp/src/game/server/ai_basehumanoid.cpp b/sp/src/game/server/ai_basehumanoid.cpp
@@ -171,7 +171,7 @@ void CAI_BaseHumanoid::TraceAttack( const CTakeDamageInfo &info, const Vector &v
 {
 	bool bSneakAttacked = false;
 
-	if( ptr->hitgroup == HITGROUP_HEAD )
+	if( ptr->hitgroup == HITGROUP_HEAD && CanBeSneakAttacked( info, vecDir, ptr ) )
 	{
 		if ( info.GetAttacker() && info.GetAttacker()->IsPlayer() && info.GetAttacker() != GetEnemy() && !IsInAScript() )
 		{

diff --git a/sp/src/game/server/ai_basehumanoid.h b/sp/src/game/server/ai_basehumanoid.h
@@ -43,6 +43,9 @@ class CAI_BaseHumanoid : public CAI_BaseHumanoidBase
 
 	// Purpose: check ammo
 	virtual void CheckAmmo( void );
+
+	// Whether or not we can die in one hit from a sneak attack
+	virtual bool CanBeSneakAttacked( const CTakeDamageInfo &info, const Vector &vecDir, trace_t *ptr ) { return true; }
 };
 
 //-----------------------------------------------------------------------------

diff --git a/sp/src/game/server/ez2/npc_crabsynth.h b/sp/src/game/server/ez2/npc_crabsynth.h
@@ -116,6 +116,8 @@ class CNPC_CrabSynth : public CAI_GrenadeUser< CAI_BaseActor >
 
 	const char		*GetSquadSlotDebugName( int iSquadSlot );
 
+	bool			CanBeSneakAttacked( const CTakeDamageInfo &info, const Vector &vecDir, trace_t *ptr ) { return false; }
+
 	void			UpdateOnRemove( void );
 
 	virtual CSprite		*GetGlowSpritePtr( int i );