random assortment of gameplay fixes

Author: mastercoms

game/server/tf/tf_obj_sentrygun.cpp

@@ -2002,9 +2002,12 @@ int CObjectSentrygun::OnTakeDamage( const CTakeDamageInfo &info )
 		flDamage *= 1.0 - m_flHeavyBulletResist;
 		newInfo.SetDamage( flDamage );
 	}
+
+	int iPierceResists = 0;
+	CALL_ATTRIB_HOOK_INT_ON_OTHER( info.GetWeapon(), iPierceResists, mod_pierce_resists_absorbs );
 
 	// If we are shielded due to player control, we take less damage.
-	bool bFullyShielded = ( m_nShieldLevel > 0 ) && !HasSapper() && !IsPlasmaDisabled();
+	const bool bFullyShielded = !iPierceResists && ( m_nShieldLevel > 0 ) && !HasSapper() && !IsPlasmaDisabled();
 	if ( bFullyShielded )
 	{
 		float flDamage = newInfo.GetDamage();
@@ -2013,7 +2016,7 @@ int CObjectSentrygun::OnTakeDamage( const CTakeDamageInfo &info )
 	}
 
 	// Check to see if we are being sapped.
-	if ( HasSapper() )
+	if ( !iPierceResists && HasSapper() )
 	{
 		// Get the sapper owner.
 		CBaseObject *pSapper = GetObjectOfTypeOnMe( OBJ_ATTACHMENT_SAPPER );

game/shared/tf/tf_gamerules.cpp

@@ -5476,12 +5476,17 @@ int CTFRadiusDamageInfo::ApplyToEntity( CBaseEntity *pEntity )
 	CBaseEntity *pInflictor = dmgInfo->GetInflictor();
 
 	// Check that the explosion can 'see' this entity.
-	Vector vecSpot = pEntity->BodyTarget( vecSrc, false );
+	//std::vector<Vector> vecSpots{pEntity->EyePosition(), pEntity->WorldSpaceCenter(), pEntity->GetAbsOrigin()};
+	std::vector<Vector> vecSpots{pEntity->EyePosition()};
+    static const float flInnerRadiusPct = 0.05f;
 	CTraceFilterIgnorePlayers filterPlayers( pInflictor, COLLISION_GROUP_PROJECTILE );
 	CTraceFilterIgnoreFriendlyCombatItems filterCombatItems( pInflictor, COLLISION_GROUP_PROJECTILE, pInflictor->GetTeamNumber() );
 	CTraceFilterChain filter( &filterPlayers, &filterCombatItems );
-
-	UTIL_TraceLine( vecSrc, vecSpot, MASK_RADIUS_DAMAGE, &filter, &tr );
+	Vector vecOffset;
+	int totalChecks = 1;
+	int passedChecks = 0;
+	Vector vecMainSpot = pEntity->BodyTarget(vecSrc, false);
+	UTIL_TraceLine( vecSrc, vecMainSpot, MASK_RADIUS_DAMAGE, &filter, &tr );
 	if ( tr.startsolid && tr.m_pEnt )
 	{
 		// Return when inside an enemy combat shield and tracing against a player of that team ("absorbed")
@@ -5490,12 +5495,48 @@ int CTFRadiusDamageInfo::ApplyToEntity( CBaseEntity *pEntity )
 
 		filterPlayers.SetPassEntity( tr.m_pEnt );
 		CTraceFilterChain filterSelf( &filterPlayers, &filterCombatItems );
-		UTIL_TraceLine( vecSrc, vecSpot, MASK_RADIUS_DAMAGE, &filterSelf, &tr );
+		UTIL_TraceLine( vecSrc, vecMainSpot, MASK_RADIUS_DAMAGE, &filterSelf, &tr );
 	}
-
-	// If we don't trace the whole way to the target, and we didn't hit the target entity, we're blocked
+	// If we don't trace the whole way to the target, and we didn't hit the target entity, we're blocked, so do a more robust check
 	if ( tr.fraction != 1.0 && tr.m_pEnt != pEntity )
-		return 0;
+	{
+		for (int x = -1; x <= 1; x += 2)
+	    {
+		    vecOffset.x = x * flInnerRadiusPct;
+	        for (int y = -1; y <= 1; y += 2)
+	        {
+			    vecOffset.y = y * flInnerRadiusPct;
+	            for (int z = -1; z <= 1; z += 2)
+	            {
+				    vecOffset.z = z * flInnerRadiusPct;
+				    for ( auto& vecSpot : vecSpots )
+				    {
+	                    UTIL_TraceLine( vecSrc + vecOffset, vecSpot, MASK_RADIUS_DAMAGE, &filter, &tr );
+	                    if ( tr.startsolid && tr.m_pEnt )
+	                    {
+		                    // Return when inside an enemy combat shield and tracing against a player of that team ("absorbed")
+		                    if ( tr.m_pEnt->IsCombatItem() && pEntity->InSameTeam( tr.m_pEnt ) && ( pEntity != tr.m_pEnt ) )
+			                    return 0;
+
+		                    filterPlayers.SetPassEntity( tr.m_pEnt );
+		                    CTraceFilterChain filterSelf( &filterPlayers, &filterCombatItems );
+		                    UTIL_TraceLine( vecSrc + vecOffset, vecSpot, MASK_RADIUS_DAMAGE, &filterSelf, &tr );
+	                    }
+
+					    totalChecks++;
+	                    // If we don't trace the whole way to the target, and we didn't hit the target entity, we're blocked
+	                    if ( tr.fraction != 1.0 && tr.m_pEnt != pEntity )
+		                    return 0;
+					    passedChecks++;
+				    }
+	            }
+	        }
+	    }
+	}
+	else
+	{
+	    passedChecks++;
+	}
 
 	// Adjust the damage - apply falloff.
 	float flAdjustedDamage = 0.0f;
@@ -5538,6 +5579,9 @@ int CTFRadiusDamageInfo::ApplyToEntity( CBaseEntity *pEntity )
 		}
 	}
 
+	// As a compromise, reduce the damage if we only did it on a robust check
+	flAdjustedDamage *= passedChecks / (float) totalChecks;
+
 	// If we end up doing 0 damage, exit now.
 	if ( flAdjustedDamage <= 0 )
 		return 0;
@@ -5553,7 +5597,7 @@ int CTFRadiusDamageInfo::ApplyToEntity( CBaseEntity *pEntity )
 	CTakeDamageInfo adjustedInfo = *dmgInfo;
 	adjustedInfo.SetDamage( flAdjustedDamage );
 
-	Vector dir = vecSpot - vecSrc;
+	Vector dir = vecMainSpot - vecSrc;
 	VectorNormalize( dir );
 
 	// If we don't have a damage force, manufacture one
@@ -6147,7 +6191,7 @@ bool CTFGameRules::ApplyOnDamageModifyRules( CTakeDamageInfo &info, CBaseEntity
 	// Use defense buffs if it's not a backstab or direct crush damage (telefrage, etc.)
 	if ( pVictim && info.GetDamageCustom() != TF_DMG_CUSTOM_BACKSTAB && ( info.GetDamageType() & DMG_CRUSH ) == 0 )
 	{
-		if ( pVictim->m_Shared.InCond( TF_COND_DEFENSEBUFF ) )
+		if ( !iPierceResists && pVictim->m_Shared.InCond( TF_COND_DEFENSEBUFF ) )
 		{
 			// We take no crits of any kind...
 			if( eBonusEffect == kBonusEffect_MiniCrit || eBonusEffect == kBonusEffect_Crit )
@@ -16437,7 +16481,7 @@ bool CTFGameRules::PlayerMayBlockPoint( CBasePlayer *pPlayer, int iPointIndex, c
 #endif
 
 	// Invuln players can block points
-	if ( pTFPlayer->m_Shared.IsInvulnerable() )
+	if ( pTFPlayer->m_Shared.IsInvulnerable() || pTFPlayer->m_Shared.InCond( TF_COND_MEGAHEAL ) )
 	{
 		if ( pszReason )
 		{

game/shared/tf/tf_weapon_bottle.cpp

@@ -166,10 +166,11 @@ void CTFStickBomb::Smack( void )
 		{
 			Vector vecForward; 
 			AngleVectors( pTFPlayer->EyeAngles(), &vecForward );
-			Vector vecSwingStart = pTFPlayer->Weapon_ShootPosition();
+			Vector vecCenter = pTFPlayer->WorldSpaceCenter();
+		    Vector vecSwingStart = pTFPlayer->Weapon_ShootPosition();
 			Vector vecSwingEnd = vecSwingStart + vecForward * GetSwingRange();
 
-			Vector explosion = vecSwingStart;
+			Vector explosion = vecCenter;
 
 			CPVSFilter filter( explosion );
 
@@ -191,7 +192,7 @@ void CTFStickBomb::Smack( void )
 			if ( IsCurrentAttackACrit() )
 				dmgType |= DMG_CRITICAL;
 
-			CTakeDamageInfo info( pTFPlayer, pTFPlayer, this, explosion, explosion, 75.0f, dmgType, TF_DMG_CUSTOM_STICKBOMB_EXPLOSION, &explosion );
+			CTakeDamageInfo info( pTFPlayer, pTFPlayer, this, vec3_origin, explosion, 75.0f, dmgType, TF_DMG_CUSTOM_STICKBOMB_EXPLOSION, &explosion );
 			CTFRadiusDamageInfo radiusinfo( &info, explosion, 100.f );
 			TFGameRules()->RadiusDamage( radiusinfo );
 		}

game/shared/tf/tf_weapon_grenade_pipebomb.cpp

@@ -32,6 +32,8 @@
 #include "takedamageinfo.h"
 #include "tf_team.h"
 #include "physics_collisionevent.h"
+#include "vcollide.h"
+#include "vcollide_parse.h"
 #ifdef TF_RAID_MODE
 #include "player_vs_environment/boss_alpha/boss_alpha.h"
 #endif // TF_RAID_MODE
@@ -492,7 +494,8 @@ CTFGrenadePipebombProjectile* CTFGrenadePipebombProjectile::Create( const Vector
 //-----------------------------------------------------------------------------
 void CTFGrenadePipebombProjectile::Spawn()
 {
-	if ( HasStickyEffects() )
+	const bool bHasStickyEffects = HasStickyEffects();
+	if ( bHasStickyEffects )
 	{
 		// Set this to max, so effectively they do not self-implode.
 
@@ -526,6 +529,27 @@ void CTFGrenadePipebombProjectile::Spawn()
 
 	BaseClass::Spawn();
 
+	// Reset vphysics model but keep the material
+	if ( !bHasStickyEffects && m_iType == TF_GL_MODE_CANNONBALL )
+	{
+		solid_t solid;
+		PhysModelParseSolid( solid, this, GetModelIndex() );
+		VPhysicsDestroyObject();
+		int surfaceProp = -1;
+	    if ( solid.surfaceprop[0] )
+	    {
+		    surfaceProp = physprops->GetSurfaceIndex( solid.surfaceprop );
+	    }
+		IPhysicsObject *pPhysicsObject = PhysModelCreate( this, modelinfo->GetModelIndex( TF_WEAPON_PIPEGRENADE_MODEL ), GetAbsOrigin(), GetAbsAngles(), NULL );
+		pPhysicsObject->SetMaterialIndex(surfaceProp);
+	    if ( pPhysicsObject )
+	    {
+		    VPhysicsSetObject( pPhysicsObject );
+		    SetMoveType( MOVETYPE_VPHYSICS );
+			pPhysicsObject->Wake();
+	    }
+	}
+
 	m_bTouched = false;
 	m_flCreationTime = gpGlobals->curtime;
 

game/shared/tf/tf_weaponbase_melee.cpp

@@ -749,7 +749,7 @@ void CTFWeaponBaseMelee::Smack( void )
 #ifdef GAME_DLL
 		for( int i=0; i<m_potentialVictimVector.Count(); ++i )
 		{
-			if ( m_potentialVictimVector[i] != NULL && m_potentialVictimVector[i]->IsAlive() )
+			if ( m_potentialVictimVector[i] == NULL || !m_potentialVictimVector[i]->IsAlive() )
 			{
 				bIsCleanMiss = false;
 				break;
@@ -820,13 +820,30 @@ void CTFWeaponBaseMelee::DoMeleeDamage( CBaseEntity* ent, trace_t& trace, float
 	CALL_ATTRIB_HOOK_INT( iCritFromBehind, crit_from_behind );
 	if ( iCritFromBehind > 0 )
 	{
-		Vector entForward; 
-		AngleVectors( ent->EyeAngles(), &entForward );
-
-		Vector toEnt = ent->GetAbsOrigin() - pPlayer->GetAbsOrigin();
-		toEnt.NormalizeInPlace();
-
-		if ( DotProduct( toEnt, entForward ) > 0.7071f )
+		// Get a vector from owner origin to target origin
+	    Vector vecToTarget;
+	    vecToTarget = ent->WorldSpaceCenter() - pPlayer->WorldSpaceCenter();
+	    vecToTarget.z = 0.0f;
+	    vecToTarget.NormalizeInPlace();
+
+	    // Get owner forward view vector
+	    Vector vecOwnerForward;
+	    AngleVectors( pPlayer->EyeAngles(), &vecOwnerForward );
+	    vecOwnerForward.z = 0.0f;
+	    vecOwnerForward.NormalizeInPlace();
+
+	    // Get target forward view vector
+	    Vector vecTargetForward;
+	    AngleVectors( ent->EyeAngles(), &vecTargetForward );
+	    vecTargetForward.z = 0.0f;
+	    vecTargetForward.NormalizeInPlace();
+
+		// Make sure owner is behind, facing and aiming at target's back
+	    float flPosVsTargetViewDot = DotProduct( vecToTarget, vecTargetForward );	// Behind?
+	    float flPosVsOwnerViewDot = DotProduct( vecToTarget, vecOwnerForward );		// Facing?
+	    float flViewAnglesDot = DotProduct( vecTargetForward, vecOwnerForward );	// Facestab?
+
+		if ( flPosVsTargetViewDot > 0.f && flPosVsOwnerViewDot > 0.5 && flViewAnglesDot > -0.3f )
 		{
 			iDmgType |= DMG_CRITICAL;
 		}