Skip to content

Fix sniper rifle wall and shieldbug penetration #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anf3is wants to merge 4 commits into
base: reactivedrop_beta
Choose a base branch
from
Open

Fix sniper rifle wall and shieldbug penetration #1105

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2858c1d
feat: add chance and max penetrate to debug overlay
anf3is Aug 31, 2026
953e3ce
fix: recalculate trace when it starts in a solid it leaves
anf3is Aug 31, 2026
65c17e4
fix: prevent sniper rifle from piercing shielbugs
anf3is Sep 1, 2026
6ea480d
feat: add convar rd_shieldbug_pierce
anf3is Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 39 additions & 4 deletions src/game/shared/swarm/asw_marine_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ ConVar rd_difficulty_tier( "rd_difficulty_tier", "0", FCVAR_REPLICATED | FCVAR_C
ConVar sv_showimpacts( "sv_showimpacts", "0", FCVAR_REPLICATED, "Shows client (red) and server (blue) bullet impact point (1=both, 2=client-only, 3=server-only)" );
ConVar rd_shoot_from_face( "rd_shoot_from_face", "1", FCVAR_REPLICATED | FCVAR_CHEAT, "In first person, the gun fires out of our eyes instead of from where the gun is being held." );

ConVar rd_shieldbug_pierce( "rd_shieldbug_pierce", "0", FCVAR_REPLICATED | FCVAR_CHEAT, "Penetration force needed to pierce the Shieldbug's shield. \"0\" for no piercing." );

#ifdef GAME_DLL
extern ConVar ai_show_hull_attacks;
ConVar asw_melee_knockback_up_force( "asw_melee_knockback_up_force", "1.0", FCVAR_CHEAT );
Expand Down Expand Up @@ -1263,6 +1265,21 @@ void CASW_Marine::FirePenetratingBullets( const FireBulletsInfo_t &info, int iMa
}
VectorNormalize( vecFinalDir );

// if ( tr.startsolid )
// Msg( ">> startsolid fraction left:%f full:%f %s\n", tr.fractionleftsolid, tr.fraction, tr.m_pEnt ? tr.m_pEnt->GetClassname() : "" );
// started trace inside a cursed solid? // Fix sniper rifle world penetration #241
if ( tr.startsolid && tr.fraction != 0.0f && tr.DidHitWorld() )
{
// Could calculate new start point here with tr.fractionleftsolid,
// but the code down below already handles next penetration.
// Just prevent bad TraceLine escaping the solid causing seemingly
// infitite tracer with tr.m_Ent = solid it started in.
AI_TraceLine(info.m_vecSrc, info.m_vecSrc, MASK_SHOT, &traceFilter, &tr);
vecEnd = tr.endpos;
}
// else if ( tr.startsolid )
// Msg( " ... but it was ok I guess\n" );

#ifdef GAME_DLL
if ( ai_debug_shoot_positions.GetBool() )
{
Expand Down Expand Up @@ -1412,6 +1429,12 @@ void CASW_Marine::FirePenetratingBullets( const FireBulletsInfo_t &info, int iMa
}
}

if ( bShowHitboxes && IsInhabited() && tr.DidHit() )
{
CFmtStr text( "%.2f %d", fPenetrateChance, iMaxPenetrate );
NDebugOverlay::Text( tr.endpos, text, false, 4 );
}

// See if we hit glass
if ( tr.m_pEnt != NULL )
{
Expand All @@ -1434,6 +1457,7 @@ void CASW_Marine::FirePenetratingBullets( const FireBulletsInfo_t &info, int iMa
fDiceRoll = RandomFloat( 0.0f, 1.0f );
}

bool bShieldbugBlocked = false;
bool bPierce = ( tr.m_pEnt != NULL ) && ( fDiceRoll < fPenetrateChance) && !bHitGlass && !tr.DidHitWorld();
if (bPierce)
{
Expand All @@ -1444,9 +1468,17 @@ void CASW_Marine::FirePenetratingBullets( const FireBulletsInfo_t &info, int iMa
{
if ( tr.m_pEnt->Classify() == CLASS_ASW_SHIELDBUG ) // don't let bullets pass through shieldbugs
{
bPierce = false;
bShieldbugBlocked = ( tr.hitgroup == HITGROUP_BONE_SHIELD || tr.hitbox == 1 ); // see CASW_Shieldbug::BlockedDamage
bPierce = !bShieldbugBlocked; // allow piercing vulnerable body parts

if ( bShieldbugBlocked && rd_shieldbug_pierce.GetInt() > 0 && iMaxPenetrate >= rd_shieldbug_pierce.GetInt() )
{
bPierce = true;
// shields are tougher than flesh, so the bullet should lose more force
iMaxPenetrate -= rd_shieldbug_pierce.GetInt() - 1; // "-1": keep extra penetration for flashy tracer effect
}
}
else if ( ( info.m_nFlags & FIRE_BULLETS_NO_PIERCING_SPARK ) == 0 )
if ( bPierce && !( info.m_nFlags & FIRE_BULLETS_NO_PIERCING_SPARK ) )
{
CEffectData data;
data.m_vOrigin = tr.endpos;
Expand All @@ -1462,7 +1494,8 @@ void CASW_Marine::FirePenetratingBullets( const FireBulletsInfo_t &info, int iMa
}
}

if ( ( tr.m_pEnt != NULL ) && fPenetrateChance > 1.0f )
if ( ( tr.m_pEnt != NULL ) && fPenetrateChance > 1.0f &&
( tr.m_pEnt->Classify() != CLASS_ASW_SHIELDBUG || bPierce ) )
{
// We can only penetrate a few walls
fPenetrateChance -= 1.0f;
Expand Down Expand Up @@ -1513,13 +1546,15 @@ void CASW_Marine::FirePenetratingBullets( const FireBulletsInfo_t &info, int iMa
}

int iNextMaxPenetrate = iMaxPenetrate;
if ( !tr.DidHitWorld() )
if ( !tr.DidHitWorld() && !bShieldbugBlocked )
{
// Msg ( "Penetrate %.2f %d entity %s\n", fPenetrateChance, iMaxPenetrate, tr.m_pEnt->GetClassname() );
behindNPCInfo.m_pAdditionalIgnoreEnt = tr.m_pEnt;
iNextMaxPenetrate--;
}
else
{
// Msg ( "Penetrate %.2f %d world entity %s\n", fPenetrateChance, iMaxPenetrate, tr.m_pEnt->GetClassname() );
// Penetrate past the solid
behindNPCInfo.m_vecSrc = behindNPCInfo.m_vecSrc + behindNPCInfo.m_vecDirShooting * 28.0f;
behindNPCInfo.m_pAdditionalIgnoreEnt = NULL;
Expand Down
Loading