aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorx3Karma <juliuslimck@gmail.com>2022-01-05 00:41:29 +0800
committerGitHub <noreply@github.com>2022-01-05 00:41:29 +0800
commit95cc8a5b80f6711661783fd9d0669bad4bfccdb1 (patch)
tree9382c1c59ea19f31171c71956033e3981bb25e8a
parente128e87bd23d5c7702e92c01e07684e3804f5a69 (diff)
downloadNorthstarMods-95cc8a5b80f6711661783fd9d0669bad4bfccdb1.tar.gz
NorthstarMods-95cc8a5b80f6711661783fd9d0669bad4bfccdb1.zip
Resets killstreak first before calculating kills.
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut9
1 files 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
+}