When ConVar sk_tripmine_use_owner_relations is 1, tripmines will use …

…owner entity's relationships instead of default relationships
entropy-zero · Jan 22, 2024 · 5263e57 · 5263e57
1 parent 0c05054
commit 5263e57
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/sp/src/game/server/hl2mp/grenade_tripmine.cpp b/sp/src/game/server/hl2mp/grenade_tripmine.cpp
@@ -24,9 +24,10 @@
 
 extern const char* g_pModelNameLaser;
 
-ConVar    sk_plr_dmg_tripmine		( "sk_plr_dmg_tripmine","0");
-ConVar    sk_npc_dmg_tripmine		( "sk_npc_dmg_tripmine","0");
-ConVar    sk_tripmine_radius		( "sk_tripmine_radius","0");
+ConVar    sk_plr_dmg_tripmine					( "sk_plr_dmg_tripmine","0" );
+ConVar    sk_npc_dmg_tripmine					( "sk_npc_dmg_tripmine","0" );
+ConVar    sk_tripmine_radius					( "sk_tripmine_radius","0" );
+ConVar    sk_tripmine_use_owner_relations		( "sk_tripmine_use_owner_relations", "0" );
 
 LINK_ENTITY_TO_CLASS( npc_tripmine, CTripmineGrenade );
 
@@ -357,8 +358,7 @@ void CTripmineGrenade::BeamBreakThink( void  )
 	CBaseCombatCharacter *pBCC  = ToBaseCombatCharacter( pEntity );
 
 #ifdef EZ2
-	// Tripmines do not detonate when tripped by entities that treat their class as friendly or by the owner
-	if ( ( pBCC && pBCC->GetDefaultRelationshipDisposition( m_nTripmineClass ) == D_LI ) || ( GetOwnerEntity() && GetOwnerEntity() == pBCC ) )
+	if ( pBCC && !TargetShouldDetonate(pBCC) )
 	{
 		SetNextThink( gpGlobals->curtime + 0.05f );
 		return;
@@ -495,3 +495,21 @@ void CTripmineGrenade::InputDeactivate( inputdata_t &inputdata )
 }
 #endif
 
+#ifdef EZ2
+bool CTripmineGrenade::TargetShouldDetonate(CBaseCombatCharacter* pTarget)
+{
+	if ( pTarget && sk_tripmine_use_owner_relations.GetBool() && GetOwnerEntity() && GetOwnerEntity()->IsCombatCharacter() )
+	{
+		return GetOwnerEntity()->MyCombatCharacterPointer()->IRelationType(pTarget) < D_LI;
+	}
+
+	// Tripmines do not detonate when tripped by entities that treat their class as friendly or by the owner
+	if ((pTarget && pTarget->GetDefaultRelationshipDisposition(m_nTripmineClass) == D_LI) || (GetOwnerEntity() && GetOwnerEntity() == pTarget))
+	{
+		return false;
+	}
+
+
+	return true;
+}
+#endif
diff --git a/sp/src/game/server/hl2mp/grenade_tripmine.h b/sp/src/game/server/hl2mp/grenade_tripmine.h
@@ -58,6 +58,11 @@ class CTripmineGrenade : public CBaseGrenade
 	COutputEvent m_OnExplode;
 #endif
 
+#ifdef EZ2
+	virtual bool	TargetShouldDetonate(CBaseCombatCharacter* pTarget);
+#endif
+
+
 public:
 	EHANDLE		m_hOwner;