aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoyalBlue1 <malte.hoermeyer@web.de>2022-01-13 00:41:47 +0100
committerBarichello <artur@barichello.me>2022-01-16 16:00:13 -0300
commit3ad00986e2e72ecba5844f384718d108b6129c18 (patch)
tree31d2cb288a0bf403b08599d6608cdfa6d0b669cd
parentc7f31d6800a13780901d26bec957374322d3716e (diff)
downloadNorthstarMods-3ad00986e2e72ecba5844f384718d108b6129c18.tar.gz
NorthstarMods-3ad00986e2e72ecba5844f384718d108b6129c18.zip
Another Fix to Amped Hardpoint after Playtesting
Corrected Logic for contested Scoring Fixed Hardpoint Amped playing repeating while holding point amped
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_cp.nut4
1 files changed, 2 insertions, 2 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_cp.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_cp.nut
index ebccee1bf..a6e72ff9a 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