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

Weapon drop callback + Fix for weapons still dropping #692

Merged
merged 20 commits into from
Feb 28, 2024
Merged

Weapon drop callback + Fix for weapons still dropping #692

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d77694a
add weapon dropped callback
NoCatt Aug 25, 2023
3f759f6
remove weapon destroy from callback
NoCatt Aug 25, 2023
47b8b22
wrong bool checked
NoCatt Aug 25, 2023
02e9cf2
add comment
NoCatt Aug 25, 2023
e52b77b
fix funny spelling mistake
NoCatt Aug 25, 2023
e6bb363
default value of flag to true to replicate vanilla
NoCatt Aug 25, 2023
de97279
change place of flag to avoid crash
NoCatt Aug 25, 2023
0f26ab8
kid named space
NoCatt Aug 26, 2023
a588de1
wrong "!"
NoCatt Aug 26, 2023
dc7aef3
Merge branch 'weapon-drop-callback' of https://github.com/NoCatt/Nort…
NoCatt Aug 26, 2023
5ef5e35
revert whitespace change to avoid confusion
NoCatt Aug 26, 2023
761274a
fix capital letter in variable name
NoCatt Aug 26, 2023
8534500
NO SPACE
NoCatt Sep 2, 2023
01d78fa
NO NEWLINE
NoCatt Sep 2, 2023
5b55d21
EVEN LESS SPACE
NoCatt Sep 2, 2023
6df6129
spaces
NoCatt Sep 2, 2023
33c77d9
Merge branch 'main' into weapon-drop-callback
NoCatt Sep 16, 2023
086f462
Merge branch 'main' into weapon-drop-callback
NoCatt Sep 30, 2023
433bf19
Merge branch 'main' into weapon-drop-callback
NoCatt Oct 22, 2023
264c343
Merge branch 'main' into weapon-drop-callback
GeckoEidechse Feb 28, 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
20 changes: 4 additions & 16 deletions Northstar.CustomServers/mod/scripts/vscripts/_loadouts_mp.gnut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ void function SvLoadoutsMP_Init()
AddClientCommandCallback( "InGameMPMenuClosed", ClientCommandCallback_InGameMPMenuClosed )
AddClientCommandCallback( "LoadoutMenuClosed", ClientCommandCallback_LoadoutMenuClosed )
}

AddCallback_OnPlayerKilled( DestroyDroppedWeapon )
}

void function SetLoadoutGracePeriodEnabled( bool enabled )
Expand All @@ -62,20 +60,10 @@ void function SetLoadoutGracePeriodEnabled( bool enabled )

void function SetWeaponDropsEnabled( bool enabled )
{
file.weaponDropsEnabled = enabled
}

void function DestroyDroppedWeapon( entity victim, entity attacker, var damageInfo )
{
if ( !file.weaponDropsEnabled && IsValid( victim.GetActiveWeapon() ) )
thread DelayDestroyDroppedWeapon( victim.GetActiveWeapon() )
}

void function DelayDestroyDroppedWeapon( entity weapon )
{
WaitEndFrame()
if ( IsValid( weapon ) )
weapon.Destroy()
if( enabled )
FlagSet("WeaponDropsAllowed")
NoCatt marked this conversation as resolved.
Show resolved Hide resolved
NoCatt marked this conversation as resolved.
Show resolved Hide resolved
else
FlagClear("WeaponDropsAllowed")
NoCatt marked this conversation as resolved.
Show resolved Hide resolved
}

void function AddCallback_OnTryGetTitanLoadout( TryGetTitanLoadoutCallbackType callback )
Expand Down
2 changes: 2 additions & 0 deletions Northstar.CustomServers/mod/scripts/vscripts/mp/_base_gametype_mp.gnut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ void function BaseGametype_Init_MPSP()
AddCallback_OnPlayerKilled( CheckForAutoTitanDeath )
RegisterSignal( "PlayerRespawnStarted" )
RegisterSignal( "KillCamOver" )

FlagInit( "WeaponDropsAllowed", true )
}

void function SetIntermissionCamera( entity camera )
Expand Down
24 changes: 24 additions & 0 deletions Northstar.CustomServers/mod/scripts/vscripts/mp/_codecallbacks.gnut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ global function CodeCallback_OnProjectileGrappled
global function DamageInfo_ScaleDamage
global function CodeCallback_CheckPassThroughAddsMods
global function SetTitanMeterGainScale
global function CodeCallback_WeaponDropped
global function AddCallback_OnWeaponDropped

#if MP
global function CodeCallback_OnServerAnimEvent
Expand All @@ -43,6 +45,7 @@ struct
]

table<entity, AccumulatedDamageData> playerAccumulatedDamageData
array< void functionref( entity ) > weaponDroppedCallbacks
} file

void function CodeCallback_Init()
Expand Down Expand Up @@ -1030,4 +1033,25 @@ void function CodeCallback_OnServerAnimEvent( entity ent, string eventName )

PerfEnd( PerfIndexServer.CB_OnServerAnimEvent )
}

void function AddCallback_OnWeaponDropped( void functionref( entity ) callback )
{
file.weaponDroppedCallbacks.append( callback )
}

void function CodeCallback_WeaponDropped( entity weapon )
{
//shamelessly taken form SP
NoCatt marked this conversation as resolved.
Show resolved Hide resolved
if ( !IsValid( weapon ) )
return
//Might look a bit hacky to put it here, but thats how SP does it
NoCatt marked this conversation as resolved.
Show resolved Hide resolved
if ( !Flag( "WeaponDropsAllowed" ) )
{
weapon.Destroy()
return
}

foreach( callback in file.weaponDroppedCallbacks )
callback( weapon )
}
#endif // #if MP