From 3ad00986e2e72ecba5844f384718d108b6129c18 Mon Sep 17 00:00:00 2001
From: RoyalBlue1 <malte.hoermeyer@web.de>
Date: Thu, 13 Jan 2022 00:41:47 +0100
Subject: Another Fix to Amped Hardpoint after Playtesting

Corrected Logic for contested Scoring
Fixed Hardpoint Amped playing repeating while holding point amped
---
 .../mod/scripts/vscripts/gamemodes/_gamemode_cp.nut                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Northstar.CustomServers')

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_cp.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_cp.nut
index ebccee1b..a6e72ff9 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_cp.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_cp.nut
@@ -345,7 +345,7 @@ void function HardpointThink( HardpointStruct hardpoint )
 				if(GetHardpointState(hardpoint)<CAPTURE_POINT_STATE_AMPING)
 					SetHardpointState(hardpoint,CAPTURE_POINT_STATE_AMPING)
 				SetHardpointCaptureProgress( hardpoint, min( 2.0, GetHardpointCaptureProgress( hardpoint ) + ( deltaTime / HARDPOINT_AMPED_DELAY * capperAmount ) ) )
-				if(GetHardpointCaptureProgress(hardpoint)==2.0)
+				if(GetHardpointCaptureProgress(hardpoint)==2.0&&!(GetHardpointState(hardpoint)==CAPTURE_POINT_STATE_AMPED))
 				{
 					SetHardpointState( hardpoint, CAPTURE_POINT_STATE_AMPED )
 
@@ -359,7 +359,7 @@ void function HardpointThink( HardpointStruct hardpoint )
 
 
 		// scoring
-		if ( hardpointEnt.GetTeam() != TEAM_UNASSIGNED && GetHardpointState( hardpoint ) >= CAPTURE_POINT_STATE_CAPTURED && currentTime - lastScoreTime >= TEAM_OWNED_SCORE_FREQ && !hardpointBlocked&&cappingTeam==GetOtherTeam(hardpointEnt.GetTeam()))
+		if ( hardpointEnt.GetTeam() != TEAM_UNASSIGNED && GetHardpointState( hardpoint ) >= CAPTURE_POINT_STATE_CAPTURED && currentTime - lastScoreTime >= TEAM_OWNED_SCORE_FREQ && !hardpointBlocked&&!(cappingTeam==GetOtherTeam(hardpointEnt.GetTeam())))
 		{
 			lastScoreTime = currentTime
 
-- 
cgit v1.2.3