From 57cd8727805855e461287a3b452d88547be000aa Mon Sep 17 00:00:00 2001 From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> Date: Thu, 20 Jan 2022 23:16:26 +0000 Subject: Revert "Update _burnmeter.gnut" This reverts commit 0a169db4ab3db1f05f3a95b73e3b55f0268239c5. --- .../mod/scripts/vscripts/burnmeter/_burnmeter.gnut | 35 +++++++--------------- 1 file 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 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 -- cgit v1.2.3 From 0823ffbaf92041715c651773bef79dcb946db5c2 Mon Sep 17 00:00:00 2001 From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> Date: Thu, 20 Jan 2022 23:16:26 +0000 Subject: Revert "Update mod.json to add cl_maphack.nut" This reverts commit 5f66544b5d5d6ad42221d14d5f67235877930e15. --- Northstar.CustomServers/mod.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Northstar.CustomServers/mod.json b/Northstar.CustomServers/mod.json index ea591352..28a08868 100644 --- a/Northstar.CustomServers/mod.json +++ b/Northstar.CustomServers/mod.json @@ -113,13 +113,7 @@ "After": "SvLoadoutsMP_Init" } }, - { - "Path": "burnmeter/cl_maphack.nut", - "RunOn": "CLIENT", - "ClientCallback": { - "Before": "ClMapHack_Init" - } - }, + { "Path": "lobby/sh_private_lobby_modes_init.gnut", "RunOn": "( SERVER || CLIENT ) && MP" -- cgit v1.2.3 From 245f82b521291eebdf99f2ad52cc1eec6ca651fc Mon Sep 17 00:00:00 2001 From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> Date: Thu, 20 Jan 2022 23:16:26 +0000 Subject: Revert "Add "MAPHACK DETECTED" on client side and sonars the viewmodel" This reverts commit 5567438641037b23cb95bf7c6a046eb19e172917. --- .../mod/scripts/vscripts/burnmeter/cl_maphack.nut | 90 ---------------------- 1 file changed, 90 deletions(-) delete mode 100644 Northstar.CustomServers/mod/scripts/vscripts/burnmeter/cl_maphack.nut diff --git a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/cl_maphack.nut b/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/cl_maphack.nut deleted file mode 100644 index 58b408ca..00000000 --- a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/cl_maphack.nut +++ /dev/null @@ -1,90 +0,0 @@ -global function ClMapHack_Init - -void function ClMapHack_Init() -{ - StatusEffect_RegisterEnabledCallback( eStatusEffect.maphack_detected, EntitySonarDetectedEnabled ) - StatusEffect_RegisterDisabledCallback( eStatusEffect.maphack_detected, EntitySonarDetectedDisabled ) -} - -void function EntitySonarDetectedEnabled( entity ent, int statusEffect, bool actuallyChanged ) -{ - if ( ent == GetLocalViewPlayer() ) - { - // player is already maphack highlighted - if ( statusEffect == eStatusEffect.maphack_detected && StatusEffect_Get( ent, eStatusEffect.lockon_detected ) ) - return - - entity viewModelEntity = ent.GetViewModelEntity() - entity firstPersonProxy = ent.GetFirstPersonProxy() - entity predictedFirstPersonProxy = ent.GetPredictedFirstPersonProxy() - - vector highlightColor = statusEffect == eStatusEffect.maphack_detected ? HIGHLIGHT_COLOR_ENEMY : <1, 0, 0> - - if ( IsValid( viewModelEntity ) ) - SonarViewModelHighlight( viewModelEntity, highlightColor ) - - if ( IsValid( firstPersonProxy ) ) - SonarViewModelHighlight( firstPersonProxy, highlightColor ) - - if ( IsValid( predictedFirstPersonProxy ) ) - SonarViewModelHighlight( predictedFirstPersonProxy, highlightColor ) - - thread PlayLoopingSonarSound( ent ) - } - else - { - ClInitHighlight( ent ) - } -} - -void function EntitySonarDetectedDisabled( entity ent, int statusEffect, bool actuallyChanged ) -{ - if ( ent == GetLocalViewPlayer() ) - { - // player should have maphack highlighted - if ( statusEffect == eStatusEffect.maphack_detected && StatusEffect_Get( ent, eStatusEffect.lockon_detected ) ) - { - return - } - else if ( statusEffect == eStatusEffect.lockon_detected && StatusEffect_Get( ent, eStatusEffect.maphack_detected ) ) - { - // restore sonar after lockon wears off - EntitySonarDetectedEnabled( ent, eStatusEffect.maphack_detected, true ) - return - } - - entity viewModelEntity = ent.GetViewModelEntity() - entity firstPersonProxy = ent.GetFirstPersonProxy() - entity predictedFirstPersonProxy = ent.GetPredictedFirstPersonProxy() - - if ( IsValid( viewModelEntity ) ) - SonarViewModelClearHighlight( viewModelEntity ) - - if ( IsValid( firstPersonProxy ) ) - SonarViewModelClearHighlight( firstPersonProxy ) - - if ( IsValid( predictedFirstPersonProxy ) ) - SonarViewModelClearHighlight( predictedFirstPersonProxy ) - - ent.Signal( "EntitySonarDetectedDisabled" ) - } - else - { - ClInitHighlight( ent ) - } -} - -void function PlayLoopingSonarSound( entity ent ) -{ - EmitSoundOnEntity( ent, "HUD_MP_EnemySonarTag_Activated_1P" ) - - ent.EndSignal( "EntitySonarDetectedDisabled" ) - ent.EndSignal( "OnDeath" ) - - while( true ) - { - wait 1.5 - EmitSoundOnEntity( ent, "HUD_MP_EnemySonarTag_Flashed_1P" ) - } - -} \ No newline at end of file -- cgit v1.2.3