This commit is contained in:
INeedBots 2020-09-26 21:15:23 -06:00
parent f26c31c9ad
commit 6f1bb3c9d4
3 changed files with 38 additions and 34 deletions

View File

@ -524,6 +524,7 @@ set scr_allow_intermission "0"
set scr_voting_bots "0" set scr_voting_bots "0"
set scr_nuke_increases_streak "0" set scr_nuke_increases_streak "0"
set headshot_detach_head "1" set headshot_detach_head "1"
set scr_killstreaks_increase_killstreak "1"
// _weapon // _weapon
set scr_allowDropWeaponOnCommand "1" set scr_allowDropWeaponOnCommand "1"

View File

@ -244,50 +244,51 @@ handleNormalDeath( lifeId, attacker, eInflictor, sWeapon, sMeansOfDeath )
if ( self _hasPerk( "specialty_copycat" ) ) if ( self _hasPerk( "specialty_copycat" ) )
self.pers["copyCatLoadout"] = attacker maps\mp\gametypes\_class::cloneLoadout(); self.pers["copyCatLoadout"] = attacker maps\mp\gametypes\_class::cloneLoadout();
if ( isAlive( attacker ) ) if ( isAlive( attacker ) && !level.scriptIncKillstreak )
{ {
// killstreaks only advance from kills earned this life // killstreaks only advance from kills earned this life
if ( isDefined( level.killStreakSpecialCaseWeapons[sWeapon] ) || sWeapon == "nuke_mp" ) // this is an optimization if ( isDefined( level.killStreakSpecialCaseWeapons[sWeapon] ) || sWeapon == "nuke_mp" ) // this is an optimization
{ {
switch ( sWeapon ) if (level.killstreaksIncreaseKillstreak)
{ {
case "ac130_105mm_mp": switch ( sWeapon )
case "ac130_40mm_mp": {
case "ac130_25mm_mp": case "ac130_105mm_mp":
if ( attacker.ac130LifeId == attacker.pers["deaths"] && !level.scriptIncKillstreak ) case "ac130_40mm_mp":
case "ac130_25mm_mp":
if ( attacker.ac130LifeId == attacker.pers["deaths"] )
attacker.pers["cur_kill_streak"]++;
break;
case "cobra_player_minigun_mp":
case "weapon_cobra_mk19_mp":
if ( attacker.heliRideLifeId == attacker.pers["deaths"] )
attacker.pers["cur_kill_streak"]++;
break;
case "cobra_20mm_mp":
case "artillery_mp":
case "stealth_bomb_mp":
case "remotemissile_projectile_mp":
case "sentry_minigun_mp":
case "harrier_20mm_mp":
case "pavelow_minigun_mp":
case "nuke_mp":
if ( isDefined( eInflictor ) && isDefined( eInflictor.lifeId ) )
killstreakLifeId = eInflictor.lifeId;
else
killstreakLifeId = attacker.lifeId;
if ( killstreakLifeId == attacker.pers["deaths"] && (level.nukeIncreasesStreak || sWeapon != "nuke_mp") )
attacker.pers["cur_kill_streak"]++;
break;
default:
attacker.pers["cur_kill_streak"]++; attacker.pers["cur_kill_streak"]++;
break; break;
case "cobra_player_minigun_mp": }
case "weapon_cobra_mk19_mp":
if ( attacker.heliRideLifeId == attacker.pers["deaths"] && !level.scriptIncKillstreak )
attacker.pers["cur_kill_streak"]++;
break;
case "cobra_20mm_mp":
case "artillery_mp":
case "stealth_bomb_mp":
case "remotemissile_projectile_mp":
case "sentry_minigun_mp":
case "harrier_20mm_mp":
case "pavelow_minigun_mp":
case "nuke_mp":
if ( isDefined( eInflictor ) && isDefined( eInflictor.lifeId ) )
killstreakLifeId = eInflictor.lifeId;
else
killstreakLifeId = attacker.lifeId;
if ( killstreakLifeId == attacker.pers["deaths"] && !level.scriptIncKillstreak && (level.nukeIncreasesStreak || sWeapon != "nuke_mp") )
attacker.pers["cur_kill_streak"]++;
break;
default:
if( !level.scriptIncKillstreak )
attacker.pers["cur_kill_streak"]++;
break;
} }
} }
else else
{ {
if( !level.scriptIncKillstreak ) attacker.pers["cur_kill_streak"]++;
attacker.pers["cur_kill_streak"]++;
} }
attacker setPlayerStatIfGreater( "killstreak", attacker.pers["cur_kill_streak"] ); attacker setPlayerStatIfGreater( "killstreak", attacker.pers["cur_kill_streak"] );

View File

@ -1391,6 +1391,7 @@ Callback_StartGameType()
setDvarIfUninitialized( "scr_voting_bots", false ); setDvarIfUninitialized( "scr_voting_bots", false );
setDvarIfUninitialized( "scr_nuke_increases_streak", true ); setDvarIfUninitialized( "scr_nuke_increases_streak", true );
setDvarIfUninitialized( "headshot_detach_head", false ); setDvarIfUninitialized( "headshot_detach_head", false );
setDvarIfUninitialized( "scr_killstreaks_increase_killstreak", true );
level.extraDamageFeedback = getDvarInt("scr_extraDamageFeedback"); level.extraDamageFeedback = getDvarInt("scr_extraDamageFeedback");
level.allowPrintDamage = getDvarInt("scr_printDamage"); level.allowPrintDamage = getDvarInt("scr_printDamage");
@ -1409,6 +1410,7 @@ Callback_StartGameType()
level.botsVote = getDvarInt( "scr_voting_bots" ); level.botsVote = getDvarInt( "scr_voting_bots" );
level.headShotDetachHead = getDvarInt("headshot_detach_head"); level.headShotDetachHead = getDvarInt("headshot_detach_head");
level.nukeIncreasesStreak = getDvarInt( "scr_nuke_increases_streak" ); level.nukeIncreasesStreak = getDvarInt( "scr_nuke_increases_streak" );
level.killstreaksIncreaseKillstreak = getDvarInt( "scr_killstreaks_increase_killstreak" );
if ( level.voting ) if ( level.voting )
level.votingMapsTok = randomizeMaps(); level.votingMapsTok = randomizeMaps();