aboutsummaryrefslogtreecommitdiff
path: root/Northstar.CustomServers/mod
diff options
context:
space:
mode:
authorBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2022-01-20 23:17:15 +0000
committerGitHub <noreply@github.com>2022-01-20 23:17:15 +0000
commit289a68ff58639971ee82db9c658a47aaeecf66ef (patch)
treee56e728f1684dd6153622b4437e191be8453624e /Northstar.CustomServers/mod
parent60d3c12955ff03ba594f16c863258994a995c39d (diff)
parent245f82b521291eebdf99f2ad52cc1eec6ca651fc (diff)
downloadNorthstarMods-289a68ff58639971ee82db9c658a47aaeecf66ef.tar.gz
NorthstarMods-289a68ff58639971ee82db9c658a47aaeecf66ef.zip
Merge pull request #146 from R2Northstar/revert-141-x3Karma-maphack-patch
Revert "Map Hack patch"
Diffstat (limited to 'Northstar.CustomServers/mod')
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut35
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/burnmeter/cl_maphack.nut90
2 files changed, 10 insertions, 115 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
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