Merge pull request #858 from ReactiveDrop/die-vscript-func

Die() vscript function for inhabitable npcs

Author: BenLubar

src/game/server/basecombatcharacter.cpp

@@ -2274,7 +2274,7 @@ int CBaseCombatCharacter::OnTakeDamage_Alive( const CTakeDamageInfo &info )
 	float flDamage = info.GetDamage();
 	CBaseEntity* pInflictor = info.GetInflictor();
 #ifdef RD_VSCRIPT_INTERCEPT_ENTITY_DAMAGE
-	if ( m_ScriptScope.IsInitialized() && m_ScriptScope.ValueExists( "OnTakeDamage_Alive" ) )
+	if ( m_ScriptScope.IsInitialized() && m_ScriptScope.ValueExists( "OnTakeDamage_Alive" ) && info.GetCallVScriptHook() )
 	{
 		ScriptVariant_t newDamage;
 		ScriptStatus_t nStatus = m_ScriptScope.Call( "OnTakeDamage_Alive", &newDamage, ToHScript( pInflictor ), ToHScript( info.GetAttacker() ), ToHScript( info.GetWeapon() ), flDamage, info.GetDamageType(), info.GetAmmoName() );
@@ -2287,7 +2287,9 @@ int CBaseCombatCharacter::OnTakeDamage_Alive( const CTakeDamageInfo &info )
 			newDamage.AssignTo( &flDamage );
 		}
 	}
-	if ( CAlienSwarm *pAlienSwarm = ASWGameRules() )
+
+	CAlienSwarm *pAlienSwarm = ASWGameRules();
+	if ( pAlienSwarm && info.GetCallVScriptHook() )
 	{
 		ScriptVariant_t args[7];
 

src/game/server/swarm/asw_inhabitable_npc.cpp

@@ -151,6 +151,7 @@ BEGIN_ENT_SCRIPTDESC( CASW_Inhabitable_NPC, CBaseCombatCharacter, "Alien Swarm I
 	DEFINE_SCRIPTFUNC( SetHealthBarColor, "Sets the health bar color. Cheaper than spawning an asw_health_bar. Set alpha to 0 to disable the health bar." )
 	DEFINE_SCRIPTFUNC( SetHealthBarScale, "Sets the health bar scale. Negative scales hide the health bar if the alien's health is full." )
 	DEFINE_SCRIPTFUNC( SetHealthBarOffset, "Sets the health bar offset in local space." )
+	DEFINE_SCRIPTFUNC( Die, "Simple kill function for aliens and marines." )
 END_SCRIPTDESC()
 
 CASW_Inhabitable_NPC::CASW_Inhabitable_NPC()
@@ -344,6 +345,19 @@ void CASW_Inhabitable_NPC::Suicide()
 	TakeDamage( info );
 }
 
+void CASW_Inhabitable_NPC::Die()
+{
+	if ( !IsAlive() )
+		return;
+	
+	SetHealth( 1 );
+
+	CTakeDamageInfo info( NULL, NULL, 100, DMG_FALL );
+	info.SetCallVScriptHook( false );
+
+	TakeDamage( info );
+}
+
 // using entities over time
 bool CASW_Inhabitable_NPC::StartUsing( CBaseEntity *pEntity )
 {

src/game/server/swarm/asw_inhabitable_npc.h

@@ -50,6 +50,7 @@ class CASW_Inhabitable_NPC : public CAI_PlayerAlly, public IASW_Spawnable_NPC
 	char m_szInitialCommanderNetworkID[64]; // ASWNetworkID of the first commander for this marine in this mission
 	const char *GetPlayerName() const;
 	virtual void Suicide();
+	void Die();
 
 	// gun
 	CASW_Weapon *GetASWWeapon( int index ) const;

src/game/shared/takedamageinfo.cpp

@@ -29,6 +29,7 @@ BEGIN_SIMPLE_DATADESC( CTakeDamageInfo )
 	DEFINE_FIELD( m_iDamageStats, FIELD_INTEGER),
 	DEFINE_FIELD( m_iAmmoType, FIELD_INTEGER),
 	DEFINE_FIELD( m_flRadius, FIELD_FLOAT),
+	DEFINE_FIELD( m_bCallVScriptHook, FIELD_BOOLEAN),
 END_DATADESC()
 
 void CTakeDamageInfo::Init( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBaseEntity *pWeapon, const Vector &damageForce, const Vector &damagePosition, const Vector &reportedPosition, float flDamage, int bitsDamageType, int iCustomDamage )
@@ -58,6 +59,7 @@ void CTakeDamageInfo::Init( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBa
 	m_vecReportedPosition = reportedPosition;
 	m_iAmmoType = -1;
 	m_flRadius = 0.0f;
+	m_bCallVScriptHook = true;
 }
 
 CTakeDamageInfo::CTakeDamageInfo()

src/game/shared/takedamageinfo.h

@@ -83,6 +83,9 @@ class CTakeDamageInfo
 	float			GetRadius() const;
 	void			SetRadius( float fRadius );
 
+	bool			GetCallVScriptHook() const;
+	void			SetCallVScriptHook( bool bCall );
+
 	void			Set( CBaseEntity *pInflictor, CBaseEntity *pAttacker, float flDamage, int bitsDamageType, int iKillType = 0 );
 	void			Set( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBaseEntity *pWeapon, float flDamage, int bitsDamageType, int iKillType = 0 );
 	void			Set( CBaseEntity *pInflictor, CBaseEntity *pAttacker, const Vector &damageForce, const Vector &damagePosition, float flDamage, int bitsDamageType, int iKillType = 0, Vector *reportedPosition = NULL );
@@ -116,6 +119,7 @@ class CTakeDamageInfo
 	int				m_iDamageStats;
 	int				m_iAmmoType;			// AmmoType of the weapon used to cause this damage, if any
 	float			m_flRadius;
+	bool			m_bCallVScriptHook;
 
 	DECLARE_SIMPLE_DATADESC();
 };
@@ -344,6 +348,16 @@ inline void CTakeDamageInfo::SetRadius( float flRadius )
 	m_flRadius = flRadius;
 }
 
+inline bool CTakeDamageInfo::GetCallVScriptHook() const
+{
+	return m_bCallVScriptHook;
+}
+
+inline void CTakeDamageInfo::SetCallVScriptHook( bool bCall )
+{
+	m_bCallVScriptHook = bCall;
+}
+
 
 // -------------------------------------------------------------------------------------------------- //
 // Inlines.