update

Author: Kitsune44

reactivedrop/fgd/reactivedrop.fgd

@@ -149,8 +149,8 @@
 	input SetExcluded( string ) : "Change the NPC class excluded from collisions"
 	input SetInvert( integer ) : "Set the state of inversion for NPC class exclusion (0 or 1)"
 	input AllowFade( integer ) : "Enable or disable fading (0 or 1)"
-	input CollideWithGrenades( integer ) : "Change CollideWithGrenades at runtime (0, 1 or 2)"
-	input CollideWithMarines( integer ) : "Change CollideWithMarines at runtime (0 or 1)"
+	input SetCollideWithGrenades(integer) : "Change CollideWithGrenades at runtime (0, 1 or 2)"
+	input SetCollideWithMarines(integer) : "Enable or disable marine collisions (0 or 1)"
 ]
 
 @PointClass base(prop_dynamic_base, EnableDisable) sphere(fademindist) sphere(fademaxdist) studioprop() = prop_asw_fade :

src/game/server/swarm/func_asw_fade.cpp

@@ -11,19 +11,22 @@
 LINK_ENTITY_TO_CLASS( func_asw_fade, CFunc_ASW_Fade );
 
 BEGIN_DATADESC( CFunc_ASW_Fade )
-	DEFINE_FIELD( m_bHasProxies, FIELD_BOOLEAN ),
-	DEFINE_KEYFIELD( m_nFadeOpacity, FIELD_CHARACTER, "fade_opacity" ),
-	DEFINE_INPUT( m_iCollideWithGrenades, FIELD_CHARACTER, "CollideWithGrenades" ),
-	DEFINE_INPUT( m_bCollideWithMarines, FIELD_BOOLEAN, "CollideWithMarines" ),
-	DEFINE_INPUT( m_bAllowFade, FIELD_BOOLEAN, "AllowFade" ),
+DEFINE_FIELD( m_bHasProxies, FIELD_BOOLEAN ),
+DEFINE_KEYFIELD( m_nFadeOpacity, FIELD_CHARACTER, "fade_opacity" ),
+DEFINE_KEYFIELD( m_iCollideWithGrenades, FIELD_CHARACTER, "CollideWithGrenades" ),
+DEFINE_KEYFIELD( m_bCollideWithMarines, FIELD_BOOLEAN, "CollideWithMarines" ),
+DEFINE_KEYFIELD( m_bAllowFade, FIELD_BOOLEAN, "AllowFade" ),
+
+DEFINE_INPUTFUNC( FIELD_INTEGER, "SetCollideWithGrenades", InputSetCollideWithGrenades ),
+DEFINE_INPUTFUNC( FIELD_BOOLEAN, "SetCollideWithMarines", InputSetCollideWithMarines ),
 END_DATADESC()
 
 IMPLEMENT_SERVERCLASS_ST( CFunc_ASW_Fade, DT_Func_ASW_Fade )
-	SendPropInt( SENDINFO( m_nFadeOpacity ), 8, SPROP_UNSIGNED ),
-	SendPropInt( SENDINFO( m_iCollideWithGrenades ), 2, SPROP_UNSIGNED ),
-	SendPropBool( SENDINFO( m_bCollideWithMarines ) ),
-	SendPropBool( SENDINFO( m_bAllowFade ) ),
-	SendPropBool( SENDINFO( m_bHasProxies ) ),
+SendPropInt( SENDINFO( m_nFadeOpacity ), 8, SPROP_UNSIGNED ),
+SendPropInt( SENDINFO( m_iCollideWithGrenades ), 2, SPROP_UNSIGNED ),
+SendPropBool( SENDINFO( m_bCollideWithMarines ) ),
+SendPropBool( SENDINFO( m_bAllowFade ) ),
+SendPropBool( SENDINFO( m_bHasProxies ) ),
 END_SEND_TABLE()
 
 CFunc_ASW_Fade::CFunc_ASW_Fade()
@@ -72,6 +75,44 @@ void CFunc_ASW_Fade::DisableCollisionsWithMarine( CBaseEntity *pMarine )
 	}
 }
 
+void CFunc_ASW_Fade::InputSetCollideWithGrenades( inputdata_t& inputdata )
+{
+	m_iCollideWithGrenades = clamp( inputdata.value.Int(), 0, 2 );
+
+	static const char* pszExplosiveClasses[] = {
+		"asw_mine",
+		"npc_zombine",
+		"asw_rocket",
+        "grenadespit",
+		"asw_missile_round",
+		"asw_grenade_cluster",
+		"asw_flare_projectile",
+		"asw_laser_mine",
+		"asw_grenade_vindicator",
+		nullptr
+	};
+
+	for ( const char** pszClass = pszExplosiveClasses; *pszClass; ++pszClass )
+	{
+		CBaseEntity* pGrenade = NULL;
+		while ( ( pGrenade = gEntList.FindEntityByClassname( pGrenade, *pszClass ) ) != NULL )
+		{
+			DisableCollisionsWithGrenade( pGrenade );
+		}
+	}
+}
+
+void CFunc_ASW_Fade::InputSetCollideWithMarines( inputdata_t& inputdata )
+{
+	m_bCollideWithMarines = !!inputdata.value.Int();
+
+	CBaseEntity* pMarine = NULL;
+	while ( ( pMarine = gEntList.FindEntityByClassname( pMarine, "asw_marine" ) ) != NULL )
+	{
+		DisableCollisionsWithMarine( pMarine );
+	}
+}
+
 bool CFunc_ASW_Fade::ShouldFade( CASW_Inhabitable_NPC *pNPC )
 {
 	if ( !m_bAllowFade || !pNPC || !pNPC->IsInhabited() || !pNPC->GetCommander() )

src/game/server/swarm/func_asw_fade.h

@@ -24,6 +24,9 @@ class CFunc_ASW_Fade : public CFuncBrush
 	static void DisableCollisionsWithGrenade( CBaseEntity *pGrenade );
 	static void DisableCollisionsWithMarine( CBaseEntity *pMarine );
 
+	void InputSetCollideWithGrenades( inputdata_t& inputdata );
+	void InputSetCollideWithMarines( inputdata_t& inputdata );
+
 	CNetworkVar( bool, m_bHasProxies );
 	// 0 = only when grenade spawns above the brush
 	// 1 = always