Skip to content
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

Jump to bottom

Afterburn from Flamer should be considered Friendly Fire as well #834

Open
wants to merge 2 commits into
base: reactivedrop_beta
Choose a base branch
from
+5 −4
Open

Afterburn from Flamer should be considered Friendly Fire as well #834

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e290bc3
Afterburn from Flamer should be considered Friendly Fire as well
ModdedMarionette Nov 7, 2024
10ae132
Resolving "conflict"
ModdedMarionette Nov 7, 2024
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
9 changes: 5 additions & 4 deletions src/game/server/swarm/asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,8 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info )

// drop the damage down by our absorption buffer
bool bFlamerDot = !!(newInfo.GetDamageType() & DMG_DIRECT);
if ( newInfo.GetDamage() > 0 && pAttacker != this && !bFlamerDot )
bool bIsFlamer = newInfo.GetWeapon() && newInfo.GetWeapon()->Classify() == CLASS_ASW_FLAMER;
if ( newInfo.GetDamage() > 0 && pAttacker != this && (!bFlamerDot || bIsFlamer) )
{
if ( asw_marine_ff_absorption.GetInt() != 0 )
{
Expand All @@ -1447,7 +1448,7 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info )
}
}
// if 0 don't chatter about friendly fire
if ( rd_chatter_about_ff.GetBool() )
if ( rd_chatter_about_ff.GetBool() && !bFlamerDot )
GetMarineSpeech()->QueueChatter( CHATTER_FRIENDLY_FIRE, gpGlobals->curtime + 0.4f, gpGlobals->curtime + 1.0f );

m_fLastFriendlyFireTime = gpGlobals->curtime;
Expand Down Expand Up @@ -1829,7 +1830,7 @@ int CASW_Marine::OnTakeDamage_Alive( const CTakeDamageInfo &info )
}

// Mari: Friendly fire from flamer should be considered regardless if it deals 0 damage
if (result > 0 || (bFriendlyFire && (info.GetDamageType() & DMG_BURN) && info.GetWeapon()->Classify() == CLASS_ASW_FLAMER))
if (result > 0 || (bFriendlyFire && (info.GetDamageType() & DMG_BURN) && info.GetWeapon() && info.GetWeapon()->Classify() == CLASS_ASW_FLAMER))
{
// update our stats
CASW_Marine_Resource *pMR = GetMarineResource();
Expand Down Expand Up @@ -5065,7 +5066,7 @@ void CASW_Marine::ASW_Ignite( float flFlameLifetime, float flSize, CBaseEntity *
bool bFriendlyFire = IRelationType( pAttacker ) == D_LI;

// Mari: special scaling for flamer ff
if (asw_marine_ff_absorption.GetInt() > 0 && bFriendlyFire && pDamagingWeapon->Classify() == CLASS_ASW_FLAMER)
if ( asw_marine_ff_absorption.GetInt() > 0 && bFriendlyFire && pDamagingWeapon && pDamagingWeapon->Classify() == CLASS_ASW_FLAMER )
Copy link
Contributor Author

@ModdedMarionette ModdedMarionette Nov 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a "conflict" for not having spaces at the start and end of the parathesis.

{
flFlameLifetime = MAX( flFlameLifetime*0.1875f, MIN( flFlameLifetime * m_fFriendlyFireAbsorptionTime, (m_fLastFriendlyFireTime + flFlameLifetime*0.2f - gpGlobals->curtime)*5.0f ) );
}
Expand Down
Loading