MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-06-01 00:17:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Flaregun: Don't burn boss enemies that require an RPG to take down. Only burn NPCs and ignitable props.

Browse Source
This commit is contained in:
Derek Dik 2018-11-08 16:56:00 -05:00
parent 83dfddfb13
commit 7ffe672afc
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sp/src/game/server/mod/weapon_custom_flaregun.cpp
View File

@ -339,9 +339,9 @@ void CFlareGunProjectile::FlareGunProjectileBurnTouch(CBaseEntity *pOther)
{ {
if (pOther && pOther->m_takedamage && (m_flNextDamage < gpGlobals->curtime)) if (pOther && pOther->m_takedamage && (m_flNextDamage < gpGlobals->curtime))
{ {
IgniteOtherIfAllowed(pOther);
pOther->TakeDamage(CTakeDamageInfo(this, m_pOwner, 1, (DMG_BULLET | DMG_BURN))); pOther->TakeDamage(CTakeDamageInfo(this, m_pOwner, 1, (DMG_BULLET | DMG_BURN)));
m_flNextDamage = gpGlobals->curtime + 1.0f; m_flNextDamage = gpGlobals->curtime + 1.0f;
IgniteOtherIfAllowed(pOther);
} }
} }
@ -351,15 +351,28 @@ void CFlareGunProjectile::IgniteOtherIfAllowed(CBaseEntity * pOther)
if (pOther->IsPlayer()) if (pOther->IsPlayer())
return; return;
// Don't burn friendly NPCs
CAI_BaseNPC *pNPC; CAI_BaseNPC *pNPC;
pNPC = dynamic_cast<CAI_BaseNPC*>(pOther); pNPC = dynamic_cast<CAI_BaseNPC*>(pOther);
if (pNPC && pNPC->IsPlayerAlly()) if (pNPC) {
return; // Don't burn friendly NPCs
if (pNPC->IsPlayerAlly())
return;
// If this is an ignitable entity that isn't the player or an ally, ignite it! // Don't burn boss enemies
CBaseAnimating *pAnim; if (FStrEq(STRING(pNPC->m_iClassname), "npc_combinegunship")
pAnim = dynamic_cast<CBaseAnimating*>(pOther); || FStrEq(STRING(pNPC->m_iClassname), "npc_combinedropship")
if (pAnim) || FStrEq(STRING(pNPC->m_iClassname), "npc_strider")
pAnim->IgniteLifetime(30.0f); || FStrEq(STRING(pNPC->m_iClassname), "npc_helicopter")
)
return;
// Burn this NPC
pNPC->IgniteLifetime(30.0f);
}
// If this is a breakable prop, ignite it!
CBreakableProp *pBreakable;
pBreakable = dynamic_cast<CBreakableProp*>(pOther);
if (pBreakable)
pBreakable->IgniteLifetime(30.0f);
} }