combathigh

This commit is contained in:
INeedBots 2020-09-20 23:56:02 -06:00
parent 3c9b3a423f
commit 3c96c5df42
2 changed files with 7 additions and 1 deletions

View File

@ -535,3 +535,6 @@ set scr_nukeKillsAll "0"
// _emp
set scr_empEffectsAll "0"
// _perks
set combathighIsJuiced "1"

View File

@ -178,6 +178,9 @@ init()
level.perkSetFuncs["specialty_tacticalinsertion"] = ::setTacticalInsertion;
level.perkUnsetFuncs["specialty_tacticalinsertion"] = ::unsetTacticalInsertion;
setDvarIfUninitialized( "combathighIsJuiced", false );
level.combathighIsJuiced = getDvarInt( "combathighIsJuiced" );
initPerkDvars();
level thread onPlayerConnect();
@ -323,7 +326,7 @@ cac_modified_damage( victim, attacker, damage, meansofdeath, weapon, impactPoint
//if ( ( victim.xpScaler == 2 && isDefined( attacker ) ) && ( isPlayer( attacker ) || attacker.classname == "scrip_vehicle" ) )
// damageAdd += 200;
if ( victim _hasperk( "specialty_combathigh" ) )
if ( victim _hasperk( "specialty_combathigh" ) && !level.combathighIsJuiced )
{
if ( IsDefined( self.damageBlockedTotal ) && (!level.teamBased || (isDefined( attacker ) && isDefined( attacker.team ) && victim.team != attacker.team)) )
{