diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2022-01-20 23:16:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 23:16:26 +0000 |
| commit | 57cd8727805855e461287a3b452d88547be000aa (patch) | |
| tree | 01291c5a275121d27a61bde521e0365b0cbb83fc | |
| parent | 60d3c12955ff03ba594f16c863258994a995c39d (diff) | |
| download | NorthstarMods-57cd8727805855e461287a3b452d88547be000aa.tar.gz NorthstarMods-57cd8727805855e461287a3b452d88547be000aa.zip | |
Revert "Update _burnmeter.gnut"
This reverts commit 0a169db4ab3db1f05f3a95b73e3b55f0268239c5.
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut b/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut index dcae6bd2..d1f4bd80 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut +++ b/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut @@ -378,40 +378,25 @@ void function PlayerUsesMaphackBurncardThreaded( entity player ) array<entity> aliveplayers = GetPlayerArray()
foreach ( entity otherPlayer in GetPlayerArray() )
{
- Remote_CallFunction_Replay( otherPlayer, "ServerCallback_SonarPulseFromPosition", player.GetOrigin().x, player.GetOrigin().y, player.GetOrigin().z, 2000)
+ Remote_CallFunction_Replay( otherPlayer, "ServerCallback_SonarPulseFromPosition", player.GetOrigin().x, player.GetOrigin().y, player.GetOrigin().z, SONAR_GRENADE_RADIUS )
- if ( otherPlayer.GetTeam() != player.GetTeam() && aliveplayers.find(otherPlayer) != -1 )
+ if ( otherPlayer.GetTeam() != player.GetTeam() && aliveplayers.find(otherPlayer) != -1 && aliveplayers.find(player) != -1 )
{
- MapHackSonar(player, otherPlayer)
+ StatusEffect_AddTimed( otherPlayer, eStatusEffect.maphack_detected, 1.0, MAPHACK_PULSE_DELAY / 2, 0.0 )
+ SonarStart( otherPlayer, player.GetOrigin(), player.GetTeam(), player )
+ IncrementSonarPerTeam( player.GetTeam() )
}
}
wait MAPHACK_PULSE_DELAY
- foreach ( entity otherPlayer in GetPlayerArray() )
- {
- if ( otherPlayer.GetTeam() != player.GetTeam() && aliveplayers.find(otherPlayer) != -1 ) {
- MapHackSonarStop(player, otherPlayer)
+ foreach ( entity otherPlayer in GetPlayerArray() ) {
+ if ( otherPlayer.GetTeam() != player.GetTeam() && aliveplayers.find(otherPlayer) != -1 && aliveplayers.find(player) != -1 ) {
+ SonarEnd (otherPlayer, player.GetTeam() )
+ DecrementSonarPerTeam( player.GetTeam() )
}
}
}
}
-void function MapHackSonar(entity player, entity otherPlayer)
-{
- // doing this should prevent infinite map hacks
- StatusEffect_AddTimed( otherPlayer, eStatusEffect.maphack_detected, 1.0, MAPHACK_PULSE_DELAY / 2, 0.0 )
- Highlight_SetEnemyHighlight( otherPlayer, "enemy_sonar" )
- Highlight_SetSonarHighlightWithParam1( otherPlayer, "enemy_sonar", player.GetOrigin() )
- Highlight_SetSonarHighlightOrigin( otherPlayer, player.GetOrigin() )
- otherPlayer.HighlightEnableForTeam( player.GetTeam() )
-}
-void function MapHackSonarStop(entity player, entity otherPlayer)
-{
- otherPlayer.HighlightDisableForTeam( player.GetTeam() )
- otherPlayer.HighlightSetTeamBitField( 0 )
- if (Hightlight_HasEnemyHighlight( otherPlayer, "enemy_sonar"))
- Highlight_ClearEnemyHighlight( otherPlayer )
-}
-
void function PlayerUsesPhaseRewindBurncard( entity player )
{
thread PlayerUsesPhaseRewindBurncardThreaded( player )
@@ -525,4 +510,4 @@ void function PlayerUsesReaperfallBurncard( entity player ) DispatchSpawn( reaper )
thread SuperSpectre_WarpFall( reaper )
-}
+}
\ No newline at end of file |