Skip to content

Features: func_asw_fade: new inputs #980

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

Merged
BenLubar merged 17 commits into from
Oct 18, 2025
Merged

Features: func_asw_fade: new inputs #980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8cf78e1
func_asw_fade: add runtime IO inputs for CollideWithGrenades and Coll…
Kitsune44 Oct 16, 2025
2fcee00
update
Kitsune44 Oct 16, 2025
f03da22
update
Kitsune44 Oct 16, 2025
09160de
update
Kitsune44 Oct 16, 2025
1d61374
Merge branch 'reactivedrop_beta' into reactivedrop_beta
Kitsune44 Oct 16, 2025
9902366
update
Kitsune44 Oct 16, 2025
986d8ba
update
Kitsune44 Oct 16, 2025
698aeb9
update
Kitsune44 Oct 16, 2025
dd23db8
polishing
Kitsune44 Oct 16, 2025
2fa2705
Merge branch 'ReactiveDrop:reactivedrop_beta' into reactivedrop_beta
Kitsune44 Oct 16, 2025
b4ece85
Merge branch 'ReactiveDrop:reactivedrop_beta' into reactivedrop_beta
Kitsune44 Oct 17, 2025
ce98c29
Update src/game/client/swarm/c_func_asw_fade.h
Kitsune44 Oct 18, 2025
ad25179
Update src/game/client/swarm/c_func_asw_fade.cpp
Kitsune44 Oct 18, 2025
4dcbfb1
Update src/game/server/swarm/func_asw_fade.cpp
Kitsune44 Oct 18, 2025
7db27ed
Update src/game/server/swarm/func_asw_fade.cpp
Kitsune44 Oct 18, 2025
f5be9f0
Update src/game/server/swarm/func_asw_fade.h
Kitsune44 Oct 18, 2025
3d4635a
update: asw_bait and asw_grenade_prifle
Kitsune44 Oct 18, 2025
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
2 changes: 2 additions & 0 deletions reactivedrop/fgd/reactivedrop.fgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +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)"
]

@PointClass base(prop_dynamic_base, EnableDisable) sphere(fademindist) sphere(fademaxdist) studioprop() = prop_asw_fade :
Expand Down
1 change: 1 addition & 0 deletions src/game/client/swarm/c_func_asw_fade.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

IMPLEMENT_CLIENTCLASS_DT( C_Func_ASW_Fade, DT_Func_ASW_Fade, CFunc_ASW_Fade )
RecvPropInt( RECVINFO( m_nFadeOpacity ) ),
RecvPropInt( RECVINFO( m_iCollideWithGrenades ) ),
Comment thread
Kitsune44 marked this conversation as resolved.
Outdated
RecvPropBool( RECVINFO( m_bAllowFade ) ),
RecvPropBool( RECVINFO( m_bHasProxies ) ),
RecvPropBool( RECVINFO( m_bCollideWithMarines ) ),
Expand Down
1 change: 1 addition & 0 deletions src/game/client/swarm/c_func_asw_fade.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class C_Func_ASW_Fade : public C_FuncBrush, public IASW_Fade_List

IMPLEMENT_ASW_FADE_LIST( GetAbsOrigin() );
CNetworkVar( bool, m_bCollideWithMarines );
CNetworkVar( byte, m_iCollideWithGrenades );
Comment thread
Kitsune44 marked this conversation as resolved.
Outdated
};

#endif // _INCLUDED_C_FUNC_ASW_FADE_H
7 changes: 4 additions & 3 deletions src/game/server/swarm/func_asw_fade.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ LINK_ENTITY_TO_CLASS( func_asw_fade, CFunc_ASW_Fade );

BEGIN_DATADESC( CFunc_ASW_Fade )
DEFINE_FIELD( m_bHasProxies, FIELD_BOOLEAN ),
DEFINE_KEYFIELD( m_iCollideWithGrenades, FIELD_CHARACTER, "CollideWithGrenades" ),
DEFINE_KEYFIELD( m_bCollideWithMarines, FIELD_BOOLEAN, "CollideWithMarines" ),
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" ),
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 ),
Comment thread
Kitsune44 marked this conversation as resolved.
Outdated
SendPropBool( SENDINFO( m_bCollideWithMarines ) ),
Comment thread
Kitsune44 marked this conversation as resolved.
Outdated
SendPropBool( SENDINFO( m_bAllowFade ) ),
SendPropBool( SENDINFO( m_bHasProxies ) ),
Comment thread
Kitsune44 marked this conversation as resolved.
SendPropBool( SENDINFO( m_bCollideWithMarines ) ),
END_SEND_TABLE()

CFunc_ASW_Fade::CFunc_ASW_Fade()
Expand Down
2 changes: 1 addition & 1 deletion src/game/server/swarm/func_asw_fade.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class CFunc_ASW_Fade : public CFuncBrush
// 0 = only when grenade spawns above the brush
// 1 = always
// 2 = never
byte m_iCollideWithGrenades;
CNetworkVar( byte, m_iCollideWithGrenades );
Comment thread
Kitsune44 marked this conversation as resolved.
Outdated
CNetworkVar( bool, m_bCollideWithMarines );
CNetworkVar( byte, m_nFadeOpacity );
CNetworkVar( bool, m_bAllowFade );
Expand Down