diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2022-01-04 19:44:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-04 19:44:39 +0000 |
| commit | 133b0ece2b48ae726113d6bf5109e9666d5869aa (patch) | |
| tree | 8b129269a67fd2a6db36388382e69e72f080bb14 | |
| parent | 48f814ea8e35a33a6c3970f04335db74d983a8fa (diff) | |
| parent | 95cc8a5b80f6711661783fd9d0669bad4bfccdb1 (diff) | |
| download | NorthstarMods-133b0ece2b48ae726113d6bf5109e9666d5869aa.tar.gz NorthstarMods-133b0ece2b48ae726113d6bf5109e9666d5869aa.zip | |
Merge pull request #66 from x3Karma/patch-2
Resets killstreak first before calculating kills.
| -rw-r--r-- | Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut | 9 |
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 +} |