From 95cc8a5b80f6711661783fd9d0669bad4bfccdb1 Mon Sep 17 00:00:00 2001 From: x3Karma Date: Wed, 5 Jan 2022 00:41:29 +0800 Subject: Resets killstreak first before calculating kills. --- Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut index 119b1712..002b1331 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut @@ -148,6 +148,11 @@ void function ScoreEvent_PlayerKilled( entity victim, entity attacker, var damag if ( attacker.p.playerKillStreaks[ victim ] == DOMINATING_KILL_REQUIREMENT ) AddPlayerScore( attacker, "Dominating" ) + if ( Time() - attacker.s.lastKillTime > CASCADINGKILL_REQUIREMENT_TIME ) + { + attacker.s.currentTimedKillstreak = 0 // reset first before kill + attacker.s.lastKillTime = Time() + } // timed killstreaks if ( Time() - attacker.s.lastKillTime <= CASCADINGKILL_REQUIREMENT_TIME ) @@ -161,8 +166,6 @@ void function ScoreEvent_PlayerKilled( entity victim, entity attacker, var damag else if ( attacker.s.currentTimedKillstreak == MEGAKILL_REQUIREMENT_KILLS ) AddPlayerScore( attacker, "MegaKill" ) } - else - attacker.s.currentTimedKillstreak = 0 // reset if a kill took too long attacker.s.lastKillTime = Time() } @@ -231,4 +234,4 @@ void function ScoreEvent_SetupEarnMeterValuesForMixedModes() // mixed modes in t void function ScoreEvent_SetupEarnMeterValuesForTitanModes() { // relatively sure we don't have to do anything here but leaving this function for consistency -} \ No newline at end of file +} -- cgit v1.2.3